summaryrefslogtreecommitdiffstats
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:55:10 +0100
commit2fcaad20e9ec2477877b77f15f20f718ae0228dc (patch)
tree9e8ccaabe3205b6a15314de97736a436c54ac1cb
parentd95ada9846a1d8d73d2e06a9c69ef9f327eb8efa (diff)
downloadpoky-2fcaad20e9ec2477877b77f15f20f718ae0228dc.tar.gz
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. (From OE-Core rev: 72032f6dd6724663a3417b1d1b666d9a63fcbfdb) 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):
629 629
630 tname = sq_task[task][3:] 630 tname = sq_task[task][3:]
631 631
632 if tname in ["fetch", "unpack", "patch", "populate_lic"] and splithashfn[2]: 632 if tname in ["fetch", "unpack", "patch", "populate_lic", "preconfigure"] and splithashfn[2]:
633 spec = splithashfn[2] 633 spec = splithashfn[2]
634 extrapath = "" 634 extrapath = ""
635 635
@@ -784,7 +784,7 @@ python sstate_eventhandler() {
784 taskname = d.getVar("BB_RUNTASK", True)[3:] 784 taskname = d.getVar("BB_RUNTASK", True)[3:]
785 spec = d.getVar('SSTATE_PKGSPEC', True) 785 spec = d.getVar('SSTATE_PKGSPEC', True)
786 swspec = d.getVar('SSTATE_SWSPEC', True) 786 swspec = d.getVar('SSTATE_SWSPEC', True)
787 if taskname in ["fetch", "unpack", "patch", "populate_lic"] and swspec: 787 if taskname in ["fetch", "unpack", "patch", "populate_lic", "preconfigure"] and swspec:
788 d.setVar("SSTATE_PKGSPEC", "${SSTATE_SWSPEC}") 788 d.setVar("SSTATE_PKGSPEC", "${SSTATE_SWSPEC}")
789 d.setVar("SSTATE_EXTRAPATH", "") 789 d.setVar("SSTATE_EXTRAPATH", "")
790 sstatepkg = d.getVar('SSTATE_PKG', True) 790 sstatepkg = d.getVar('SSTATE_PKG', True)