[oe-commits] [bitbake] 01/05: bitbake: fetch2/gitsm: Fix fetch when the repository contains nested submodules

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit dbafbe229360ffe5908b106a9c10e274712b9b17
Author: Derek Straka <derek at asterius.io>
AuthorDate: Thu Mar 24 08:08:35 2016 -0400

    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.
    
    Signed-off-by: Derek Straka <derek at asterius.io>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/gitsm.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py
index 2ecea7c..752f1d3 100644
--- a/lib/bb/fetch2/gitsm.py
+++ b/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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.