diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-09 18:21:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-09 18:39:27 +0100 |
commit | c505815742328a5bfe4bd3d3eff5e671c1be222c (patch) | |
tree | 2b4b1cbb373dde48cd1c41eca67986c4bce5ed34 /meta/conf/bitbake.conf | |
parent | 5a83e50250aaea33e2c55b2f13796565c02e80af (diff) | |
download | poky-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>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 |
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 |
574 | PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" | 574 | PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" |
575 | export 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 | ||
575 | FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" | 579 | FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" |
576 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" | 580 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" |
577 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" | 581 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" |