summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sstate.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 3499d2ee66..6f285da6b4 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -31,7 +31,7 @@ SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}"
31SSTATE_SCAN_FILES ?= "*.la *-config *_config" 31SSTATE_SCAN_FILES ?= "*.la *-config *_config"
32SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f' 32SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f'
33 33
34BB_HASHFILENAME = "${SSTATE_EXTRAPATH} ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}" 34BB_HASHFILENAME = "False ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}"
35 35
36SSTATE_ARCHS = " \ 36SSTATE_ARCHS = " \
37 ${BUILD_ARCH} \ 37 ${BUILD_ARCH} \
@@ -79,6 +79,7 @@ python () {
79 79
80 if bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d): 80 if bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d):
81 d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") 81 d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
82 d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}")
82 d.setVar('SSTATE_EXTRAPATHWILDCARD', "*/") 83 d.setVar('SSTATE_EXTRAPATHWILDCARD', "*/")
83 84
84 # These classes encode staging paths into their scripts data so can only be 85 # These classes encode staging paths into their scripts data so can only be
@@ -721,7 +722,10 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False):
721 # Magic data from BB_HASHFILENAME 722 # Magic data from BB_HASHFILENAME
722 splithashfn = sq_hashfn[task].split(" ") 723 splithashfn = sq_hashfn[task].split(" ")
723 spec = splithashfn[1] 724 spec = splithashfn[1]
724 extrapath = splithashfn[0] 725 if splithashfn[0] == "True":
726 extrapath = d.getVar("NATIVELSBSTRING", True) + "/"
727 else:
728 extrapath = ""
725 729
726 tname = sq_task[task][3:] 730 tname = sq_task[task][3:]
727 731