diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-17 14:36:02 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-17 16:14:07 +0000 |
| commit | 3abc81b79850f42e8e041feab3acd52b574026f9 (patch) | |
| tree | c90ce6926c83ecf31fb8168f01f91310c3303309 | |
| parent | f04e6a59b4c6eedb4ecdc9e7cfa483e1f0449578 (diff) | |
| download | openembedded-core-3abc81b79850f42e8e041feab3acd52b574026f9.tar.gz openembedded-core-3abc81b79850f42e8e041feab3acd52b574026f9.tar.bz2 openembedded-core-3abc81b79850f42e8e041feab3acd52b574026f9.tar.xz openembedded-core-3abc81b79850f42e8e041feab3acd52b574026f9.zip | |
bitbake.conf/poky-env-internal: Adjust PSEUDO variables to match pseudo enabled/disabled modes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 7c7dde556..c26beea95 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -544,8 +544,8 @@ SRC_URI = "file://${FILE}" # We can choose which provider of fake root privileges to use # default is fakeroot but in Poky we use pseudo PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" -FAKEROOT = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 pseudo" -FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 LD_PRELOAD=libpseudo.so LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}/pseudo/lib64:${STAGING_LIBDIR_NATIVE}/pseudo/lib" +FAKEROOT = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0 " +FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 2000b5bb4..1557f9ddb 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -124,7 +124,7 @@ export BUILDDIR export PATH # Stop multi byte characters breaking the patcher stuff - This is for Redhat / Fedora people really export LANG=C -export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND" +export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND PSEUDO_DISABLED" cat <<EOM |