summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2015-04-03 15:03:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:16 +0100
commit5ef9f03858c787855e0ecf363b819e81a593e52a (patch)
tree19dbefbb4e2829396194e3cee94bed86d5a77437 /meta/lib/oe
parentdd90ccfa8203ca385f1de841bd6817519af2d1bf (diff)
downloadpoky-5ef9f03858c787855e0ecf363b819e81a593e52a.tar.gz
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 rev: c9105597763be4bf5bc0ec97cc999566d0f10678) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/sstatesig.py8
1 files changed, 4 insertions, 4 deletions
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):
206 if key.startswith('virtual:native:'): 206 if key.startswith('virtual:native:'):
207 pn = pn + '-native' 207 pn = pn + '-native'
208 208
209 if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic']:
210 pn.replace("-native", "")
211
212 filedates = {} 209 filedates = {}
213 210
214 # First search in stamps dir 211 # First search in stamps dir
@@ -249,7 +246,10 @@ def find_siginfo(pn, taskname, taskhashlist, d):
249 localdata.setVar('PV', '*') 246 localdata.setVar('PV', '*')
250 localdata.setVar('PR', '*') 247 localdata.setVar('PR', '*')
251 localdata.setVar('BB_TASKHASH', hashval) 248 localdata.setVar('BB_TASKHASH', hashval)
252 if pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn: 249 swspec = localdata.getVar('SSTATE_SWSPEC', True)
250 if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic', 'do_preconfigure'] and swspec:
251 localdata.setVar('SSTATE_PKGSPEC', '${SSTATE_SWSPEC}')
252 elif pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn:
253 localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") 253 localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
254 sstatename = taskname[3:] 254 sstatename = taskname[3:]
255 filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG', True), sstatename) 255 filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG', True), sstatename)