summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo@foundries.io>2021-01-11 22:26:54 -0300
committerMing Liu <liu.ming50@gmail.com>2021-01-30 13:26:39 +0100
commit17ee8a7741f4752c9dbb27885dd7cbdb2e3655ef (patch)
treed9d3cfb8a16b272bf06735430253963a07f72b2b
parentb1bb00f4b645e7ab5cf6af4a6579df8b0f24e079 (diff)
downloadmeta-updater-17ee8a7741f4752c9dbb27885dd7cbdb2e3655ef.tar.gz
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 <ricardo@foundries.io>
-rw-r--r--classes/image_types_ota.bbclass2
1 files changed, 1 insertions, 1 deletions
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 () {
69 echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions 69 echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions
70} 70}
71 71
72EXTRA_IMAGECMD_ota-ext4 = "-O ^64bit,^metadata_csum -L otaroot -i 4096 -t ext4" 72EXTRA_IMAGECMD_ota-ext4 = "-L otaroot -i 4096 -t ext4"
73IMAGE_TYPEDEP_ota-ext4 = "ota" 73IMAGE_TYPEDEP_ota-ext4 = "ota"
74IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}" 74IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}"
75IMAGE_CMD_ota-ext4 () { 75IMAGE_CMD_ota-ext4 () {