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

sstate: add a function to get the sstate file name in sstate_checkhashes

Browse Source 
(From OE-Core rev: dc64479264bdf3d60ece02a98b65be35650f8f86)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jose Quaresma
2021-11-09 11:11:48 +00:00
committed by Richard Purdie
parent e7acdb37af
commit 91fab7aa7e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
meta/classes/sstate.bbclass
View File

@@ -934,12 +934,13 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True,
return spec, extrapath, tname return spec, extrapath, tname
def getsstatefile(tid, siginfo, d):
spec, extrapath, tname = getpathcomponents(tid, d)
return extrapath + generate_sstatefn(spec, gethash(tid), tname, siginfo, d)
for tid in sq_data['hash']: for tid in sq_data['hash']:
spec, extrapath, tname = getpathcomponents(tid, d) sstatefile = d.expand("${SSTATE_DIR}/" + getsstatefile(tid, siginfo, d))
sstatefile = d.expand("${SSTATE_DIR}/" + extrapath + generate_sstatefn(spec, gethash(tid), tname, siginfo, d))
if os.path.exists(sstatefile): if os.path.exists(sstatefile):
found.add(tid) found.add(tid)
@@ -1000,8 +1001,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True,
tasklist = [] tasklist = []
for tid in missed: for tid in missed:
spec, extrapath, tname = getpathcomponents(tid, d) sstatefile = d.expand(getsstatefile(tid, siginfo, d))
sstatefile = d.expand(extrapath + generate_sstatefn(spec, gethash(tid), tname, siginfo, d))
tasklist.append((tid, sstatefile)) tasklist.append((tid, sstatefile))
if tasklist: if tasklist:
@@ -1028,12 +1028,10 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True,
if "toaster" in inheritlist: if "toaster" in inheritlist:
evdata = {'missed': [], 'found': []}; evdata = {'missed': [], 'found': []};
for tid in missed: for tid in missed:
spec, extrapath, tname = getpathcomponents(tid, d) sstatefile = d.expand(getsstatefile(tid, False, d))
sstatefile = d.expand(extrapath + generate_sstatefn(spec, gethash(tid), tname, False, d))
evdata['missed'].append((bb.runqueue.fn_from_tid(tid), bb.runqueue.taskname_from_tid(tid), gethash(tid), sstatefile ) ) evdata['missed'].append((bb.runqueue.fn_from_tid(tid), bb.runqueue.taskname_from_tid(tid), gethash(tid), sstatefile ) )
for tid in found: for tid in found:
spec, extrapath, tname = getpathcomponents(tid, d) sstatefile = d.expand(getsstatefile(tid, False, d))
sstatefile = d.expand(extrapath + generate_sstatefn(spec, gethash(tid), tname, False, d))
evdata['found'].append((bb.runqueue.fn_from_tid(tid), bb.runqueue.taskname_from_tid(tid), gethash(tid), sstatefile ) ) evdata['found'].append((bb.runqueue.fn_from_tid(tid), bb.runqueue.taskname_from_tid(tid), gethash(tid), sstatefile ) )
bb.event.fire(bb.event.MetadataEvent("MissedSstate", evdata), d) bb.event.fire(bb.event.MetadataEvent("MissedSstate", evdata), d)