diff options
| -rw-r--r-- | meta/classes/bootimg.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/image-live.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/image-vm.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/image_types.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oe/image.py | 4 |
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() { 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 52b6de718a..fa7a131eda 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 28519c8af1..bc0503bfc0 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 cc789fc27f..35ceb7beaf 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 40f61515eb..699c30fa2b 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): |