From: Christopher Larson Date: Fri, 3 Apr 2015 22:03:05 +0000 (-0700) Subject: oe.sstatesig: align swspec handling with sstate.bbclass X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4f9cde9d8e700d10cdb1da82bf7489df5633c549;p=openembedded-core.git 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] (From OE-Core master rev: c9105597763be4bf5bc0ec97cc999566d0f10678) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 62e75c25ca..9d6d7c42fc 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -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)