diff options
author | Derek Straka <derek@asterius.io> | 2016-03-24 08:08:35 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-12 17:46:35 +0000 |
commit | e08994ce953ff5ab49b260e7763a40bfad4285ca (patch) | |
tree | 2da64183903fa6690d66a52e20126a90b0868878 /bitbake/lib | |
parent | 1ae880e253dc6fd9970e9d7c8ebb790912dc8932 (diff) | |
download | poky-e08994ce953ff5ab49b260e7763a40bfad4285ca.tar.gz |
bitbake: bitbake: fetch2/gitsm: Fix fetch when the repository contains nested submodules
This fixes a problem when the repository contains multiple levels of submodules via a resursive submodule init.
(Bitbake rev: bc57798ff39cae5ffea194c867e07136f7b6f3ec)
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/fetch2/gitsm.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py index 2ecea7c7ed..752f1d3c15 100644 --- a/bitbake/lib/bb/fetch2/gitsm.py +++ b/bitbake/lib/bb/fetch2/gitsm.py | |||
@@ -110,8 +110,7 @@ class GitSM(Git): | |||
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 + " checkout " + ud.revisions[ud.names[0]], d) |
113 | runfetchcmd(ud.basecmd + " submodule init", d) | 113 | runfetchcmd(ud.basecmd + " submodule update --init --recursive", d) |
114 | runfetchcmd(ud.basecmd + " submodule update", d) | ||
115 | self._set_relative_paths(tmpclonedir) | 114 | self._set_relative_paths(tmpclonedir) |
116 | runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d) | 115 | runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d) |
117 | os.rename(gitdir, ud.clonedir,) | 116 | os.rename(gitdir, ud.clonedir,) |
@@ -132,6 +131,4 @@ class GitSM(Git): | |||
132 | submodules = self.uses_submodules(ud, d) | 131 | submodules = self.uses_submodules(ud, d) |
133 | if submodules: | 132 | if submodules: |
134 | runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d) | 133 | runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d) |
135 | runfetchcmd(ud.basecmd + " submodule init", d) | 134 | runfetchcmd(ud.basecmd + " submodule update --init --recursive", d) |
136 | runfetchcmd(ud.basecmd + " submodule update", d) | ||
137 | |||