summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2016-05-18 11:57:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-27 09:05:57 +0100
commit06ed5c5a1024131d2ff15394dd6fcaf55b599bbc (patch)
tree28af00eb39070695458ee91149529b8e9371445a
parent9fa0bc450068a720b99e5dd2db26cfcc235e4581 (diff)
downloadpoky-06ed5c5a1024131d2ff15394dd6fcaf55b599bbc.tar.gz
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>
-rw-r--r--meta/classes/useradd.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index ee402acef1..8283bf301b 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -103,7 +103,7 @@ useradd_sysroot () {
103 # Pseudo may (do_install) or may not (do_populate_sysroot_setscene) be running 103 # Pseudo may (do_install) or may not (do_populate_sysroot_setscene) be running
104 # at this point so we're explicit about the environment so pseudo can load if 104 # at this point so we're explicit about the environment so pseudo can load if
105 # not already present. 105 # not already present.
106 export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/pseudo" 106 export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir_native}/pseudo"
107 107
108 # Explicitly set $D since it isn't set to anything 108 # Explicitly set $D since it isn't set to anything
109 # before do_install 109 # before do_install
@@ -130,7 +130,7 @@ useradd_sysroot_sstate () {
130userdel_sysroot_sstate () { 130userdel_sysroot_sstate () {
131if test "x${STAGING_DIR_TARGET}" != "x"; then 131if test "x${STAGING_DIR_TARGET}" != "x"; then
132 if [ "${BB_CURRENTTASK}" = "configure" -o "${BB_CURRENTTASK}" = "clean" ]; then 132 if [ "${BB_CURRENTTASK}" = "configure" -o "${BB_CURRENTTASK}" = "clean" ]; then
133 export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/pseudo" 133 export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir_native}/pseudo"
134 OPT="--root ${STAGING_DIR_TARGET}" 134 OPT="--root ${STAGING_DIR_TARGET}"
135 135
136 # Remove groups and users defined for package 136 # Remove groups and users defined for package