From 31a770d3c0cb22c9f4ece068208d2e6b2c28f1ee Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 19:44:05 +0200 Subject: Convert to new override syntax This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa --- classes/image_types_ota.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/image_types_ota.bbclass') diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 8af6637..0bb31de 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -5,7 +5,7 @@ do_image_ota[dirs] = "${OTA_SYSROOT}" do_image_ota[cleandirs] = "${OTA_SYSROOT}" do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \ ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER') == 'u-boot' else ''}" -IMAGE_CMD_ota () { +IMAGE_CMD:ota () { ostree admin --sysroot=${OTA_SYSROOT} init-fs --modern ${OTA_SYSROOT} ostree admin --sysroot=${OTA_SYSROOT} os-init ${OSTREE_OSNAME} @@ -77,10 +77,10 @@ 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 = "-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 () { +IMAGE_CMD:ota-ext4 () { ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ota-ext4 ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ota-ext4 oe_mkext234fs ota-ext4 ${EXTRA_IMAGECMD} -- cgit v1.2.3-54-g00ecf