summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe F. Tonello <eu@felipetonello.com>2015-07-06 17:05:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-07 13:47:32 +0100
commit62caaa4d6d1e3585c94c34af91e94d1b0deba8c3 (patch)
tree988559e2d9bfc2381681cfb86f91fc2256cc8b0c
parenta24fdcae86ee6bc6767c1fd05715b73e16a16010 (diff)
downloadpoky-62caaa4d6d1e3585c94c34af91e94d1b0deba8c3.tar.gz
bitbake: fetch2: Checkout to correct ref begore init and update submodules
This is nessary when specified branch with submodules is different then default (master) branch. [YOCTO #7771] (Bitbake rev: f7b0b5e33e00f3ce0744322eee93835ee76bf184) Signed-off-by: Felipe F. Tonello <eu@felipetonello.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/gitsm.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py
index c125cff54b..0392e48d1a 100644
--- a/bitbake/lib/bb/fetch2/gitsm.py
+++ b/bitbake/lib/bb/fetch2/gitsm.py
@@ -109,6 +109,7 @@ class GitSM(Git):
109 runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*true/bare = false/'", d) 109 runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*true/bare = false/'", d)
110 os.chdir(tmpclonedir) 110 os.chdir(tmpclonedir)
111 runfetchcmd(ud.basecmd + " reset --hard", d) 111 runfetchcmd(ud.basecmd + " reset --hard", d)
112 runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d)
112 runfetchcmd(ud.basecmd + " submodule init", d) 113 runfetchcmd(ud.basecmd + " submodule init", d)
113 runfetchcmd(ud.basecmd + " submodule update", d) 114 runfetchcmd(ud.basecmd + " submodule update", d)
114 self._set_relative_paths(tmpclonedir) 115 self._set_relative_paths(tmpclonedir)