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" MACHINEOVERRIDES =. "qemuall:" -IMAGE_FSTYPES += "tar.bz2 ext3" +IMAGE_FSTYPES += "tar.bz2 ext4" # Don't include kernels in standard images 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): class QemuTarget(BaseTarget): - supported_image_fstypes = ['ext3'] + supported_image_fstypes = ['ext3', 'ext4'] def __init__(self, d): diff --git a/scripts/runqemu b/scripts/runqemu index 3d753191cd..7ba92fb927 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -39,7 +39,7 @@ usage() { echo "" echo "Examples:" echo " $MYNAME qemuarm" - echo " $MYNAME qemux86-64 core-image-sato ext3" + echo " $MYNAME qemux86-64 core-image-sato ext4" echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" echo " $MYNAME qemux86 ramfs" echo " $MYNAME qemux86 iso" @@ -296,31 +296,31 @@ machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'` # Defaults used when these vars need to be inferred QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin -QEMUX86_DEFAULT_FSTYPE=ext3 +QEMUX86_DEFAULT_FSTYPE=ext4 QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin -QEMUX86_64_DEFAULT_FSTYPE=ext3 +QEMUX86_64_DEFAULT_FSTYPE=ext4 QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin -QEMUARM_DEFAULT_FSTYPE=ext3 +QEMUARM_DEFAULT_FSTYPE=ext4 QEMUARM64_DEFAULT_KERNEL=Image-qemuarm64.bin -QEMUARM64_DEFAULT_FSTYPE=ext3 +QEMUARM64_DEFAULT_FSTYPE=ext4 QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin -QEMUMIPS_DEFAULT_FSTYPE=ext3 +QEMUMIPS_DEFAULT_FSTYPE=ext4 QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin -QEMUMIPSEL_DEFAULT_FSTYPE=ext3 +QEMUMIPSEL_DEFAULT_FSTYPE=ext4 QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin -QEMUMIPS64_DEFAULT_FSTYPE=ext3 +QEMUMIPS64_DEFAULT_FSTYPE=ext4 QEMUSH4_DEFAULT_KERNEL=vmlinux-qemumips.bin -QEMUSH4_DEFAULT_FSTYPE=ext3 +QEMUSH4_DEFAULT_FSTYPE=ext4 QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin -QEMUPPC_DEFAULT_FSTYPE=ext3 +QEMUPPC_DEFAULT_FSTYPE=ext4 QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio |