summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-09-14 17:32:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-18 11:07:22 +0100
commit02457ef7f600ce954874e2d11e74b1c6daaa3bfc (patch)
treec36e9fee466b87f65932a18e7577d91182514caf
parentf2c809b1fe8679892220a06044d9b4bf2c8ae849 (diff)
downloadopenembedded-core-contrib-02457ef7f600ce954874e2d11e74b1c6daaa3bfc.tar.gz
openembedded-core-contrib-02457ef7f600ce954874e2d11e74b1c6daaa3bfc.tar.bz2
openembedded-core-contrib-02457ef7f600ce954874e2d11e74b1c6daaa3bfc.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/useradd.bbclass2
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