diff options
author | Ross Burton <ross.burton@intel.com> | 2017-09-14 17:32:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:39:46 +0000 |
commit | c458f2867e1052193713d430fc2ddde62aa28b98 (patch) | |
tree | 816e2fe6b94ce5f68bb22895b75c09f5538afb4a | |
parent | 9351217eb78206bf0d4e801c9c33440f7b9ef41b (diff) | |
download | poky-c458f2867e1052193713d430fc2ddde62aa28b98.tar.gz |
useradd: don't override pseudo environment
Back in the dark days before recipe-specific-sysroots the paths being passed in
this manual construction of the pseudo environment made sense, but now they're
incorrect and result in pseudo writing to two different databases during a
single build. The result is that pseudo doesn't follow changes to /etc/passwd
in the sysroot, and warns in the logs.
Remove the PSEUDO_LOCALSTATEDIR assignment and inherit the correct assignment in
FAKEROOTENV.
(From OE-Core rev: 02457ef7f600ce954874e2d11e74b1c6daaa3bfc)
(From OE-Core rev: e8112536055e75dff43369395a6cf6ba44ba8db7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/useradd.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 6017ded860..0f51e5522b 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -100,7 +100,7 @@ useradd_sysroot () { | |||
100 | # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running | 100 | # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running |
101 | # at this point so we're explicit about the environment so pseudo can load if | 101 | # at this point so we're explicit about the environment so pseudo can load if |
102 | # not already present. | 102 | # not already present. |
103 | export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${PSEUDO_SYSROOT}${bindir_native}/pseudo" | 103 | export PSEUDO="${FAKEROOTENV} ${PSEUDO_SYSROOT}${bindir_native}/pseudo" |
104 | 104 | ||
105 | # Explicitly set $D since it isn't set to anything | 105 | # Explicitly set $D since it isn't set to anything |
106 | # before do_prepare_recipe_sysroot | 106 | # before do_prepare_recipe_sysroot |