summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-05-14 06:36:56 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-05-14 06:36:56 +0800
commita722741e3200053e97c7f476ac66bc3c1c45ee1f (patch)
tree370f305bbd91a07a400295c2754777f1f91d3410 /scripts
parentdfd1472edaa7e7569fc5219510d94a550df44af8 (diff)
parent5a3f17ee6b1ac156e2d8d30b9f6304d4731d9163 (diff)
downloadpoky-a722741e3200053e97c7f476ac66bc3c1c45ee1f.tar.gz
Merge branch 'tk/head' of ssh://git.pokylinux.org/poky-contrib
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/poky-env-internal4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index b931e29323..c91811d59c 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -104,6 +104,10 @@ if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
104 cp -f $POKYLAYERCONF $BUILDDIR/conf/bblayers.conf 104 cp -f $POKYLAYERCONF $BUILDDIR/conf/bblayers.conf
105fi 105fi
106 106
107# Prevent disturbing a new GIT clone in same console
108unset POKYLOCALCONF
109unset POKYLAYERCONF
110
107export BBPATH OEROOT BUILD_SYS BUILDDIR 111export BBPATH OEROOT BUILD_SYS BUILDDIR
108 112
109# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make 113# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make