From a18e9b4f9336ac733265f83db68fc17659d7433c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 13 Aug 2010 11:18:14 +0100 Subject: bitbake/git.py: Allow tracking of branches in SRC_URI without cloning for use with fullclone Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch/__init__.py | 9 +++++---- bitbake/lib/bb/fetch/git.py | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 46957670a..47a44708b 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -521,10 +521,11 @@ class FetchData(object): # Horrible... bb.data.delVar("ISHOULDNEVEREXIST", d) - # Note: These files should always be in DL_DIR whereas localpath may not be. - basepath = bb.data.expand("${DL_DIR}/%s" % os.path.basename(self.localpath), d) - self.md5 = basepath + '.md5' - self.lockfile = basepath + '.lock' + if self.localpath is not None: + # Note: These files should always be in DL_DIR whereas localpath may not be. + basepath = bb.data.expand("${DL_DIR}/%s" % os.path.basename(self.localpath), d) + self.md5 = basepath + '.md5' + self.lockfile = basepath + '.lock' class Fetch(object): diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 535f9e5f3..e77d2a5b9 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py @@ -79,6 +79,10 @@ class Git(Fetch): ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" + if 'noclone' in ud.parm: + ud.localfile = None + return None + return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) def go(self, loc, ud, d): -- cgit v1.2.3