diff options
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 2 | ||||
-rwxr-xr-x | scripts/runqemu | 20 |
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 | ||
16 | MACHINEOVERRIDES =. "qemuall:" | 16 | MACHINEOVERRIDES =. "qemuall:" |
17 | 17 | ||
18 | IMAGE_FSTYPES += "tar.bz2 ext3" | 18 | IMAGE_FSTYPES += "tar.bz2 ext4" |
19 | 19 | ||
20 | # Don't include kernels in standard images | 20 | # Don't include kernels in standard images |
21 | RDEPENDS_kernel-base = "" | 21 | RDEPENDS_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 | ||
111 | class QemuTarget(BaseTarget): | 111 | class 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 |
298 | QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin | 298 | QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin |
299 | QEMUX86_DEFAULT_FSTYPE=ext3 | 299 | QEMUX86_DEFAULT_FSTYPE=ext4 |
300 | 300 | ||
301 | QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin | 301 | QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin |
302 | QEMUX86_64_DEFAULT_FSTYPE=ext3 | 302 | QEMUX86_64_DEFAULT_FSTYPE=ext4 |
303 | 303 | ||
304 | QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin | 304 | QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin |
305 | QEMUARM_DEFAULT_FSTYPE=ext3 | 305 | QEMUARM_DEFAULT_FSTYPE=ext4 |
306 | 306 | ||
307 | QEMUARM64_DEFAULT_KERNEL=Image-qemuarm64.bin | 307 | QEMUARM64_DEFAULT_KERNEL=Image-qemuarm64.bin |
308 | QEMUARM64_DEFAULT_FSTYPE=ext3 | 308 | QEMUARM64_DEFAULT_FSTYPE=ext4 |
309 | 309 | ||
310 | QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin | 310 | QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin |
311 | QEMUMIPS_DEFAULT_FSTYPE=ext3 | 311 | QEMUMIPS_DEFAULT_FSTYPE=ext4 |
312 | 312 | ||
313 | QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin | 313 | QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin |
314 | QEMUMIPSEL_DEFAULT_FSTYPE=ext3 | 314 | QEMUMIPSEL_DEFAULT_FSTYPE=ext4 |
315 | 315 | ||
316 | QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin | 316 | QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin |
317 | QEMUMIPS64_DEFAULT_FSTYPE=ext3 | 317 | QEMUMIPS64_DEFAULT_FSTYPE=ext4 |
318 | 318 | ||
319 | QEMUSH4_DEFAULT_KERNEL=vmlinux-qemumips.bin | 319 | QEMUSH4_DEFAULT_KERNEL=vmlinux-qemumips.bin |
320 | QEMUSH4_DEFAULT_FSTYPE=ext3 | 320 | QEMUSH4_DEFAULT_FSTYPE=ext4 |
321 | 321 | ||
322 | QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin | 322 | QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin |
323 | QEMUPPC_DEFAULT_FSTYPE=ext3 | 323 | QEMUPPC_DEFAULT_FSTYPE=ext4 |
324 | 324 | ||
325 | QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub | 325 | QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub |
326 | QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio | 326 | QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio |