From 00b47701f4818091bfd694a32dcbfb1b12fb2427 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 7 Sep 2011 21:20:12 +0100 Subject: useradd.bbclass: use correct value for $D in postinst functions This corrects the location of the password file used during package installation. See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009183.html and subsequent discussion. (From OE-Core rev: 848bb277769af5b094031aeb54d287c158256724) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/classes/useradd.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/useradd.bbclass') diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 5f5b68ddd0..1e03a04a8c 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -15,8 +15,8 @@ SYSROOT="" if test "x$D" != "x"; then # Installing into a sysroot - SYSROOT="${STAGING_DIR_TARGET}" - OPT="--root ${STAGING_DIR_TARGET}" + SYSROOT="$D" + OPT="--root $D" # Add groups and users defined for all recipe packages GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}" @@ -79,7 +79,7 @@ useradd_sysroot () { # Explicitly set $D since it isn't set to anything # before do_install - D=${D} + D=${STAGING_DIR_TARGET} useradd_preinst } -- cgit v1.2.3-54-g00ecf