[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5765/8267] sstate.bbclass, staging.bbclass: Handle HOSTTOOLS_DIR when restoring state

[Emmanuele Bassi <ebassi src gnome org>]

commit 1d57ca352f798dd671fd8c15ee4286644c49c4b9
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Fri Apr 28 17:01:02 2017 +0200

    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>

 meta/classes/sstate.bbclass                        |    2 +-
 meta/classes/staging.bbclass                       |    2 +-
 .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |    2 +-
 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 = ""
 SSTATEPREINSTFUNCS = ""
 SSTATEPOSTUNPACKFUNCS = "sstate_hardcode_path_unpack"
 SSTATEPOSTINSTFUNCS = ""
-EXTRA_STAGING_FIXMES ?= ""
+EXTRA_STAGING_FIXMES ?= "HOSTTOOLS_DIR"
 SSTATECLEANFUNCS = ""
 
 # 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):
     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)
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}"
 
 # We need the following for the sstate code to process the wrapper
 SSTATE_SCAN_FILES += "depmodwrapper"
-EXTRA_STAGING_FIXMES = "PKGDATA_DIR"
+EXTRA_STAGING_FIXMES += "PKGDATA_DIR"
 
 do_populate_sysroot[depends] = ""