summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-31 18:45:32 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-31 18:45:32 +0000
commit5bc44c708b5bff662256300e6defbf0fec659788 (patch)
tree255d02e99255a6ac9c3f72db2ecb57c67a922c89
parent23ee199a9219df0a1ba2efa5f732b787de022bf6 (diff)
downloadpoky-5bc44c708b5bff662256300e6defbf0fec659788.tar.gz
poky-5bc44c708b5bff662256300e6defbf0fec659788.tar.bz2
poky-5bc44c708b5bff662256300e6defbf0fec659788.zip
scripts: Fix sdk compiler location handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3652 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xscripts/poky-qemu3
-rwxr-xr-xscripts/poky-qemu-internal17
-rwxr-xr-xscripts/runqemu5
3 files changed, 15 insertions, 10 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 1c680b11f1..79456f6a60 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -50,7 +50,4 @@ fi
INTERNAL_SCRIPT=`which poky-qemu-internal`
-SDKDIR=/usr/local/poky/eabi-glibc/arm/bin/
-PATH=$SDKDIR:$PATH
-
. $INTERNAL_SCRIPT
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index ceb6afdbf3..b43639eb77 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -19,8 +19,9 @@
# Call setting:
-# QEMU_MEMORY (optional) set the amount of memory in the emualted system.
-# SERIAL_LOGFILE (optional) log the serial port output to a file
+# QEMU_MEMORY (optional) - set the amount of memory in the emualted system.
+# SERIAL_LOGFILE (optional) - log the serial port output to a file
+# CROSSPATH - the path to any cross toolchain to use with distcc
#
# Image options:
# MACHINE - the machine to run
@@ -128,9 +129,19 @@ if [ "x$QEMUOPTIONS" = "x" ]; then
return
fi
+SDKDIR="/usr/local/poky/eabi-glibc"
+if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" ]; then
+ SDKPATH="$SDKDIR/arm/arm-poky-linux-gnueabi/bin:$SDKDIR/arm/bin"
+fi
+
+if [ "$MACHINE" = "qemux86" ]; then
+ SDKPATH="$SDKDIR/i586/i586-poky-linux/bin:$SDKDIR/i586/bin"
+fi
+PATH=$CROSSPATH:$SDKPATH:$PATH
+
function _quit() {
if [ -n "$PIDFILE" ]; then
- echo kill `cat $PIDFILE`
+ #echo kill `cat $PIDFILE`
kill `cat $PIDFILE`
fi
return
diff --git a/scripts/runqemu b/scripts/runqemu
index 0176e636a8..070d371c62 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -25,9 +25,6 @@ fi
INTERNAL_SCRIPT=`which poky-qemu-internal`
-SDKDIR=/usr/local/poky/eabi-glibc/arm/bin/
-PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/usr/bin:$BUILDDIR/tmp/cross/bin:$SDKDIR:$PATH
-
if [ "x$1" = "x" ]; then
echo
echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE"
@@ -118,7 +115,7 @@ if [ "$MACHINE" = "qemux86" ]; then
CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin
fi
-export PATH=$CROSSPATH:$PATH
+CROSSPATH=$BUILDDIR/tmp/staging/$BUILD_SYS/usr/bin:$CROSSPATH:$BUILDDIR/tmp/cross/bin
if [ ! -e $CROSSPATH/cc ]; then
ln -s $CROSSPATH/gcc $CROSSPATH/cc