summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2012-06-20 16:55:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-25 16:35:52 +0100
commit0abfb690a847df660726103157d7dc50a57286ec (patch)
tree76359ab31571c21fc27d46bfcc11cdfbbe45647a /scripts
parent7874440990404bfe4707b7eee04b53a4a29a3b3e (diff)
downloadpoky-0abfb690a847df660726103157d7dc50a57286ec.tar.gz
runqemu-internal: qemu fails to run on ext2 image
[Yocto 2579] When set DISTRO to poky-tiny, only ext2 image is created. But runqemu-internal doesn't set QEMUOPTIONS for ext2 image that make qemu fail to boot. Fix it for qemux86 arch since poky-tiny can only build for qemux86 now. (From OE-Core rev: 5f2f951bdcb6f29e3ece39250715293d92db5f69) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu-internal2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c8e31864ab..041464dd7c 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -319,7 +319,7 @@ fi
319if [ "$MACHINE" = "qemux86" ]; then 319if [ "$MACHINE" = "qemux86" ]; then
320 QEMU=qemu 320 QEMU=qemu
321 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" 321 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
322 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 322 if [ "$FSTYPE" = "ext2" -o "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
323 KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 323 KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
324 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" 324 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS"
325 fi 325 fi