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.

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 5f5b68ddd05c58d3822f0811d1e7ec3bf2b22ec5..1e03a04a8c5e451bcdcaa5b0482a854f57b8e576 100644 (file)
--- 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
 }