[bitbake-devel] [PATCH] bitbake: fetch2/gitsm: Fix fetch when the repository contains nested submodules
Derek Straka
derek at asterius.io
Thu Mar 24 12:08:35 UTC 2016
This fixes a problem when the repository contains multiple levels of submodules via a resursive submodule init.
Signed-off-by: Derek Straka <derek at asterius.io>
---
bitbake/lib/bb/fetch2/gitsm.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py
index 2ecea7c..752f1d3 100644
--- a/bitbake/lib/bb/fetch2/gitsm.py
+++ b/bitbake/lib/bb/fetch2/gitsm.py
@@ -110,8 +110,7 @@ class GitSM(Git):
os.chdir(tmpclonedir)
runfetchcmd(ud.basecmd + " reset --hard", d)
runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d)
- runfetchcmd(ud.basecmd + " submodule init", d)
- runfetchcmd(ud.basecmd + " submodule update", d)
+ runfetchcmd(ud.basecmd + " submodule update --init --recursive", d)
self._set_relative_paths(tmpclonedir)
runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d)
os.rename(gitdir, ud.clonedir,)
@@ -132,6 +131,4 @@ class GitSM(Git):
submodules = self.uses_submodules(ud, d)
if submodules:
runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d)
- runfetchcmd(ud.basecmd + " submodule init", d)
- runfetchcmd(ud.basecmd + " submodule update", d)
-
+ runfetchcmd(ud.basecmd + " submodule update --init --recursive", d)
--
1.9.1
More information about the bitbake-devel
mailing list