From f8671aecf05a286dd2b34b07bb5fbbe0c31e26d0 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 28 Apr 2017 17:01:02 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/staging.bbclass') 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) -- cgit 1.2.3-korg