summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorFelipe F. Tonello <eu@felipetonello.com>2016-02-03 16:29:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:47:49 +0000
commitb98866d003eb1287909ea74d594cdd12f28466f2 (patch)
tree07d87d458457f945963b57d27e28a164badb1ba2 /bitbake
parent390c2c1268140a5309e8027a22a310ee668ce7bb (diff)
downloadpoky-b98866d003eb1287909ea74d594cdd12f28466f2.tar.gz
bitbake: fetch2/gitsm: Fix when repository change submodules
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. (Bitbake rev: 54a3864246f2be0b62761f639a1d5c9407aded4f) Signed-off-by: Felipe F. Tonello <eu@felipetonello.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/gitsm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py
index 0392e48d1a..2ecea7c7ed 100644
--- a/bitbake/lib/bb/fetch2/gitsm.py
+++ b/bitbake/lib/bb/fetch2/gitsm.py
@@ -131,7 +131,7 @@ class GitSM(Git):
131 os.chdir(ud.destdir) 131 os.chdir(ud.destdir)
132 submodules = self.uses_submodules(ud, d) 132 submodules = self.uses_submodules(ud, d)
133 if submodules: 133 if submodules:
134 runfetchcmd("cp -r " + ud.clonedir + "/modules " + ud.destdir + "/.git/", d) 134 runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d)
135 runfetchcmd(ud.basecmd + " submodule init", d) 135 runfetchcmd(ud.basecmd + " submodule init", d)
136 runfetchcmd(ud.basecmd + " submodule update", d) 136 runfetchcmd(ud.basecmd + " submodule update", d)
137 137