aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2015-08-11 12:02:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-16 09:25:17 +0100
commit2b56d671d2f0ef22786c97e29e1215eb80c94490 (patch)
tree0d1938bea1e55fc979207458a81bd8162f7a92b3
parent73c98d38e94d3b1407620c134f3b00dcd9d6132c (diff)
downloadopenembedded-core-contrib-2b56d671d2f0ef22786c97e29e1215eb80c94490.tar.gz
openembedded-core-contrib-2b56d671d2f0ef22786c97e29e1215eb80c94490.tar.bz2
openembedded-core-contrib-2b56d671d2f0ef22786c97e29e1215eb80c94490.zip
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>
-rw-r--r--meta/classes/bootimg.bbclass4
-rw-r--r--meta/classes/image-live.bbclass4
-rw-r--r--meta/classes/image-vm.bbclass8
-rw-r--r--meta/classes/image_types.bbclass2
-rw-r--r--meta/lib/oe/image.py4
5 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 5adcacc0f37..ec9d0b7d526 100644
--- 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 52b6de718a0..fa7a131edad 100644
--- 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 28519c8af19..bc0503bfc01 100644
--- 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 cc789fc27f1..35ceb7beafc 100644
--- 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 40f61515eb5..699c30fa2bd 100644
--- 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):