diff options
author | Phil Blundell <philb@gnu.org> | 2011-09-07 21:20:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-07 23:44:29 +0100 |
commit | 00b47701f4818091bfd694a32dcbfb1b12fb2427 (patch) | |
tree | 92f01355a5f4b6013d0c04352ac8fec6f045db66 /meta/classes/useradd.bbclass | |
parent | 8712dfb3af5ee171149019562810305016fffcb1 (diff) | |
download | poky-00b47701f4818091bfd694a32dcbfb1b12fb2427.tar.gz |
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 <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/useradd.bbclass')
-rw-r--r-- | meta/classes/useradd.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
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="" | |||
15 | 15 | ||
16 | if test "x$D" != "x"; then | 16 | if test "x$D" != "x"; then |
17 | # Installing into a sysroot | 17 | # Installing into a sysroot |
18 | SYSROOT="${STAGING_DIR_TARGET}" | 18 | SYSROOT="$D" |
19 | OPT="--root ${STAGING_DIR_TARGET}" | 19 | OPT="--root $D" |
20 | 20 | ||
21 | # Add groups and users defined for all recipe packages | 21 | # Add groups and users defined for all recipe packages |
22 | GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}" | 22 | GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}" |
@@ -79,7 +79,7 @@ useradd_sysroot () { | |||
79 | 79 | ||
80 | # Explicitly set $D since it isn't set to anything | 80 | # Explicitly set $D since it isn't set to anything |
81 | # before do_install | 81 | # before do_install |
82 | D=${D} | 82 | D=${STAGING_DIR_TARGET} |
83 | useradd_preinst | 83 | useradd_preinst |
84 | } | 84 | } |
85 | 85 | ||