From 910243aec359e5d9d2a96611a210571aaefaedce Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Mon, 11 Jan 2021 22:26:54 -0300 Subject: image_types_ota.bbclass: use standard ext4 features Avoid removing 64bit and metadata_csum by default and prefer the standard ext4 features instead. 64bit enables the file system to be larger than 2^32 blocks and metadata_csum enables metadata checksumming, both of which are enabled by default on recent mke2fs releases. It is unclear why 64bit was disabled by looking at the git history, but my assumption would be that either kernel or userspace was old enough for this feature to not be supported/available. Since this option is currently used by most distros by default, it should now be safe to enable it (requires kernel >= 2.6.28). metadata_csum was disabled in 4d34fa53db to make the u-boot tooling work with the ext4 file system (when saving environment), but the correct fix should instead be a fix at the userspace tooling instead, since not every target requires u-boot. Signed-off-by: Ricardo Salveti --- classes/image_types_ota.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 1b7dbf8..283b50e 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -69,7 +69,7 @@ IMAGE_CMD_ota () { echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions } -EXTRA_IMAGECMD_ota-ext4 = "-O ^64bit,^metadata_csum -L otaroot -i 4096 -t ext4" +EXTRA_IMAGECMD_ota-ext4 = "-L otaroot -i 4096 -t ext4" IMAGE_TYPEDEP_ota-ext4 = "ota" IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}" IMAGE_CMD_ota-ext4 () { -- cgit v1.2.3-54-g00ecf