summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/lib/oeqa/targetcontrol.py2
-rwxr-xr-xscripts/runqemu20
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index a5fc88aa01..d5c0b376ce 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -15,7 +15,7 @@ MACHINE_FEATURES = "alsa bluetooth usbgadget screen"
15 15
16MACHINEOVERRIDES =. "qemuall:" 16MACHINEOVERRIDES =. "qemuall:"
17 17
18IMAGE_FSTYPES += "tar.bz2 ext3" 18IMAGE_FSTYPES += "tar.bz2 ext4"
19 19
20# Don't include kernels in standard images 20# Don't include kernels in standard images
21RDEPENDS_kernel-base = "" 21RDEPENDS_kernel-base = ""
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index cc582dd1ad..1f4770f94e 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -110,7 +110,7 @@ class BaseTarget(object):
110 110
111class QemuTarget(BaseTarget): 111class QemuTarget(BaseTarget):
112 112
113 supported_image_fstypes = ['ext3'] 113 supported_image_fstypes = ['ext3', 'ext4']
114 114
115 def __init__(self, d): 115 def __init__(self, d):
116 116
diff --git a/scripts/runqemu b/scripts/runqemu
index 3d753191cd..7ba92fb927 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -39,7 +39,7 @@ usage() {
39 echo "" 39 echo ""
40 echo "Examples:" 40 echo "Examples:"
41 echo " $MYNAME qemuarm" 41 echo " $MYNAME qemuarm"
42 echo " $MYNAME qemux86-64 core-image-sato ext3" 42 echo " $MYNAME qemux86-64 core-image-sato ext4"
43 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" 43 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial"
44 echo " $MYNAME qemux86 ramfs" 44 echo " $MYNAME qemux86 ramfs"
45 echo " $MYNAME qemux86 iso" 45 echo " $MYNAME qemux86 iso"
@@ -296,31 +296,31 @@ machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'`
296 296
297# Defaults used when these vars need to be inferred 297# Defaults used when these vars need to be inferred
298QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin 298QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin
299QEMUX86_DEFAULT_FSTYPE=ext3 299QEMUX86_DEFAULT_FSTYPE=ext4
300 300
301QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin 301QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin
302QEMUX86_64_DEFAULT_FSTYPE=ext3 302QEMUX86_64_DEFAULT_FSTYPE=ext4
303 303
304QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin 304QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin
305QEMUARM_DEFAULT_FSTYPE=ext3 305QEMUARM_DEFAULT_FSTYPE=ext4
306 306
307QEMUARM64_DEFAULT_KERNEL=Image-qemuarm64.bin 307QEMUARM64_DEFAULT_KERNEL=Image-qemuarm64.bin
308QEMUARM64_DEFAULT_FSTYPE=ext3 308QEMUARM64_DEFAULT_FSTYPE=ext4
309 309
310QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin 310QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
311QEMUMIPS_DEFAULT_FSTYPE=ext3 311QEMUMIPS_DEFAULT_FSTYPE=ext4
312 312
313QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin 313QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin
314QEMUMIPSEL_DEFAULT_FSTYPE=ext3 314QEMUMIPSEL_DEFAULT_FSTYPE=ext4
315 315
316QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin 316QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin
317QEMUMIPS64_DEFAULT_FSTYPE=ext3 317QEMUMIPS64_DEFAULT_FSTYPE=ext4
318 318
319QEMUSH4_DEFAULT_KERNEL=vmlinux-qemumips.bin 319QEMUSH4_DEFAULT_KERNEL=vmlinux-qemumips.bin
320QEMUSH4_DEFAULT_FSTYPE=ext3 320QEMUSH4_DEFAULT_FSTYPE=ext4
321 321
322QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin 322QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin
323QEMUPPC_DEFAULT_FSTYPE=ext3 323QEMUPPC_DEFAULT_FSTYPE=ext4
324 324
325QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub 325QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub
326QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio 326QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio