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:18 +0000 |
| commit | e8112536055e75dff43369395a6cf6ba44ba8db7 (patch) | |
| tree | f1c36ca9d101b21ed44c47d8e9dc3ba06a35bd95 | |
| parent | 93dd2f9f3edf0584f9e806c629611d645dd72dbf (diff) | |
| download | openembedded-core-e8112536055e75dff43369395a6cf6ba44ba8db7.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)
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>
| -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 () { # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running # at this point so we're explicit about the environment so pseudo can load if # not already present. - export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${PSEUDO_SYSROOT}${bindir_native}/pseudo" + export PSEUDO="${FAKEROOTENV} ${PSEUDO_SYSROOT}${bindir_native}/pseudo" # Explicitly set $D since it isn't set to anything # before do_prepare_recipe_sysroot |