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"

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 () {
74		74
75	if [ "$(ls -A ${HOST_DATA})" ]; then	75	if [ "$(ls -A ${HOST_DATA})" ]; then
76	echo "Generating swabber report"	76	echo "Generating swabber report"
77	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	77	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
78	else	78	else
79	echo "No host data, cannot generate swabber report."	79	echo "No host data, cannot generate swabber report."
80	fi	80	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
99	unset POKYLOCALCONF	99	unset POKYLOCALCONF
100	unset POKYLAYERCONF	100	unset POKYLAYERCONF
101		101
102	export OEROOT BUILDDIR	102	export 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
108	unset LD_LIBRARY_PATH	108	unset 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
110	export PATH LD_LIBRARY_PATH OEROOT	110	export 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
112	export LANG=C	112	export 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
133	EOM	133	EOM
134		134
135	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"	135	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"