summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 17:25:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-21 00:29:30 +0100
commit6e95cb246f39e4d49d46761b9a7d51c858ac7e9d (patch)
tree1646acfdc315d3dfcc2516a6f49509ba7f633fae /scripts/runqemu
parent4d609d502161137620c4b1901cc225f9e871c3dc (diff)
downloadpoky-6e95cb246f39e4d49d46761b9a7d51c858ac7e9d.tar.gz
Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
(From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu18
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
235QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin 235QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin
236QEMUX86_DEFAULT_FSTYPE=ext3 236QEMUX86_DEFAULT_FSTYPE=ext3
237QEMUX86_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 237QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
238 238
239QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin 239QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin
240QEMUX86_64_DEFAULT_FSTYPE=ext3 240QEMUX86_64_DEFAULT_FSTYPE=ext3
241QEMUX86_64_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 241QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
242 242
243QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin 243QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin
244QEMUARM_DEFAULT_FSTYPE=ext3 244QEMUARM_DEFAULT_FSTYPE=ext3
245QEMUARM_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 245QEMUARM_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
246 246
247QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin 247QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
248QEMUMIPS_DEFAULT_FSTYPE=ext3 248QEMUMIPS_DEFAULT_FSTYPE=ext3
249QEMUMIPS_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 249QEMUMIPS_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
250 250
251QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin 251QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin
252QEMUPPC_DEFAULT_FSTYPE=ext3 252QEMUPPC_DEFAULT_FSTYPE=ext3
253QEMUPPC_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 253QEMUPPC_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
254 254
255AKITA_DEFAULT_KERNEL=zImage-akita.bin 255AKITA_DEFAULT_KERNEL=zImage-akita.bin
256AKITA_DEFAULT_FSTYPE=jffs2 256AKITA_DEFAULT_FSTYPE=jffs2
257AKITA_DEFAULT_ROOTFS="poky-image-sato" 257AKITA_DEFAULT_ROOTFS="core-image-sato"
258 258
259SPITZ_DEFAULT_KERNEL=zImage-spitz.bin 259SPITZ_DEFAULT_KERNEL=zImage-spitz.bin
260SPITZ_DEFAULT_FSTYPE=ext3 260SPITZ_DEFAULT_FSTYPE=ext3
261SPITZ_DEFAULT_ROOTFS="poky-image-sato" 261SPITZ_DEFAULT_ROOTFS="core-image-sato"
262 262
263setup_tmpdir() { 263setup_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
357if [ "$LAZY_ROOTFS" = "true" ]; then 357if [ "$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"