summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-05 16:00:31 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-05 16:00:31 +0000
commiteae7eb5bd559c1f4ae843820f2d4105066b3cc45 (patch)
treeed9c2119f83c805bd289e2e3ec12c412a1b9335d
parente45a4a847c40eebc2baa9041f95d623cbe87cc9e (diff)
downloadpoky-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.gz
poky-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.bz2
poky-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.zip
scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images
-rwxr-xr-xscripts/poky-qemu2
-rwxr-xr-xscripts/poky-qemu-internal8
-rwxr-xr-xscripts/runqemu30
3 files changed, 20 insertions, 20 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 1407c25f33..be070d7024 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -40,7 +40,7 @@ fi
if [ "x$1" = "x" ]; then
TYPE="nfs"
else
- TYPE="ext2"
+ TYPE="ext3"
if [ "$MACHINE" = "akita" ]; then
TYPE="jffs2"
fi
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index b9061ecd8e..327c0dd3d6 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -88,7 +88,7 @@ fi
if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
QEMU=qemu-system-arm
- if [ "$TYPE" = "ext2" ]; then
+ if [ "$TYPE" = "ext3" ]; then
KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot"
fi
@@ -113,9 +113,9 @@ fi
if [ "$MACHINE" = "qemux86" ]; then
QEMU=qemu
- if [ "$TYPE" = "ext2" ]; then
+ if [ "$TYPE" = "ext3" ]; then
KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
- QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
+ QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
fi
if [ "$TYPE" = "nfs" ]; then
if [ "x$HDIMAGE" = "x" ]; then
@@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then
return
fi
KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="-std-vga -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD"
+ QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD"
fi
fi
diff --git a/scripts/runqemu b/scripts/runqemu
index d69e7a3e23..d0abe56f57 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -43,7 +43,7 @@ if [ "x$1" != "x" ]; then
TYPE=$1
shift
else
- TYPE="ext2"
+ TYPE="ext3"
if [ "$MACHINE" = "akita" ]; then
TYPE="jffs2"
fi
@@ -73,15 +73,15 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
fi
if [ "$MACHINE" = "qemuarm" ]; then
- if [ "$TYPE" = "ext2" ]; then
+ if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then
T=$BUILDDIR/tmp/deploy/images/poky-image
- if [ -e "$T-sdk-qemuarm.ext2" ]; 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"
+ if [ -e "$T-sdk-qemuarm.ext3" ]; then
+ HDIMAGE="$T-sdk-qemuarm.ext3"
+ elif [ -e "$T-sato-qemuarm.ext3" ]; then
+ HDIMAGE="$T-sato-qemuarm.ext3"
+ elif [ -e "$T-minimal-qemuarm.ext3" ]; then
+ HDIMAGE="$T-minimal-qemuarm.ext3"
fi
fi
fi
@@ -116,15 +116,15 @@ if [ "$MACHINE" = "qemux86" ]; then
if [ "x$ZIMAGE" = "x" ]; then
ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin
fi
- if [ "$TYPE" = "ext2" ]; then
+ if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then
T=$BUILDDIR/tmp/deploy/images/poky-image
- if [ -e "$T-sdk-qemux86.ext2" ]; 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
+ if [ -e "$T-sdk-qemux86.ext3" ]; then
+ HDIMAGE=$T-sdk-qemux86.ext3
+ elif [ -e "$T-sato-qemux86.ext3" ]; then
+ HDIMAGE=$T-sato-qemux86.ext3
+ elif [ -e "$T-minimal-qemux86.ext3" ]; then
+ HDIMAGE=$T-minimal-qemux86.ext3
fi
fi
fi