[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7974/8267] staging.bbclass: handle postinst-useradd-* fixmes

[Emmanuele Bassi <ebassi src gnome org>]

commit 5b28fe163a177ee6aae94fc558bb248027e7460d
Author: Mikko Ylinen <mikko ylinen linux intel com>
Date:   Tue Oct 3 10:09:26 2017 +0300

    staging.bbclass: handle postinst-useradd-* fixmes
    
    After 02457ef7f600ce954874e2d11e74b1c6daaa3bfc, PSEUDO for
    postinst-useradd-* scripts get to use only one PSEUDO_LOCALSTATEDIR
    which is set under recipes ${WORKDIR}.
    
    When the those scripts are run in a clean build environment that
    is built from the sstate (populate_sysroot_setscene run for
    postinst-useradd-* providers), pseudo fails to run because it cannot
    access the PSEUDO_LOCALSTATEDIR (recipe ${WORKDIR}s do not exist).
    This triggers a sysroot staging error.
    
    Previously, the PSEUDO_LOCALSTATEDIR setting in useradd.bbclass
    worked because the RSS sstate/staging logic automagically processed
    ${STAGING_DIR_TARGET} in postinst-useradd-* scripts to point under
    the sysroot being built.
    
    The fix uses the same fixme processing by adding PSEUDO_LOCALSTATEDIR
    variable to it. Furthermore, LOGFIFO is added to be able to use
    the logging fifo of the recipe that actually runs postinst-useradd-*.
    
    (From OE-Core rev: b28374cfad37db161b5ac5953b4a4638912f3f27)
    
    Signed-off-by: Mikko Ylinen <mikko ylinen linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/staging.bbclass |    2 +-
 meta/classes/useradd.bbclass |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index d21e198..c479bd9 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -167,7 +167,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 ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR']:
+    for fixmevar in ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR', 'PSEUDO_LOCALSTATEDIR', 'LOGFIFO']:
         fixme_path = d.getVar(fixmevar)
         cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path)
     bb.debug(2, cmd)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 686e5fb..c9103cb 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -133,9 +133,10 @@ useradd_sysroot () {
 }
 
 # The export of PSEUDO in useradd_sysroot() above contains references to
-# ${COMPONENTS_DIR}. These need to be handled when restoring
+# ${COMPONENTS_DIR} and ${PSEUDO_LOCALSTATEDIR}. Additionally, the logging
+# shell functions use ${LOGFIFO}. These need to be handled when restoring
 # postinst-useradd-${PN} from the sstate cache.
-EXTRA_STAGING_FIXMES += "COMPONENTS_DIR"
+EXTRA_STAGING_FIXMES += "COMPONENTS_DIR PSEUDO_LOCALSTATEDIR LOGFIFO"
 
 python useradd_sysroot_sstate () {
     scriptfile = None