summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-04-05 03:35:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 10:29:47 +0100
commitc1157400ab6f5cb0f057bd07e55c4790499107ed (patch)
treeea8063222d70bc6ba9f97fa9227c492ea28ac1f1 /bitbake/lib/bb
parent4f07c2220bedf50743bc384dd221eb14f6b0b300 (diff)
downloadpoky-c1157400ab6f5cb0f057bd07e55c4790499107ed.tar.gz
bitbake: fetch2/git.py: remove .indirectiondir workaround
It was used for workaround git 1.7.9.2 which was released in 2012 which should not be existed on nowadays host, so remove it to avoid confusions. (Bitbake rev: 6140d0cc9aecf1029ca16fed47071dfcc92f4269) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/git.py18
1 files changed, 1 insertions, 17 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 0513348a18..526668bc23 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -262,23 +262,7 @@ class Git(FetchMethod):
262 if ud.bareclone: 262 if ud.bareclone:
263 cloneflags += " --mirror" 263 cloneflags += " --mirror"
264 264
265 # Versions of git prior to 1.7.9.2 have issues where foo.git and foo get confused 265 runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, ud.clonedir, destdir), d)
266 # and you end up with some horrible union of the two when you attempt to clone it
267 # The least invasive workaround seems to be a symlink to the real directory to
268 # fool git into ignoring any .git version that may also be present.
269 #
270 # The issue is fixed in more recent versions of git so we can drop this hack in future
271 # when that version becomes common enough.
272 clonedir = ud.clonedir
273 if not ud.path.endswith(".git"):
274 indirectiondir = destdir[:-1] + ".indirectionsymlink"
275 if os.path.exists(indirectiondir):
276 os.remove(indirectiondir)
277 bb.utils.mkdirhier(os.path.dirname(indirectiondir))
278 os.symlink(ud.clonedir, indirectiondir)
279 clonedir = indirectiondir
280
281 runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, clonedir, destdir), d)
282 os.chdir(destdir) 266 os.chdir(destdir)
283 repourl = self._get_repo_url(ud) 267 repourl = self._get_repo_url(ud)
284 runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, repourl), d) 268 runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, repourl), d)