scripts/poky-env-internal: Further cleanups

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 6bdb8df41e..5b206ed55c 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -23,11 +23,11 @@ SCRIPTPATH=`readlink -f "$BASH_SOURCE"`
 OEROOT="`dirname $SCRIPTPATH`/../"
 
 if [ "x$BDIR" = "x" ]; then
-          if [ "x$1" = "x" ]; then
+    if [ "x$1" = "x" ]; then
         BDIR="build"
-          else
-                    BDIR=`readlink -f "$1"`
-          fi
+    else
+        BDIR=`readlink -f "$1"`
+    fi
 fi
 if [[ "$BDIR" = /* ]] ; then
     BUILDDIR="$BDIR"
@@ -98,13 +98,15 @@ fi
 # Prevent disturbing a new GIT clone in same console
 unset POKYLOCALCONF
 unset POKYLAYERCONF
+unset BITBAKEDIR
+unset OEROOT
 
+# Used by the poky-qemu script
 export BUILDDIR
-
-# Don't export TARGET_ARCH - it *will* cause build failures
-export PATH LD_LIBRARY_PATH
+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"
 
 cat <<EOM
 
@@ -122,4 +124,3 @@ You can also run generated qemu images with a command like 'poky-qemu qemux86'
 
 EOM
 
-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"