From 9e1516d2bf495a26297df8a9db87ccf3eed9cd53 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 23 Sep 2015 15:34:57 -0700 Subject: bitbake: toaster: make clone directory name unique Changed naming scheme for clone directory. Used full git url and branch to make it unique. This should fix the issue with using the same git repository, but different protocols, e.g. git://some.git.repo and http://some.git.repo. [YOCTO #8101] (Bitbake rev: a9baf856a1ef7d84a47fa6615353f5b3fdb8a73b) Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py') diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index ebb4377224..8c4e9c7e36 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -181,14 +181,9 @@ class LocalhostBEController(BuildEnvironmentController): logger.debug("localhostbecontroller: Stopped bitbake server") def getGitCloneDirectory(self, url, branch): - """ Utility that returns the last component of a git path as directory - """ - components = re.split(r'[:\.\/]', url) - base = components[-2] if components[-1] == "git" else components[-1] - + """Construct unique clone directory name out of url and branch.""" if branch != "HEAD": - return "_%s_%s.toaster_cloned" % (base, branch) - + return "_%s_%s.toaster_cloned" % (re.sub('[:/]', '_', url), branch) # word of attention; this is a localhost-specific issue; only on the localhost we expect to have "HEAD" releases # which _ALWAYS_ means the current poky checkout -- cgit v1.2.3-54-g00ecf