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 | poky-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.gz |
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 d69e7a3e23..d0abe56f57 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -43,7 +43,7 @@ if [ "x$1" != "x" ]; then | |||
43 | TYPE=$1 | 43 | TYPE=$1 |
44 | shift | 44 | shift |
45 | else | 45 | else |
46 | TYPE="ext2" | 46 | TYPE="ext3" |
47 | if [ "$MACHINE" = "akita" ]; then | 47 | if [ "$MACHINE" = "akita" ]; then |
48 | TYPE="jffs2" | 48 | TYPE="jffs2" |
49 | fi | 49 | fi |
@@ -73,15 +73,15 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o | |||
73 | fi | 73 | fi |
74 | 74 | ||
75 | if [ "$MACHINE" = "qemuarm" ]; then | 75 | if [ "$MACHINE" = "qemuarm" ]; then |
76 | if [ "$TYPE" = "ext2" ]; then | 76 | if [ "$TYPE" = "ext3" ]; then |
77 | if [ "x$HDIMAGE" = "x" ]; then | 77 | if [ "x$HDIMAGE" = "x" ]; then |
78 | T=$BUILDDIR/tmp/deploy/images/poky-image | 78 | T=$BUILDDIR/tmp/deploy/images/poky-image |
79 | if [ -e "$T-sdk-qemuarm.ext2" ]; then | 79 | if [ -e "$T-sdk-qemuarm.ext3" ]; then |
80 | HDIMAGE="$T-sdk-qemuarm.ext2" | 80 | HDIMAGE="$T-sdk-qemuarm.ext3" |
81 | elif [ -e "$T-sato-qemuarm.ext2" ]; then | 81 | elif [ -e "$T-sato-qemuarm.ext3" ]; then |
82 | HDIMAGE="$T-sato-qemuarm.ext2" | 82 | HDIMAGE="$T-sato-qemuarm.ext3" |
83 | elif [ -e "$T-minimal-qemuarm.ext2" ]; then | 83 | elif [ -e "$T-minimal-qemuarm.ext3" ]; then |
84 | HDIMAGE="$T-minimal-qemuarm.ext2" | 84 | HDIMAGE="$T-minimal-qemuarm.ext3" |
85 | fi | 85 | fi |
86 | fi | 86 | fi |
87 | fi | 87 | fi |
@@ -116,15 +116,15 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
116 | if [ "x$ZIMAGE" = "x" ]; then | 116 | if [ "x$ZIMAGE" = "x" ]; then |
117 | ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin | 117 | ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin |
118 | fi | 118 | fi |
119 | if [ "$TYPE" = "ext2" ]; then | 119 | if [ "$TYPE" = "ext3" ]; then |
120 | if [ "x$HDIMAGE" = "x" ]; then | 120 | if [ "x$HDIMAGE" = "x" ]; then |
121 | T=$BUILDDIR/tmp/deploy/images/poky-image | 121 | T=$BUILDDIR/tmp/deploy/images/poky-image |
122 | if [ -e "$T-sdk-qemux86.ext2" ]; then | 122 | if [ -e "$T-sdk-qemux86.ext3" ]; then |
123 | HDIMAGE=$T-sdk-qemux86.ext2 | 123 | HDIMAGE=$T-sdk-qemux86.ext3 |
124 | elif [ -e "$T-sato-qemux86.ext2" ]; then | 124 | elif [ -e "$T-sato-qemux86.ext3" ]; then |
125 | HDIMAGE=$T-sato-qemux86.ext2 | 125 | HDIMAGE=$T-sato-qemux86.ext3 |
126 | elif [ -e "$T-minimal-qemux86.ext2" ]; then | 126 | elif [ -e "$T-minimal-qemux86.ext3" ]; then |
127 | HDIMAGE=$T-minimal-qemux86.ext2 | 127 | HDIMAGE=$T-minimal-qemux86.ext3 |
128 | fi | 128 | fi |
129 | fi | 129 | fi |
130 | fi | 130 | fi |