summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-11-28 12:41:09 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-28 12:41:09 +0000
commitbfa66493eb92ae3b738c2564155c78daa047999d (patch)
tree9fca195f728b78879daf422b676967fbdb98a83e /scripts
parenta39f335f59ec4c2fc5442b2312afd9a4fa3a690d (diff)
downloadpoky-bfa66493eb92ae3b738c2564155c78daa047999d.tar.gz
scripts/poky-env-internal/image-swab.bbclass: Remove OEROOT references
OEROOT isn't used outside the init script so stop exporting it into the environment where it can "corrupt" sstate packages. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/poky-env-internal6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index ae26cab7e4..756d18c458 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -99,7 +99,7 @@ fi
99unset POKYLOCALCONF 99unset POKYLOCALCONF
100unset POKYLAYERCONF 100unset POKYLAYERCONF
101 101
102export OEROOT BUILDDIR 102export BUILDDIR
103 103
104# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make 104# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make
105# install' if set 105# install' if set
@@ -107,7 +107,7 @@ unset TERMINFO
107# kill this so we don't link non-arm libraries 107# kill this so we don't link non-arm libraries
108unset LD_LIBRARY_PATH 108unset LD_LIBRARY_PATH
109# Don't export TARGET_ARCH - it *will* cause build failures 109# Don't export TARGET_ARCH - it *will* cause build failures
110export PATH LD_LIBRARY_PATH OEROOT 110export PATH LD_LIBRARY_PATH
111# Stop multi byte characters breaking the patcher stuff - This is for Redhat / Fedora people really 111# Stop multi byte characters breaking the patcher stuff - This is for Redhat / Fedora people really
112export LANG=C 112export LANG=C
113# Kill PYTHONPATH as otherwise the Python specified there will conflict with 113# Kill PYTHONPATH as otherwise the Python specified there will conflict with
@@ -132,4 +132,4 @@ You can also run generated qemu images with a command like 'poky-qemu qemux86'
132 132
133EOM 133EOM
134 134
135export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT 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" 135export 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"