diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-13 11:18:14 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-13 11:35:11 +0100 |
| commit | a18e9b4f9336ac733265f83db68fc17659d7433c (patch) | |
| tree | c5a28b01fd904cca25fd351ed0b743dcfc570ec2 | |
| parent | 0ea4b896495be47e6403595d8419648f2aae68dc (diff) | |
| download | poky-a18e9b4f9336ac733265f83db68fc17659d7433c.tar.gz | |
bitbake/git.py: Allow tracking of branches in SRC_URI without cloning for use with fullclone
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 9 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/git.py | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 46957670a5..47a44708be 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py | |||
| @@ -521,10 +521,11 @@ class FetchData(object): | |||
| 521 | # Horrible... | 521 | # Horrible... |
| 522 | bb.data.delVar("ISHOULDNEVEREXIST", d) | 522 | bb.data.delVar("ISHOULDNEVEREXIST", d) |
| 523 | 523 | ||
| 524 | # Note: These files should always be in DL_DIR whereas localpath may not be. | 524 | if self.localpath is not None: |
| 525 | basepath = bb.data.expand("${DL_DIR}/%s" % os.path.basename(self.localpath), d) | 525 | # Note: These files should always be in DL_DIR whereas localpath may not be. |
| 526 | self.md5 = basepath + '.md5' | 526 | basepath = bb.data.expand("${DL_DIR}/%s" % os.path.basename(self.localpath), d) |
| 527 | self.lockfile = basepath + '.lock' | 527 | self.md5 = basepath + '.md5' |
| 528 | self.lockfile = basepath + '.lock' | ||
| 528 | 529 | ||
| 529 | 530 | ||
| 530 | class Fetch(object): | 531 | class Fetch(object): |
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 535f9e5f3a..e77d2a5b91 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py | |||
| @@ -79,6 +79,10 @@ class Git(Fetch): | |||
| 79 | 79 | ||
| 80 | ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" | 80 | ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" |
| 81 | 81 | ||
| 82 | if 'noclone' in ud.parm: | ||
| 83 | ud.localfile = None | ||
| 84 | return None | ||
| 85 | |||
| 82 | return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) | 86 | return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) |
| 83 | 87 | ||
| 84 | def go(self, loc, ud, d): | 88 | def go(self, loc, ud, d): |
