Skip to contentSkip to conversation

sstate: Fix shared work preconfigure task handling

PATCH New Richard Purdie 1 participant 1 message Jun 18, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

meta/classes/sstate.bbclass +2 -2
index 796c1a9..9011973 100644
@@ -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)