diff options
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index d155b561f1..894a296e1c 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -34,7 +34,7 @@ usage() { | |||
34 | echo "" | 34 | echo "" |
35 | echo "Examples:" | 35 | echo "Examples:" |
36 | echo " $MYNAME qemuarm" | 36 | echo " $MYNAME qemuarm" |
37 | echo " $MYNAME qemux86-64 poky-image-sato ext3" | 37 | echo " $MYNAME qemux86-64 core-image-sato ext3" |
38 | echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" | 38 | echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" |
39 | echo " $MYNAME qemux86 \"<-m 256>\"" | 39 | echo " $MYNAME qemux86 \"<-m 256>\"" |
40 | exit 1 | 40 | exit 1 |
@@ -234,31 +234,31 @@ machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'` | |||
234 | # Defaults used when these vars need to be inferred | 234 | # Defaults used when these vars need to be inferred |
235 | QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin | 235 | QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin |
236 | QEMUX86_DEFAULT_FSTYPE=ext3 | 236 | QEMUX86_DEFAULT_FSTYPE=ext3 |
237 | QEMUX86_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" | 237 | QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" |
238 | 238 | ||
239 | QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin | 239 | QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin |
240 | QEMUX86_64_DEFAULT_FSTYPE=ext3 | 240 | QEMUX86_64_DEFAULT_FSTYPE=ext3 |
241 | QEMUX86_64_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" | 241 | QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" |
242 | 242 | ||
243 | QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin | 243 | QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin |
244 | QEMUARM_DEFAULT_FSTYPE=ext3 | 244 | QEMUARM_DEFAULT_FSTYPE=ext3 |
245 | QEMUARM_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" | 245 | QEMUARM_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" |
246 | 246 | ||
247 | QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin | 247 | QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin |
248 | QEMUMIPS_DEFAULT_FSTYPE=ext3 | 248 | QEMUMIPS_DEFAULT_FSTYPE=ext3 |
249 | QEMUMIPS_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" | 249 | QEMUMIPS_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" |
250 | 250 | ||
251 | QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin | 251 | QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin |
252 | QEMUPPC_DEFAULT_FSTYPE=ext3 | 252 | QEMUPPC_DEFAULT_FSTYPE=ext3 |
253 | QEMUPPC_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" | 253 | QEMUPPC_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" |
254 | 254 | ||
255 | AKITA_DEFAULT_KERNEL=zImage-akita.bin | 255 | AKITA_DEFAULT_KERNEL=zImage-akita.bin |
256 | AKITA_DEFAULT_FSTYPE=jffs2 | 256 | AKITA_DEFAULT_FSTYPE=jffs2 |
257 | AKITA_DEFAULT_ROOTFS="poky-image-sato" | 257 | AKITA_DEFAULT_ROOTFS="core-image-sato" |
258 | 258 | ||
259 | SPITZ_DEFAULT_KERNEL=zImage-spitz.bin | 259 | SPITZ_DEFAULT_KERNEL=zImage-spitz.bin |
260 | SPITZ_DEFAULT_FSTYPE=ext3 | 260 | SPITZ_DEFAULT_FSTYPE=ext3 |
261 | SPITZ_DEFAULT_ROOTFS="poky-image-sato" | 261 | SPITZ_DEFAULT_ROOTFS="core-image-sato" |
262 | 262 | ||
263 | setup_tmpdir() { | 263 | setup_tmpdir() { |
264 | if [ -z "$TMPDIR" ]; then | 264 | if [ -z "$TMPDIR" ]; then |
@@ -353,7 +353,7 @@ fi | |||
353 | # FSTYPE is now set for all cases | 353 | # FSTYPE is now set for all cases |
354 | 354 | ||
355 | # Handle cases where a ROOTFS type is given instead of a filename, e.g. | 355 | # Handle cases where a ROOTFS type is given instead of a filename, e.g. |
356 | # poky-image-sato | 356 | # core-image-sato |
357 | if [ "$LAZY_ROOTFS" = "true" ]; then | 357 | if [ "$LAZY_ROOTFS" = "true" ]; then |
358 | setup_tmpdir | 358 | setup_tmpdir |
359 | echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE" | 359 | echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE" |