diff options
| author |   Scott Garman <scott.a.garman@intel.com> | 2010-12-07 20:59:06 -0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-12-09 15:00:45 +0000 |
| commit | ba5e0b9531b9a967aa3d408a13024590d96b8391 (patch) | |
| tree | 47b7536aa4da6efc78106a1a57c6ebe9a13e91d2 /scripts/poky-qemu-internal | |
| parent | 7581654a030961eda03b07de0e0f6d62a7f4055e (diff) | |
| download | openembedded-core-ba5e0b9531b9a967aa3d408a13024590d96b8391.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-x | scripts/poky-qemu-internal | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index 62c1040f71..ca2511a024 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal @@ -394,23 +394,9 @@ if [ "x$QEMUOPTIONS" = "x" ]; then return fi -SDKDIR="/opt/poky/sysroots" -if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then - SDKPATH="$SDKDIR/arm-poky-linux-gnueabi/bin" -fi - -if [ "$MACHINE" = "qemux86" ]; then - SDKPATH="$SDKDIR/i586-poky-linux/bin" -fi - -if [ "$MACHINE" = "qemux86-64" ]; then - SDKPATH="$SDKDIR/x86_64-poky-linux/bin" -fi - -PATH=$CROSSPATH:$SDKPATH:$PATH +PATH=$CROSSPATH:$POKY_NATIVE_SYSROOT/usr/bin:$PATH QEMUBIN=`which $QEMU` - if [ ! -x "$QEMUBIN" ]; then echo "Error: No QEMU binary '$QEMU' could be found." cleanup |