oe.sstatesig: align swspec handling with sstate.bbclass
PATCH 1/1 oe.sstatesig: align swspec handling with sstate.bbclass
The logic tries to remove the -native suffix from pn to handle this (though it doesn't succeed, as it doesn't assign the new pn to the variable), but we need to do more for the swspec tasks than just not set the extrapath, we also need to change from SSTATE_PKGSPEC to SSTATE_SWSPEC. Alter to correct the spec for these cases, and also add preconfigure to align with the current logic in sstate.bbclass, which includes that task as well in the list of tasks to adjust to use swspec.
[YOCTO #7563]
Signed-off-by Christopher Larson <[email protected]>
--- meta/lib/oe/sstatesig.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/lib/oe/sstatesig.py +4 -4
@@ -206,9 +206,6 @@ def find_siginfo(pn, taskname, taskhashlist, d): if key.startswith('virtual:native:'): pn = pn + '-native' - if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic']: - pn.replace("-native", "") - filedates = {} # First search in stamps dir
@@ -249,7 +246,10 @@ def find_siginfo(pn, taskname, taskhashlist, d): localdata.setVar('PV', '*') localdata.setVar('PR', '*') localdata.setVar('BB_TASKHASH', hashval) - if pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn: + swspec = localdata.getVar('SSTATE_SWSPEC', True) + if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic', 'do_preconfigure'] and swspec: + localdata.setVar('SSTATE_PKGSPEC', '${SSTATE_SWSPEC}') + elif pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn: localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") sstatename = taskname[3:] filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG', True), sstatename)
Signature · 1 line
2.2.1