diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-17 12:01:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-18 23:29:07 +0000 |
commit | 7b580cd25c09f178515282ad7b74de7e8672374e (patch) | |
tree | 652a205d9f136b7104e6287d25fa5c0737229530 /bitbake/lib/bb/fetch2/gitsm.py | |
parent | a99fa6ded13a62c3552d37563b1d299e2522d02a (diff) | |
download | poky-7b580cd25c09f178515282ad7b74de7e8672374e.tar.gz |
bitbake: fetch2/gitsm: Use ud.basecmd instead of hardcoding git
This allows FETCHCMD_git to override the fetcher command as the git fetcher does.
[YOCTO #5717]
(Bitbake rev: 23ab943be3a33077d6ad8be68bba53cd1e2270b4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/gitsm.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/gitsm.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py index 4093f6e846..9fdde468cb 100644 --- a/bitbake/lib/bb/fetch2/gitsm.py +++ b/bitbake/lib/bb/fetch2/gitsm.py | |||
@@ -51,9 +51,9 @@ class GitSM(Git): | |||
51 | os.rename(ud.clonedir, gitdir) | 51 | os.rename(ud.clonedir, gitdir) |
52 | runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*true/bare = false/'", d) | 52 | runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*true/bare = false/'", d) |
53 | os.chdir(tmpclonedir) | 53 | os.chdir(tmpclonedir) |
54 | runfetchcmd("git reset --hard", d) | 54 | runfetchcmd(ud.basecmd + " reset --hard", d) |
55 | runfetchcmd("git submodule init", d) | 55 | runfetchcmd(ud.basecmd + " submodule init", d) |
56 | runfetchcmd("git submodule update", d) | 56 | runfetchcmd(ud.basecmd + " submodule update", d) |
57 | runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d) | 57 | runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d) |
58 | os.rename(gitdir, ud.clonedir,) | 58 | os.rename(gitdir, ud.clonedir,) |
59 | bb.utils.remove(tmpclonedir, True) | 59 | bb.utils.remove(tmpclonedir, True) |
@@ -73,6 +73,6 @@ class GitSM(Git): | |||
73 | submodules = self.uses_submodules(ud, d) | 73 | submodules = self.uses_submodules(ud, d) |
74 | if submodules: | 74 | if submodules: |
75 | runfetchcmd("cp -r " + ud.clonedir + "/modules " + ud.destdir + "/.git/", d) | 75 | runfetchcmd("cp -r " + ud.clonedir + "/modules " + ud.destdir + "/.git/", d) |
76 | runfetchcmd("git submodule init", d) | 76 | runfetchcmd(ud.basecmd + " submodule init", d) |
77 | runfetchcmd("git submodule update", d) | 77 | runfetchcmd(ud.basecmd + " submodule update", d) |
78 | 78 | ||