mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: Fix a bug where changed files weren't getting spotted and an invalid cache was being used

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4148 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-03-28 17:19:49 +00:00
parent ea20fb8d33
commit 841b37b626
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bitbake/lib/bb/cache.py
View File

@@ -208,7 +208,7 @@ class Cache:
return False return False
# Check the file's timestamp # Check the file's timestamp
if mtime > self.getVar("CACHETIMESTAMP", fn, True): if mtime != self.getVar("CACHETIMESTAMP", fn, True):
bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s changed" % fn) bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s changed" % fn)
self.remove(fn) self.remove(fn)
return False return False
@@ -223,7 +223,7 @@ class Cache:
self.remove(fn) self.remove(fn)
return False return False
if (fmtime > old_mtime): if (fmtime != old_mtime):
bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s's dependency %s changed" % (fn, f)) bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s's dependency %s changed" % (fn, f))
self.remove(fn) self.remove(fn)
return False return False

4
bitbake/lib/bb/fetch/git.py
View File

@@ -50,7 +50,7 @@ class Git(Fetch):
if 'protocol' in ud.parm: if 'protocol' in ud.parm:
ud.proto = ud.parm['protocol'] ud.proto = ud.parm['protocol']
ud.branch = ud.parm.get("branch", "") ud.branch = ud.parm.get("branch", "master")
tag = Fetch.srcrev_internal_helper(ud, d) tag = Fetch.srcrev_internal_helper(ud, d)
if tag is True: if tag is True:
@@ -95,7 +95,7 @@ class Git(Fetch):
os.chdir(repodir) os.chdir(repodir)
# Remove all but the .git directory # Remove all but the .git directory
runfetchcmd("rm * -Rf", d) runfetchcmd("rm * -Rf", d)
runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d) runfetchcmd("git fetch %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d)
runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d) runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d)
runfetchcmd("git prune-packed", d) runfetchcmd("git prune-packed", d)
runfetchcmd("git pack-redundant --all | xargs -r rm", d) runfetchcmd("git pack-redundant --all | xargs -r rm", d)