diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-11-28 12:41:09 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-28 12:41:09 +0000 |
| commit | bfa66493eb92ae3b738c2564155c78daa047999d (patch) | |
| tree | 9fca195f728b78879daf422b676967fbdb98a83e | |
| parent | a39f335f59ec4c2fc5442b2312afd9a4fa3a690d (diff) | |
| download | openembedded-core-contrib-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>
| -rw-r--r-- | meta/classes/image-swab.bbclass | 2 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass index 93918bfc81..554867bf98 100644 --- a/meta/classes/image-swab.bbclass +++ b/meta/classes/image-swab.bbclass @@ -74,7 +74,7 @@ do_generate_swabber_report () { if [ "$(ls -A ${HOST_DATA})" ]; then echo "Generating swabber report" - swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} ${OEROOT} /tmp /dev /proc /usr/lib/python2.6 /usr/local/lib/python2.6 /usr/lib/pymodules /etc/ld.so.cache + swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} ${POKYBASE} /tmp /dev /proc /usr/lib/python2.6 /usr/local/lib/python2.6 /usr/lib/pymodules /etc/ld.so.cache else echo "No host data, cannot generate swabber report." fi 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 unset POKYLOCALCONF unset POKYLAYERCONF -export OEROOT BUILDDIR +export BUILDDIR # Kill off the TERMINFO variable, as glibc will grab its contents in its 'make # install' if set @@ -107,7 +107,7 @@ unset TERMINFO # kill this so we don't link non-arm libraries unset LD_LIBRARY_PATH # Don't export TARGET_ARCH - it *will* cause build failures -export PATH LD_LIBRARY_PATH OEROOT +export PATH LD_LIBRARY_PATH # Stop multi byte characters breaking the patcher stuff - This is for Redhat / Fedora people really export LANG=C # 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' EOM -export 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" +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" |