summaryrefslogtreecommitdiffstats
path: root/scripts/poky-qemu-internal
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2010-12-07 20:59:06 -0800
committerJoshua Lock <josh@linux.intel.com>2011-01-14 12:07:29 +0000
commit54f08d23cd7d0de6aec31f4764389ff4dab2990d (patch)
tree1514e13c646a2c22031a0c2a75a2602ea4fae47e /scripts/poky-qemu-internal
parent8a3d0f375ce416ada1a5443e4a8e467504001beb (diff)
downloadpoky-54f08d23cd7d0de6aec31f4764389ff4dab2990d.tar.gz
Make poky-qemu and related scripts work with arbitrary SDK locations
* No longer assume SDK toolchains are installed in /opt/poky * [BUGFIX #568] where specifying paths to both the kernel and fs image caused an error due to POKY_NATIVE_SYSROOT never being set, triggering failure of poky-qemu-ifup/ifdown * Cosmetic improvements to usage() functions by using basename Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'scripts/poky-qemu-internal')
-rwxr-xr-xscripts/poky-qemu-internal16
1 files changed, 1 insertions, 15 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index cf16407e2a..c38d530336 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -394,23 +394,9 @@ if [ "x$QEMUOPTIONS" = "x" ]; then
394 return 394 return
395fi 395fi
396 396
397SDKDIR="/opt/poky/sysroots" 397PATH=$CROSSPATH:$POKY_NATIVE_SYSROOT/usr/bin:$PATH
398if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then
399 SDKPATH="$SDKDIR/arm-poky-linux-gnueabi/bin"
400fi
401
402if [ "$MACHINE" = "qemux86" ]; then
403 SDKPATH="$SDKDIR/i586-poky-linux/bin"
404fi
405
406if [ "$MACHINE" = "qemux86-64" ]; then
407 SDKPATH="$SDKDIR/x86_64-poky-linux/bin"
408fi
409
410PATH=$CROSSPATH:$SDKPATH:$PATH
411 398
412QEMUBIN=`which $QEMU` 399QEMUBIN=`which $QEMU`
413
414if [ ! -x "$QEMUBIN" ]; then 400if [ ! -x "$QEMUBIN" ]; then
415 echo "Error: No QEMU binary '$QEMU' could be found." 401 echo "Error: No QEMU binary '$QEMU' could be found."
416 cleanup 402 cleanup