diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-05 16:00:31 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-05 16:00:31 +0000 |
| commit | eae7eb5bd559c1f4ae843820f2d4105066b3cc45 (patch) | |
| tree | ed9c2119f83c805bd289e2e3ec12c412a1b9335d /scripts/runqemu | |
| parent | e45a4a847c40eebc2baa9041f95d623cbe87cc9e (diff) | |
| download | openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.gz openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.bz2 openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.xz openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.zip | |
scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images
Diffstat (limited to 'scripts/runqemu')
| -rwxr-xr-x | scripts/runqemu | 30 |
1 files changed, 15 insertions, 15 deletions
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 |