From f46d8ef7e0eaa3c3df743fff3821115697093d7b Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 4 Aug 2021 16:31:31 +0200
Subject: image_types_ostree.bbclass, image_types_ota.bbclass: convert
 CONVERSION_CMD and IMAGE_TYPEDEP as well

* for honister this depends on new changes in oe-core:
  https://git.openembedded.org/openembedded-core/commit/?id=52674c4b1fdf79829095031b2e342d44fb0dc181
  https://git.openembedded.org/openembedded-core/commit/?id=8573f6b2a7af9867da0b21936ffd2cd2a417de1d
  for dunfell, gatesgarth, hardknott the colons will be replaced with underscores by bitbake
  and everything will work as before

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 classes/image_types_ostree.bbclass | 10 +++++-----
 classes/image_types_ota.bbclass    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 832f945..efc5bcf 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -14,7 +14,7 @@ BUILD_OSTREE_TARBALL ??= "1"
 SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}"
 
 IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
-CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]"
+CONVERSION_CMD:tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]"
 CONVERSIONTYPES:append = " tar"
 
 TAR_IMAGE_ROOTFS:task-image-ostree = "${OSTREE_ROOTFS}"
@@ -126,7 +126,7 @@ IMAGE_CMD:ostree () {
     cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest
 }
 
-IMAGE_TYPEDEP_ostreecommit = "ostree"
+IMAGE_TYPEDEP:ostreecommit = "ostree"
 do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot"
 do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock"
 IMAGE_CMD:ostreecommit () {
@@ -151,7 +151,7 @@ IMAGE_CMD:ostreecommit () {
     fi
 }
 
-IMAGE_TYPEDEP_ostreepush = "ostreecommit"
+IMAGE_TYPEDEP:ostreepush = "ostreecommit"
 do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot"
 do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock"
 IMAGE_CMD:ostreepush () {
@@ -177,7 +177,7 @@ IMAGE_CMD:ostreepush () {
     fi
 }
 
-IMAGE_TYPEDEP_garagesign = "ostreepush"
+IMAGE_TYPEDEP:garagesign = "ostreepush"
 do_image_garagesign[depends] += "unzip-native:do_populate_sysroot"
 # This lock solves OTA-1866, which is that removing GARAGE_SIGN_REPO while using
 # garage-sign simultaneously for two images often causes problems.
@@ -269,7 +269,7 @@ IMAGE_CMD:garagesign () {
     fi
 }
 
-IMAGE_TYPEDEP_garagecheck = "garagesign"
+IMAGE_TYPEDEP:garagecheck = "garagesign"
 IMAGE_CMD:garagecheck () {
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         # if credentials are issued by a server that doesn't support offline signing, exit silently
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 41c4801..02c5e99 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -1,6 +1,6 @@
 OTA_SYSROOT = "${WORKDIR}/ota-sysroot"
 TAR_IMAGE_ROOTFS:task-image-ota = "${OTA_SYSROOT}"
-IMAGE_TYPEDEP_ota = "ostreecommit"
+IMAGE_TYPEDEP:ota = "ostreecommit"
 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 ''} \
@@ -78,7 +78,7 @@ IMAGE_CMD:ota () {
 }
 
 EXTRA_IMAGECMD:ota-ext4 = "-L otaroot -i 4096 -t ext4"
-IMAGE_TYPEDEP_ota-ext4 = "ota"
+IMAGE_TYPEDEP:ota-ext4 = "ota"
 IMAGE_ROOTFS:task-image-ota-ext4 = "${OTA_SYSROOT}"
 IMAGE_CMD:ota-ext4 () {
 	ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ota-ext4
-- 
cgit v1.2.3-54-g00ecf