summaryrefslogtreecommitdiffstats
path: root/meta
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 22:40:51 +0100
commit407d1562450d430a25a9cc2e89a8bf18a75099b7 (patch)
treea66f9d251e0cba7f66b36cf1aafdbe3a8a3826ae /meta
parent857da0884a645517e69407a8eafd0c33111ab8a3 (diff)
downloadpoky-407d1562450d430a25a9cc2e89a8bf18a75099b7.tar.gz
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.). (From OE-Core rev: 2b56d671d2f0ef22786c97e29e1215eb80c94490) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 5adcacc0f3..ec9d0b7d52 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -296,8 +296,8 @@ python do_bootimg() {
296 bb.build.exec_func('build_iso', d) 296 bb.build.exec_func('build_iso', d)
297} 297}
298 298
299IMAGE_TYPEDEP_iso = "ext3" 299IMAGE_TYPEDEP_iso = "ext4"
300IMAGE_TYPEDEP_hddimg = "ext3" 300IMAGE_TYPEDEP_hddimg = "ext4"
301IMAGE_TYPES_MASKED += "iso hddimg" 301IMAGE_TYPES_MASKED += "iso hddimg"
302 302
303addtask bootimg before do_build 303addtask bootimg before do_build
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 52b6de718a..fa7a131eda 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -7,12 +7,12 @@ SYSLINUX_TIMEOUT ?= "50"
7SYSLINUX_LABELS ?= "boot install" 7SYSLINUX_LABELS ?= "boot install"
8LABELS_append = " ${SYSLINUX_LABELS} " 8LABELS_append = " ${SYSLINUX_LABELS} "
9 9
10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" 10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4"
11 11
12do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs" 12do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs"
13do_bootimg[depends] += "${PN}:do_rootfs" 13do_bootimg[depends] += "${PN}:do_rootfs"
14 14
15inherit bootimg 15inherit bootimg
16 16
17IMAGE_TYPEDEP_live = "ext3" 17IMAGE_TYPEDEP_live = "ext4"
18IMAGE_TYPES_MASKED += "live" 18IMAGE_TYPES_MASKED += "live"
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 28519c8af1..bc0503bfc0 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -7,14 +7,14 @@ LABELS_append = " ${SYSLINUX_LABELS} "
7 7
8# need to define the dependency and the ROOTFS for directdisk 8# need to define the dependency and the ROOTFS for directdisk
9do_bootdirectdisk[depends] += "${PN}:do_rootfs" 9do_bootdirectdisk[depends] += "${PN}:do_rootfs"
10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" 10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4"
11 11
12# creating VM images relies on having a hddimg so ensure we inherit it here. 12# creating VM images relies on having a hddimg so ensure we inherit it here.
13inherit boot-directdisk 13inherit boot-directdisk
14 14
15IMAGE_TYPEDEP_vmdk = "ext3" 15IMAGE_TYPEDEP_vmdk = "ext4"
16IMAGE_TYPEDEP_vdi = "ext3" 16IMAGE_TYPEDEP_vdi = "ext4"
17IMAGE_TYPEDEP_qcow2 = "ext3" 17IMAGE_TYPEDEP_qcow2 = "ext4"
18IMAGE_TYPES_MASKED += "vmdk vdi qcow2" 18IMAGE_TYPES_MASKED += "vmdk vdi qcow2"
19 19
20create_vmdk_image () { 20create_vmdk_image () {
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index cc789fc27f..35ceb7beaf 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -14,7 +14,7 @@ def imagetypes_getdepends(d):
14 ctypes = d.getVar('COMPRESSIONTYPES', True).split() 14 ctypes = d.getVar('COMPRESSIONTYPES', True).split()
15 for type in (d.getVar('IMAGE_FSTYPES', True) or "").split(): 15 for type in (d.getVar('IMAGE_FSTYPES', True) or "").split():
16 if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]: 16 if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]:
17 type = "ext3" 17 type = "ext4"
18 basetype = type 18 basetype = type
19 for ctype in ctypes: 19 for ctype in ctypes:
20 if type.endswith("." + ctype): 20 if type.endswith("." + ctype):
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 40f61515eb..699c30fa2b 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -76,8 +76,8 @@ class ImageDepGraph(object):
76 76
77 def _image_base_type(self, type): 77 def _image_base_type(self, type):
78 ctypes = self.d.getVar('COMPRESSIONTYPES', True).split() 78 ctypes = self.d.getVar('COMPRESSIONTYPES', True).split()
79 if type in ["vmdk", "vdi", "live", "iso", "hddimg"]: 79 if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]:
80 type = "ext3" 80 type = "ext4"
81 basetype = type 81 basetype = type
82 for ctype in ctypes: 82 for ctype in ctypes:
83 if type.endswith("." + ctype): 83 if type.endswith("." + ctype):