summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-09 18:21:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-09 18:39:27 +0100
commitc505815742328a5bfe4bd3d3eff5e671c1be222c (patch)
tree2b4b1cbb373dde48cd1c41eca67986c4bce5ed34
parent5a83e50250aaea33e2c55b2f13796565c02e80af (diff)
downloadpoky-c505815742328a5bfe4bd3d3eff5e671c1be222c.tar.gz
bitbake.conf: Default to explicitly setting the variable to disable pseudo
If we don't do this, sometimes pseudo can end up enabling itself when it isn't required. Setting this value into the environment explicitly ensures that does not happen. (From OE-Core rev: 72252799e8c51a633a231a2cd1fe797b7faae713) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a68be0786b..b7bcc23890 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -572,6 +572,10 @@ SRC_URI = "file://${FILE}"
572 572
573# Use pseudo as the fakeroot implementation 573# Use pseudo as the fakeroot implementation
574PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" 574PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
575export PSEUDO_DISABLED = "1"
576#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
577#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
578#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib
575FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" 579FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
576FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" 580FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
577PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" 581PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"