[oe-commits] [openembedded-core] 15/35: useradd: don't override pseudo environment

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 02457ef7f600ce954874e2d11e74b1c6daaa3bfc
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Thu Sep 14 17:32:24 2017 +0100

    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 at intel.com>
---
 meta/classes/useradd.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 6017ded..0f51e55 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.