From eae7eb5bd559c1f4ae843820f2d4105066b3cc45 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 5 Jan 2009 16:00:31 +0000 Subject: scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images --- scripts/runqemu | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'scripts/runqemu') diff --git a/scripts/runqemu b/scripts/runqemu index d69e7a3e2..d0abe56f5 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 -- cgit v1.2.3