summaryrefslogtreecommitdiffstats
path: root/meta/classes/staging.bbclass
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-04-28 17:01:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-01 08:56:24 +0100
commitf8671aecf05a286dd2b34b07bb5fbbe0c31e26d0 (patch)
treeae666674a4b51a787a15f75198e21650c2f7d952 /meta/classes/staging.bbclass
parent8164c466943ffedff399009bf5547dba4f06d6c8 (diff)
downloadopenembedded-core-f8671aecf05a286dd2b34b07bb5fbbe0c31e26d0.tar.gz
openembedded-core-f8671aecf05a286dd2b34b07bb5fbbe0c31e26d0.tar.bz2
openembedded-core-f8671aecf05a286dd2b34b07bb5fbbe0c31e26d0.zip
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. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r--meta/classes/staging.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 8bdb437a1f..4015dd754c 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -249,7 +249,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d):
if not fixme:
return
cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative)
- for fixmevar in ['PKGDATA_DIR']:
+ for fixmevar in ['HOSTTOOLS_DIR', 'PKGDATA_DIR']:
fixme_path = d.getVar(fixmevar)
cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path)
bb.note(cmd)