[bitbake-devel] [PATCH] fetch2/gitsm: Fix when repository change submodules
Felipe F. Tonello
eu at felipetonello.com
Wed Feb 3 16:29:42 UTC 2016
This fix a problem when checking out a commit that changes the submodules
previously checkout.
Example:
Recipe uses branch A and then it updates to use branch B, but branch B has
different submodules dependencies then what branch A previously had.
Signed-off-by: Felipe F. Tonello <eu at felipetonello.com>
---
lib/bb/fetch2/gitsm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py
index 0392e48d1aa0..2ecea7c7ed60 100644
--- a/lib/bb/fetch2/gitsm.py
+++ b/lib/bb/fetch2/gitsm.py
@@ -131,7 +131,7 @@ class GitSM(Git):
os.chdir(ud.destdir)
submodules = self.uses_submodules(ud, d)
if submodules:
- runfetchcmd("cp -r " + ud.clonedir + "/modules " + ud.destdir + "/.git/", d)
+ runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d)
runfetchcmd(ud.basecmd + " submodule init", d)
runfetchcmd(ud.basecmd + " submodule update", d)
--
2.7.0
More information about the bitbake-devel
mailing list