summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-04-28 15:01:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-01 07:56:35 (GMT)
commit1d57ca352f798dd671fd8c15ee4286644c49c4b9 (patch)
treedea7d6f07e9e93c75d3300198429c27954d3ab4e
parent160c4fd9aea84f2aba27158c998a3b6340471040 (diff)
downloadpoky-1d57ca352f798dd671fd8c15ee4286644c49c4b9.tar.gz
sstate.bbclass, staging.bbclass: Handle HOSTTOOLS_DIR when restoring state
Paths to host tools that have been copied to ${HOSTTOOLS_DIR} may end up in the sstate cache. They thus need to be corrected when restoring from the sstate cache. (From OE-Core rev: f8671aecf05a286dd2b34b07bb5fbbe0c31e26d0) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass2
-rw-r--r--meta/classes/staging.bbclass2
-rw-r--r--meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e50a385..ddc442c 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -54,7 +54,7 @@ SSTATEPOSTCREATEFUNCS = ""
54SSTATEPREINSTFUNCS = "" 54SSTATEPREINSTFUNCS = ""
55SSTATEPOSTUNPACKFUNCS = "sstate_hardcode_path_unpack" 55SSTATEPOSTUNPACKFUNCS = "sstate_hardcode_path_unpack"
56SSTATEPOSTINSTFUNCS = "" 56SSTATEPOSTINSTFUNCS = ""
57EXTRA_STAGING_FIXMES ?= "" 57EXTRA_STAGING_FIXMES ?= "HOSTTOOLS_DIR"
58SSTATECLEANFUNCS = "" 58SSTATECLEANFUNCS = ""
59 59
60# Check whether sstate exists for tasks that support sstate and are in the 60# Check whether sstate exists for tasks that support sstate and are in the
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 8bdb437..4015dd7 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -249,7 +249,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d):
249 if not fixme: 249 if not fixme:
250 return 250 return
251 cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative) 251 cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative)
252 for fixmevar in ['PKGDATA_DIR']: 252 for fixmevar in ['HOSTTOOLS_DIR', 'PKGDATA_DIR']:
253 fixme_path = d.getVar(fixmevar) 253 fixme_path = d.getVar(fixmevar)
254 cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) 254 cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path)
255 bb.note(cmd) 255 bb.note(cmd)
diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
index 17a99a4..44d013f 100644
--- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
+++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
@@ -9,7 +9,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
9 9
10# We need the following for the sstate code to process the wrapper 10# We need the following for the sstate code to process the wrapper
11SSTATE_SCAN_FILES += "depmodwrapper" 11SSTATE_SCAN_FILES += "depmodwrapper"
12EXTRA_STAGING_FIXMES = "PKGDATA_DIR" 12EXTRA_STAGING_FIXMES += "PKGDATA_DIR"
13 13
14do_populate_sysroot[depends] = "" 14do_populate_sysroot[depends] = ""
15 15