diff options
Diffstat (limited to 'yocto-poky/bitbake/lib/bb/fetch2/gitsm.py')
| -rw-r--r-- | yocto-poky/bitbake/lib/bb/fetch2/gitsm.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/yocto-poky/bitbake/lib/bb/fetch2/gitsm.py b/yocto-poky/bitbake/lib/bb/fetch2/gitsm.py index 0392e48d1..752f1d3c1 100644 --- a/yocto-poky/bitbake/lib/bb/fetch2/gitsm.py +++ b/yocto-poky/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,) @@ -131,7 +130,5 @@ class GitSM(Git): os.chdir(ud.destdir) submodules = self.uses_submodules(ud, d) if submodules: - runfetchcmd("cp -r " + ud.clonedir + "/modules " + ud.destdir + "/.git/", d) - runfetchcmd(ud.basecmd + " submodule init", d) - runfetchcmd(ud.basecmd + " submodule update", d) - + runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d) + runfetchcmd(ud.basecmd + " submodule update --init --recursive", d) |