scripts: Various tweaks/fixes for the qemu scripts

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3440 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 11 insertions, 9 deletions

diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index e715844af4..82e6a038df 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -60,7 +60,7 @@ fi
 if [ "$MACHINE" = "qemuarm" ]; then
     QEMU=`which qemu-system-arm`
     if [ "$TYPE" = "ext2" ]; then
-        QEMUOPTIONS="-append \"root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY\" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet"
+        QEMUOPTIONS="-append 'root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY' $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet"
     fi
     if [ "$TYPE" = "nfs" ]; then
         if [ "x$HDIMAGE" = "x" ]; then
@@ -70,14 +70,14 @@ if [ "$MACHINE" = "qemuarm" ]; then
             echo "Error, NFS mount point $HDIMAGE doesn't exist"
             return
         fi
-        QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb"
+        QEMUOPTIONS="-append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -M versatilepb"
     fi
 fi
 
 if [ "$MACHINE" = "qemux86" ]; then
     QEMU=`which qemu`
     if [ "$TYPE" = "ext2" ]; then
-        QEMUOPTIONS="-std-vga -append \"root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
+        QEMUOPTIONS="-std-vga -append 'root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
     fi
     if [ "$TYPE" = "nfs" ]; then
         if [ "x$HDIMAGE" = "x" ]; then
@@ -87,7 +87,7 @@ if [ "$MACHINE" = "qemux86" ]; then
             echo "Error, NFS mount point $HDIMAGE doesn't exist."
             return
         fi
-        QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD"
+        QEMUOPTIONS="-std-vga -append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD"
     fi
 fi
 
@@ -124,6 +124,4 @@ fi
 
 echo "Running $QEMU using sudo..."
 echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
-sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS
-
-
+sudo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
diff --git a/scripts/runqemu b/scripts/runqemu
index d3df26c48a..bc40b46745 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -62,7 +62,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
     if [ "x$ZIMAGE" = "x" ]; then
         ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin
     fi
-    CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux/bin
+    CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux-gnueabi/bin
 fi
 
 if [ "$MACHINE" = "qemuarm" ]; then
@@ -73,6 +73,8 @@ if [ "$MACHINE" = "qemuarm" ]; then
                 HDIMAGE="$T-sdk-qemuarm.ext2"
             elif [ -e "$T-sato-qemuarm.ext2" ]; then
                 HDIMAGE="$T-sato-qemuarm.ext2"
+            elif [ -e "$T-minimal-qemuarm.ext2" ]; then
+                HDIMAGE="$T-minimal-qemuarm.ext2"
             fi
         fi
     fi
@@ -105,10 +107,12 @@ if [ "$MACHINE" = "qemux86" ]; then
                 HDIMAGE=$T-sdk-qemux86.ext2
             elif [ -e "$T-sato-qemux86.ext2" ]; then
                 HDIMAGE=$T-sato-qemux86.ext2
+            elif [ -e "$T-minimal-qemux86.ext2" ]; then
+                HDIMAGE=$T-minimal-qemux86.ext2
             fi
         fi
     fi
-    CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin
+    CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux-gnueabi/bin
 fi
 
 export PATH=$CROSSPATH:$PATH