From d0f0f57ba48879c5272996dd7de3b77006f45c2e Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Mon, 3 Apr 2023 16:13:22 +0100
Subject: [PATCH] Updated top-repo init flow
---
.gitmodules | 37 ++++++++++++++-----------------------
flow/socrepo-init | 6 ++++--
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 896f922..e6601fb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,15 @@
[submodule "accelerator-wrapper"]
- path = accelerator-wrapper
- url = git@git.soton.ac.uk:soclabs/accelerator-wrapper.git
- [submodule "nanosoc"]
- path = nanosoc
- url = git@git.soton.ac.uk:soclabs/nanosoc.git
- [submodule "socsim"]
- path = socsim
- url = git@git.soton.ac.uk:soclabs/socsim.git
- [submodule "CHIPKIT"]
- path = CHIPKIT
- url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
- [submodule "secworks-sha256"]
- path = secworks-sha256
- url = git@git.soton.ac.uk:soclabs/secworks-sha256.git
- branch = main
-[submodule "secworks-sha-256-system-top/accelerator-wrapper"]
- branch = main
-[submodule "secworks-sha-256-system-top/CHIPKIT"]
- branch = main
-[submodule "secworks-sha-256-system-top/nanosoc"]
- branch = main
-[submodule "secworks-sha-256-system-top/socsim"]
- branch = main
+path = accelerator-wrapper
+url = git@git.soton.ac.uk:soclabs/accelerator-wrapper.git
+[submodule "nanosoc"]
+path = nanosoc
+url = git@git.soton.ac.uk:soclabs/nanosoc.git
+[submodule "socsim"]
+path = socsim
+url = git@git.soton.ac.uk:soclabs/socsim.git
+[submodule "CHIPKIT"]
+path = CHIPKIT
+url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
+[submodule "secworks-sha256"]
+path = secworks-sha256
+url = git@git.soton.ac.uk:soclabs/secworks-sha256.git
diff --git a/flow/socrepo-init b/flow/socrepo-init
index a14cde6..cf24e4c 100755
--- a/flow/socrepo-init
+++ b/flow/socrepo-init
@@ -18,9 +18,11 @@ for d in $SOC_TOP_DIR/* ; do
echo $d
if [ -f "$d/set_env.sh" ]; then
# If .git file exists - submodule
- git config -f .gitmodules submodule.$d.branch main
+ # git config -f .gitmodules submodule.$d.branch main
+ git submodule set-branch --branch main $d
fi
fi
done
git submodule update --remote --recursive
-git submodule foreach --recursive git checkout main
\ No newline at end of file
+git submodule foreach --recursive git checkout main
+git restore $DESIGN_ROOT/.gitmodules
\ No newline at end of file
--
GitLab