summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-18 17:58:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-19 17:54:55 +0100
commit72032f6dd6724663a3417b1d1b666d9a63fcbfdb (patch)
treec788038d1723857e8cf7a39226b7d26982c4e4ee
parent7dfa2b748866f95d337ab0165efe9fa28cfe3ae3 (diff)
downloadopenembedded-core-72032f6dd6724663a3417b1d1b666d9a63fcbfdb.tar.gz
openembedded-core-72032f6dd6724663a3417b1d1b666d9a63fcbfdb.tar.bz2
openembedded-core-72032f6dd6724663a3417b1d1b666d9a63fcbfdb.zip
sstate: Fix shared work preconfigure task handling
When the preconfigure task was added to gcc, it wasn't added to sstate's list of possible shared work tasks. This meant that diffsigs wasn't able to find the preconfigure sigdata/info file since it has inconsistent naming. This adds the task name to the list. Ideally this list would be autogenerated or not even required, right now its a sanity test that the shared work code works as intended so is best left as is. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 796c1a9f60..90119732dd 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -629,7 +629,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
tname = sq_task[task][3:]
- if tname in ["fetch", "unpack", "patch", "populate_lic"] and splithashfn[2]:
+ if tname in ["fetch", "unpack", "patch", "populate_lic", "preconfigure"] and splithashfn[2]:
spec = splithashfn[2]
extrapath = ""
@@ -784,7 +784,7 @@ python sstate_eventhandler() {
taskname = d.getVar("BB_RUNTASK", True)[3:]
spec = d.getVar('SSTATE_PKGSPEC', True)
swspec = d.getVar('SSTATE_SWSPEC', True)
- if taskname in ["fetch", "unpack", "patch", "populate_lic"] and swspec:
+ if taskname in ["fetch", "unpack", "patch", "populate_lic", "preconfigure"] and swspec:
d.setVar("SSTATE_PKGSPEC", "${SSTATE_SWSPEC}")
d.setVar("SSTATE_EXTRAPATH", "")
sstatepkg = d.getVar('SSTATE_PKG', True)