From e08994ce953ff5ab49b260e7763a40bfad4285ca Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Thu, 24 Mar 2016 08:08:35 -0400 Subject: 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 Signed-off-by: Richard Purdie --- 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 2ecea7c7ed..752f1d3c15 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) -- cgit v1.2.3-54-g00ecf