From 96189e71a86c0f4833e8e51d678208fd908bfe30 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 May 2016 11:57:33 +0200 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/useradd.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') 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 () { # 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 -- cgit 1.2.3-korg