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
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
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
echo "Running $QEMU using sudo..."
echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
-sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS
-
-
+sudo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
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
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
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