From c2f71a86f5eb040932adf695887a1885d760f536 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Jul 2010 13:14:24 +0100 Subject: poky-env-internal/runqemu: Move BUILD_SYS handling which is runqemu specific into runqemu Signed-off-by: Richard Purdie --- scripts/poky-env-internal | 6 +----- scripts/runqemu | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 62785f1ac..d25816c6a 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -82,10 +82,6 @@ BBPATH="$NEWPATH" MSG='' -BUILD_ARCH=`uname -m` -BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` -BUILD_SYS="$BUILD_ARCH-$BUILD_OS" - PATH="$BITBAKEDIR/bin/:$OEROOT/scripts:$PATH" # Remove any symlinks from paths @@ -128,7 +124,7 @@ fi unset POKYLOCALCONF unset POKYLAYERCONF -export BBPATH OEROOT BUILD_SYS BUILDDIR +export BBPATH OEROOT BUILDDIR # Kill off the TERMINFO variable, as glibc will grab its contents in its 'make # install' if set diff --git a/scripts/runqemu b/scripts/runqemu index 82fc4e93b..c45b2a1c8 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -23,9 +23,13 @@ if [ "x$BUILDDIR" = "x" ]; then type -P bitbake &>/dev/null || { echo "You either need bitbake in your PATH or to source poky-init-build-env before running this script" >&2; exit 1; } - # we have bitbake in PATH, get TMPDIR from the environment + # we have bitbake in PATH, get TMPDIR and BUILD_SYS from the environment TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` + BUILD_SYS=`bitbake -e | grep BUILD_SYS=\" | cut -d '=' -f2 | cut -d '"' -f2` else + BUILD_ARCH=`uname -m` + BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` + BUILD_SYS="$BUILD_ARCH-$BUILD_OS" TMPDIR=$BUILDDIR/tmp fi -- cgit v1.2.3