diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2016-05-18 11:57:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-19 09:05:19 +0100 |
commit | 1e244471d08c8426466d4e6591ec75478791fe5d (patch) | |
tree | d7e6826bbf990920f8a2ae256175427ef8e3f4a8 /meta/classes/useradd.bbclass | |
parent | 90cb500a7ffb54940c6eedfba38e7a4f97267702 (diff) | |
download | poky-1e244471d08c8426466d4e6591ec75478791fe5d.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)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/useradd.bbclass')
-rw-r--r-- | meta/classes/useradd.bbclass | 4 |
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 () { | |||
130 | userdel_sysroot_sstate () { | 130 | userdel_sysroot_sstate () { |
131 | if test "x${STAGING_DIR_TARGET}" != "x"; then | 131 | if 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 |