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 | poky-3abc81b79850f42e8e041feab3acd52b574026f9.tar.gz |
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 7c7dde5563..c26beea959 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -544,8 +544,8 @@ SRC_URI = "file://${FILE}" | |||
544 | # We can choose which provider of fake root privileges to use | 544 | # We can choose which provider of fake root privileges to use |
545 | # default is fakeroot but in Poky we use pseudo | 545 | # default is fakeroot but in Poky we use pseudo |
546 | PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" | 546 | PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" |
547 | FAKEROOT = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 pseudo" | 547 | FAKEROOT = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0 " |
548 | 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" | 548 | FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" |
549 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" | 549 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" |
550 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" | 550 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" |
551 | 551 | ||
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 2000b5bb42..1557f9ddbd 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal | |||
@@ -124,7 +124,7 @@ export BUILDDIR | |||
124 | export PATH | 124 | export PATH |
125 | # Stop multi byte characters breaking the patcher stuff - This is for Redhat / Fedora people really | 125 | # Stop multi byte characters breaking the patcher stuff - This is for Redhat / Fedora people really |
126 | export LANG=C | 126 | export LANG=C |
127 | 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" | 127 | 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" |
128 | 128 | ||
129 | cat <<EOM | 129 | cat <<EOM |
130 | 130 | ||