IMAGES_FSTYPES: default to EXT4

The following IMAGES_FSTYPES defaulted to ext3:
"vmdk", "vdi", "qcow2", "live", "iso", "hddimg"

This patch changes the default for those IMAGES_FSTYPES to
ext4 in order to bring the images more in line with other BSPs.

Besides improvements in performance and reliability ext4 provides
additional functionality as well (option to turn off the journaling,
dynamic resizing of VDI volumes etc.).

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 5adcacc0f3717dc0e0bc69c3a176c198a80475c5..ec9d0b7d526e1c1bbb0de72e1ae4a3155e3df33e 100644 (file)
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -296,8 +296,8 @@ python do_bootimg() {
     bb.build.exec_func('build_iso', d)
 }
 
-IMAGE_TYPEDEP_iso = "ext3"
-IMAGE_TYPEDEP_hddimg = "ext3"
+IMAGE_TYPEDEP_iso = "ext4"
+IMAGE_TYPEDEP_hddimg = "ext4"
 IMAGE_TYPES_MASKED += "iso hddimg"
 
 addtask bootimg before do_build

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 52b6de718a01a5e960034867f017acbfa099b992..fa7a131edadf4bfd8b2721fdb4cce2feb5973213 100644 (file)
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -7,12 +7,12 @@ SYSLINUX_TIMEOUT ?= "50"
 SYSLINUX_LABELS ?= "boot install"
 LABELS_append = " ${SYSLINUX_LABELS} "
 
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4"
 
 do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs"
 do_bootimg[depends] += "${PN}:do_rootfs"
 
 inherit bootimg
 
-IMAGE_TYPEDEP_live = "ext3"
+IMAGE_TYPEDEP_live = "ext4"
 IMAGE_TYPES_MASKED += "live"

diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 28519c8af19e8d60e8a2451e3e27befa4f74ecdc..bc0503bfc0134d7723c5fcbb40d20bc3b1c9b8e3 100644 (file)
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -7,14 +7,14 @@ LABELS_append = " ${SYSLINUX_LABELS} "
 
 # need to define the dependency and the ROOTFS for directdisk
 do_bootdirectdisk[depends] += "${PN}:do_rootfs"
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4"
 
 # creating VM images relies on having a hddimg so ensure we inherit it here.
 inherit boot-directdisk
 
-IMAGE_TYPEDEP_vmdk = "ext3"
-IMAGE_TYPEDEP_vdi = "ext3"
-IMAGE_TYPEDEP_qcow2 = "ext3"
+IMAGE_TYPEDEP_vmdk = "ext4"
+IMAGE_TYPEDEP_vdi = "ext4"
+IMAGE_TYPEDEP_qcow2 = "ext4"
 IMAGE_TYPES_MASKED += "vmdk vdi qcow2"
 
 create_vmdk_image () {

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index cc789fc27f1ae920b951d78dc9e3050b0700d49c..35ceb7beafcc6a21537454f49af177570e8dc10e 100644 (file)
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -14,7 +14,7 @@ def imagetypes_getdepends(d):
     ctypes = d.getVar('COMPRESSIONTYPES', True).split()
     for type in (d.getVar('IMAGE_FSTYPES', True) or "").split():
         if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]:
-            type = "ext3"
+            type = "ext4"
         basetype = type
         for ctype in ctypes:
             if type.endswith("." + ctype):

diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 40f61515eb5196ce4a7e2a72efbc0407fb86b44b..699c30fa2bd9e8781a0ae03febbdd8bf5d8d7e68 100644 (file)
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -76,8 +76,8 @@ class ImageDepGraph(object):
 
     def _image_base_type(self, type):
         ctypes = self.d.getVar('COMPRESSIONTYPES', True).split()
-        if type in ["vmdk", "vdi", "live", "iso", "hddimg"]:
-            type = "ext3"
+        if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]:
+            type = "ext4"
         basetype = type
         for ctype in ctypes:
             if type.endswith("." + ctype):