diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-03-28 17:19:49 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-03-28 17:19:49 +0000 |
| commit | 841b37b6263967e77d9055a20728f2f7cebfcb7f (patch) | |
| tree | 4872d1b1b7aad1c6f5d99dab7ffea5dc9e73662a /bitbake | |
| parent | ea20fb8d333e0045389dfb4da7578f710e5dcbd8 (diff) | |
| download | poky-841b37b6263967e77d9055a20728f2f7cebfcb7f.tar.gz | |
bitbake: Fix a bug where changed files weren't getting spotted and an invalid cache was being used
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4148 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cache.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/git.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 9acd301f52..fe38ea0aee 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
| @@ -208,7 +208,7 @@ class Cache: | |||
| 208 | return False | 208 | return False |
| 209 | 209 | ||
| 210 | # Check the file's timestamp | 210 | # Check the file's timestamp |
| 211 | if mtime > self.getVar("CACHETIMESTAMP", fn, True): | 211 | if mtime != self.getVar("CACHETIMESTAMP", fn, True): |
| 212 | bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s changed" % fn) | 212 | bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s changed" % fn) |
| 213 | self.remove(fn) | 213 | self.remove(fn) |
| 214 | return False | 214 | return False |
| @@ -223,7 +223,7 @@ class Cache: | |||
| 223 | self.remove(fn) | 223 | self.remove(fn) |
| 224 | return False | 224 | return False |
| 225 | 225 | ||
| 226 | if (fmtime > old_mtime): | 226 | if (fmtime != old_mtime): |
| 227 | bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s's dependency %s changed" % (fn, f)) | 227 | bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s's dependency %s changed" % (fn, f)) |
| 228 | self.remove(fn) | 228 | self.remove(fn) |
| 229 | return False | 229 | return False |
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 0c708e3516..f4ae724f87 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py | |||
| @@ -50,7 +50,7 @@ class Git(Fetch): | |||
| 50 | if 'protocol' in ud.parm: | 50 | if 'protocol' in ud.parm: |
| 51 | ud.proto = ud.parm['protocol'] | 51 | ud.proto = ud.parm['protocol'] |
| 52 | 52 | ||
| 53 | ud.branch = ud.parm.get("branch", "") | 53 | ud.branch = ud.parm.get("branch", "master") |
| 54 | 54 | ||
| 55 | tag = Fetch.srcrev_internal_helper(ud, d) | 55 | tag = Fetch.srcrev_internal_helper(ud, d) |
| 56 | if tag is True: | 56 | if tag is True: |
| @@ -95,7 +95,7 @@ class Git(Fetch): | |||
| 95 | os.chdir(repodir) | 95 | os.chdir(repodir) |
| 96 | # Remove all but the .git directory | 96 | # Remove all but the .git directory |
| 97 | runfetchcmd("rm * -Rf", d) | 97 | runfetchcmd("rm * -Rf", d) |
| 98 | runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d) | 98 | runfetchcmd("git fetch %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d) |
| 99 | runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d) | 99 | runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d) |
| 100 | runfetchcmd("git prune-packed", d) | 100 | runfetchcmd("git prune-packed", d) |
| 101 | runfetchcmd("git pack-redundant --all | xargs -r rm", d) | 101 | runfetchcmd("git pack-redundant --all | xargs -r rm", d) |