From 48389de678da8f059f36c8394d0ed0328e7ddfe5 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 29 Jul 2021 19:56:24 +0200
Subject: Manually fix conversion

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .gitlab-ci.yml                     |  4 ++--
 classes/image_types_ostree.bbclass |  2 +-
 classes/image_types_ota.bbclass    |  4 ++--
 classes/sota.bbclass               | 10 +++++-----
 conf/layer.conf                    | 12 ++++++------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc3308f..2fade39 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ Oe-selftest qemux86_64:
   stage: test
   variables:
     TEST_BUILD_DIR: 'build-oe-qemux86_64'
-    OE_SELFTESTS: 'updater_native updater:qemux86_64'
+    OE_SELFTESTS: 'updater_native updater_qemux86_64'
   except:
     - pushes
 
@@ -105,7 +105,7 @@ Ptest qemux86_64:
   stage: test
   variables:
     TEST_BUILD_DIR: 'build-oe-qemux86_64-ptest'
-    OE_SELFTESTS: 'updater:qemux86_64_ptest'
+    OE_SELFTESTS: 'updater_qemux86_64_ptest'
   except:
     - pushes
   only:
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 5d55cdb..832f945 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -17,7 +17,7 @@ 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 ]"
 CONVERSIONTYPES:append = " tar"
 
-TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}"
+TAR_IMAGE_ROOTFS:task-image-ostree = "${OSTREE_ROOTFS}"
 
 do_image_ostree[dirs] = "${OSTREE_ROOTFS}"
 do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}"
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 0bb31de..41c4801 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -1,5 +1,5 @@
 OTA_SYSROOT = "${WORKDIR}/ota-sysroot"
-TAR_IMAGE_ROOTFS_task-image-ota = "${OTA_SYSROOT}"
+TAR_IMAGE_ROOTFS:task-image-ota = "${OTA_SYSROOT}"
 IMAGE_TYPEDEP_ota = "ostreecommit"
 do_image_ota[dirs] = "${OTA_SYSROOT}"
 do_image_ota[cleandirs] = "${OTA_SYSROOT}"
@@ -79,7 +79,7 @@ IMAGE_CMD:ota () {
 
 EXTRA_IMAGECMD:ota-ext4 = "-L otaroot -i 4096 -t ext4"
 IMAGE_TYPEDEP_ota-ext4 = "ota"
-IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}"
+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
 	ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ota-ext4
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 32efe5c..9eccdcd 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -47,12 +47,12 @@ GARAGE_CUSTOMIZE_TARGET ?= ""
 
 SOTA_MACHINE ??="none"
 SOTA_MACHINE:rpi ?= "raspberrypi"
-SOTA_MACHINE_porter ?= "porter"
-SOTA_MACHINE_m3ulcb = "m3ulcb"
-SOTA_MACHINE_intel-corei7-64 ?= "minnowboard"
+SOTA_MACHINE:porter ?= "porter"
+SOTA_MACHINE:m3ulcb = "m3ulcb"
+SOTA_MACHINE:intel-corei7-64 ?= "minnowboard"
 SOTA_MACHINE:qemux86-64 ?= "qemux86-64"
-SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
-SOTA_MACHINE_freedom-u540 ?= "freedom-u540"
+SOTA_MACHINE:am335x-evm ?= "am335x-evm-wifi"
+SOTA_MACHINE:freedom-u540 ?= "freedom-u540"
 
 SOTA_OVERRIDES_BLACKLIST = "ostree ota"
 SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME"
diff --git a/conf/layer.conf b/conf/layer.conf
index 672fed8..bce1439 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,13 +6,13 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "sota"
-BBFILE_PATTERN:sota = "^${LAYERDIR}/"
-BBFILE_PRIORITY:sota = "7"
+BBFILE_PATTERN_sota = "^${LAYERDIR}/"
+BBFILE_PRIORITY_sota = "7"
 
-LAYERDEPENDS:sota = "openembedded-layer"
-LAYERDEPENDS:sota += "meta-python"
-LAYERDEPENDS:sota += "filesystems-layer"
-LAYERSERIES_COMPAT:sota = "dunfell gatesgarth hardknott"
+LAYERDEPENDS_sota = "openembedded-layer"
+LAYERDEPENDS_sota += "meta-python"
+LAYERDEPENDS_sota += "filesystems-layer"
+LAYERSERIES_COMPAT_sota = "dunfell gatesgarth hardknott"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   aktualizr-device-prov->aktualizr \
-- 
cgit v1.2.3-54-g00ecf