[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 88/246] useradd: use bindir_native for pseudo PATH

[Emmanuele Bassi <ebassi src gnome org>]

commit 06ed5c5a1024131d2ff15394dd6fcaf55b599bbc
Author: Martin Jansa <martin jansa gmail com>
Date:   Wed May 18 11:57:33 2016 +0200

    useradd: use bindir_native for pseudo PATH
    
    * useradd/userdel functions will fail for recipes which override their target prefix
      (e.g. to /opt/foo), because it will try to use pseudo from native-sysroot/opt/foo/bin/pseudo
    
    (From OE-Core rev: 96189e71a86c0f4833e8e51d678208fd908bfe30)
    
    (From OE-Core rev: fe20ce64de7a3d8bcd21bb1fc2cfd65563b82767)
    
    Signed-off-by: Martin Jansa <Martin Jansa gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/useradd.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index ee402ac..8283bf3 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -103,7 +103,7 @@ useradd_sysroot () {
        # Pseudo may (do_install) or may not (do_populate_sysroot_setscene) be running 
        # at this point so we're explicit about the environment so pseudo can load if 
        # not already present.
-       export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo 
${STAGING_DIR_NATIVE}${bindir}/pseudo"
+       export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo 
${STAGING_DIR_NATIVE}${bindir_native}/pseudo"
 
        # Explicitly set $D since it isn't set to anything
        # before do_install
@@ -130,7 +130,7 @@ useradd_sysroot_sstate () {
 userdel_sysroot_sstate () {
 if test "x${STAGING_DIR_TARGET}" != "x"; then
     if [ "${BB_CURRENTTASK}" = "configure" -o "${BB_CURRENTTASK}" = "clean" ]; then
-        export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo 
${STAGING_DIR_NATIVE}${bindir}/pseudo"
+        export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo 
${STAGING_DIR_NATIVE}${bindir_native}/pseudo"
         OPT="--root ${STAGING_DIR_TARGET}"
 
         # Remove groups and users defined for package