Merge pull request #816 from shr-project/jansa/master

Convert to new override syntax

18 files changed, 48 insertions, 48 deletions

diff --git a/recipes-sota/aktualizr/aktualizr-collectd.bb b/recipes-sota/aktualizr/aktualizr-collectd.bb
index c1fc717..5fd81d9 100644
--- a/recipes-sota/aktualizr/aktualizr-collectd.bb
+++ b/recipes-sota/aktualizr/aktualizr-collectd.bb
@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
-RDEPENDS_${PN} = "collectd"
+RDEPENDS:${PN} = "collectd"
 
 SRC_URI = " file://aktualizr-collectd.conf"
 
@@ -15,7 +15,7 @@ do_install() {
     install -m 0644 ${WORKDIR}/aktualizr-collectd.conf ${D}${sysconfdir}/collectd.conf.d/aktualizr.conf
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${sysconfdir}/collectd.conf.d \
                 ${sysconfdir}/collectd.conf.d/aktualizr.conf \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb
index 7239bfd..28b4598 100644
--- a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb
+++ b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb
@@ -24,7 +24,7 @@ do_install() {
         ${D}${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov.bb b/recipes-sota/aktualizr/aktualizr-device-prov.bb
index 391b098..99379ab 100644
--- a/recipes-sota/aktualizr/aktualizr-device-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-device-prov.bb
@@ -24,7 +24,7 @@ do_install() {
         ${D}${libdir}/sota/conf.d/20-sota-device-cred.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/20-sota-device-cred.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-hwid.bb b/recipes-sota/aktualizr/aktualizr-hwid.bb
index fd3e395..4ceb776 100644
--- a/recipes-sota/aktualizr/aktualizr-hwid.bb
+++ b/recipes-sota/aktualizr/aktualizr-hwid.bb
@@ -16,7 +16,7 @@ do_install() {
     fi
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/40-hardware-id.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb
index 9c6f0dd..90a0a2b 100644
--- a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb
+++ b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 inherit allarch
 
 DEPENDS = "zip-native"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 # If the config file from aktualizr used here is changed, you will need to bump
 # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS!
@@ -35,7 +35,7 @@ do_install() {
     fi
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${localstatedir}/sota/sota_provisioning_credentials.zip \
                 "
 
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov.bb b/recipes-sota/aktualizr/aktualizr-shared-prov.bb
index 0c54f32..ad4de5a 100644
--- a/recipes-sota/aktualizr/aktualizr-shared-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-shared-prov.bb
@@ -10,7 +10,7 @@ inherit allarch
 # We need to get the config files from the aktualizr-configs package built by
 # the aktualizr (target) recipe.
 DEPENDS = "aktualizr"
-RDEPENDS_${PN}_append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}"
+RDEPENDS:${PN}:append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}"
 
 # If the config file from aktualizr used here is changed, you will need to bump
 # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS!
@@ -38,7 +38,7 @@ do_install() {
         ${D}${libdir}/sota/conf.d/20-sota-shared-cred.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/20-sota-shared-cred.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
index 2895e5c..6d0bd43 100644
--- a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
+++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
@@ -20,7 +20,7 @@ do_install() {
     install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-uboot-env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/30-rollback.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index ecfbd2b..47e733c 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -6,12 +6,12 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
 
 DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native"
-DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}"
-RDEPENDS_${PN}_class-target = "${PN}-hwid lshw"
+DEPENDS:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}"
+RDEPENDS:${PN}:class-target = "${PN}-hwid lshw"
 
-RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind"
+RDEPENDS:${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind"
 
-PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so"
+PRIVATE_LIBS:${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so"
 
 PV = "1.0+git${SRCPV}"
 PR = "7"
@@ -39,12 +39,12 @@ S = "${WORKDIR}/git"
 inherit cmake pkgconfig ptest systemd
 
 # disable ptest by default as it slows down builds quite a lot
-# can be enabled manually by setting 'PTEST_ENABLED_pn-aktualizr' to '1' in local.conf
+# can be enabled manually by setting 'PTEST_ENABLED:pn-aktualizr' to '1' in local.conf
 PTEST_ENABLED = "0"
 
 SYSTEMD_PACKAGES = "${PN} ${PN}-secondary"
-SYSTEMD_SERVICE_${PN} = "aktualizr.service"
-SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.service"
+SYSTEMD_SERVICE:${PN} = "aktualizr.service"
+SYSTEMD_SERVICE:${PN}-secondary = "aktualizr-secondary.service"
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release ${@bb.utils.contains('PTEST_ENABLED', '1', '-DTESTSUITE_VALGRIND=on', '', d)}"
 
@@ -52,7 +52,7 @@ GARAGE_SIGN_OPS = "${@ d.expand('-DGARAGE_SIGN_ARCHIVE=${WORKDIR}/cli-${GARAGE_S
 PKCS11_ENGINE_PATH = "${libdir}/engines-1.1/pkcs11.so"
 
 PACKAGECONFIG ?= "ostree ${@bb.utils.filter('SOTA_CLIENT_FEATURES', 'hsm serialcan ubootenv', d)}"
-PACKAGECONFIG_class-native = "sota-tools"
+PACKAGECONFIG:class-native = "sota-tools"
 PACKAGECONFIG[warning-as-error] = "-DWARNING_AS_ERROR=ON,-DWARNING_AS_ERROR=OFF,"
 PACKAGECONFIG[ostree] = "-DBUILD_OSTREE=ON,-DBUILD_OSTREE=OFF,ostree,"
 PACKAGECONFIG[hsm] = "-DBUILD_P11=ON -DPKCS11_ENGINE_PATH=${PKCS11_ENGINE_PATH},-DBUILD_P11=OFF,libp11,"
@@ -87,7 +87,7 @@ do_install_ptest() {
     find ${D}/${PTEST_PATH}/build -name "*.cmake" -or -name "DartConfiguration.tcl" -or -name "run-valgrind" | xargs sed -e "s|${S}|${PTEST_PATH}/src|g" -e "s|${B}|${PTEST_PATH}/build|g" -e "s|\"--gtest_output[^\"]*\"||g" -i
 }
 
-do_install_append () {
+do_install:append () {
     install -d ${D}${libdir}/sota
     install -m 0644 ${S}/config/sota-shared-cred.toml ${D}/${libdir}/sota/sota-shared-cred.toml
     install -m 0644 ${S}/config/sota-device-cred-hsm.toml ${D}/${libdir}/sota/sota-device-cred-hsm.toml
@@ -118,7 +118,7 @@ do_install_append () {
            ${D}${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf
 }
 
-PACKAGESPLITFUNCS_prepend = "split_hosttools_packages "
+PACKAGESPLITFUNCS:prepend = "split_hosttools_packages "
 
 python split_hosttools_packages () {
     bindir = d.getVar('bindir')
@@ -131,43 +131,43 @@ PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*"
 
 PACKAGES =+ "${PN}-info ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${bindir}/aktualizr \
                 ${systemd_unitdir}/system/aktualizr.service \
                 "
 
-FILES_${PN}-info = " \
+FILES:${PN}-info = " \
                 ${bindir}/aktualizr-info \
                 "
 
-FILES_${PN}-lib = " \
+FILES:${PN}-lib = " \
                 ${libdir}/libaktualizr.so \
                 "
 
-FILES_${PN}-resource-control = " \
+FILES:${PN}-resource-control = " \
                 ${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf \
                 "
 
-FILES_${PN}-configs = " \
+FILES:${PN}-configs = " \
                 ${sysconfdir}/sota/* \
                 ${libdir}/sota/* \
                 "
 
-FILES_${PN}-secondary = " \
+FILES:${PN}-secondary = " \
                 ${bindir}/aktualizr-secondary \
                 ${libdir}/sota/sota-secondary.toml \
                 ${systemd_unitdir}/system/aktualizr-secondary.service \
                 "
 
-FILES_${PN}-secondary-lib = " \
+FILES:${PN}-secondary-lib = " \
                 ${libdir}/libaktualizr_secondary.so \
                 "
 
-FILES_${PN}-sotatools-lib = " \
+FILES:${PN}-sotatools-lib = " \
                 ${libdir}/libsota_tools.so \
                 "
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
                 ${includedir}/lib${PN} \
                 "
 
diff --git a/recipes-sota/aktualizr/credentials.inc b/recipes-sota/aktualizr/credentials.inc
index 7c44257..0fed92e 100644
--- a/recipes-sota/aktualizr/credentials.inc
+++ b/recipes-sota/aktualizr/credentials.inc
@@ -1 +1 @@
-SRC_URI_append = "${@('file://' + d.getVar('SOTA_PACKED_CREDENTIALS')) if d.getVar('SOTA_PACKED_CREDENTIALS') else ''}"
+SRC_URI:append = "${@('file://' + d.getVar('SOTA_PACKED_CREDENTIALS')) if d.getVar('SOTA_PACKED_CREDENTIALS') else ''}"
diff --git a/recipes-sota/config/aktualizr-auto-reboot.bb b/recipes-sota/config/aktualizr-auto-reboot.bb
index f360d9e..6048d92 100644
--- a/recipes-sota/config/aktualizr-auto-reboot.bb
+++ b/recipes-sota/config/aktualizr-auto-reboot.bb
@@ -11,12 +11,12 @@ SRC_URI = " \
             file://35-enable-auto-reboot.toml \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/35-enable-auto-reboot.toml ${D}${libdir}/sota/conf.d/35-enable-auto-reboot.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/35-enable-auto-reboot.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-binary-pacman.bb b/recipes-sota/config/aktualizr-binary-pacman.bb
index 36bafb3..ec936ae 100644
--- a/recipes-sota/config/aktualizr-binary-pacman.bb
+++ b/recipes-sota/config/aktualizr-binary-pacman.bb
@@ -8,7 +8,7 @@ SRC_URI = "\
     file://10-pacman.toml \
     "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/10-pacman.toml \
               "
diff --git a/recipes-sota/config/aktualizr-disable-send-ip.bb b/recipes-sota/config/aktualizr-disable-send-ip.bb
index 07c12ca..5df2b34 100644
--- a/recipes-sota/config/aktualizr-disable-send-ip.bb
+++ b/recipes-sota/config/aktualizr-disable-send-ip.bb
@@ -11,12 +11,12 @@ SRC_URI = " \
             file://30-disable-send-ip.toml \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/30-disable-send-ip.toml ${D}${libdir}/sota/conf.d/30-disable-send-ip.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/30-disable-send-ip.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-log-debug.bb b/recipes-sota/config/aktualizr-log-debug.bb
index 0c03786..6e2d1f3 100644
--- a/recipes-sota/config/aktualizr-log-debug.bb
+++ b/recipes-sota/config/aktualizr-log-debug.bb
@@ -11,12 +11,12 @@ SRC_URI = " \
             file://05-log-debug.toml \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/05-log-debug.toml ${D}${libdir}/sota/conf.d/05-log-debug.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/05-log-debug.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-polling-interval.bb b/recipes-sota/config/aktualizr-polling-interval.bb
index 53c008a..6ad295d 100644
--- a/recipes-sota/config/aktualizr-polling-interval.bb
+++ b/recipes-sota/config/aktualizr-polling-interval.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
 
 SOTA_POLLING_SEC ?= "30"
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/60-polling-interval.toml ${D}${libdir}/sota/conf.d/60-polling-interval.toml
 
@@ -21,7 +21,7 @@ do_install_append () {
            ${D}${libdir}/sota/conf.d/60-polling-interval.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/60-polling-interval.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-virtualsec.bb b/recipes-sota/config/aktualizr-virtualsec.bb
index b7d55aa..f4fded3 100644
--- a/recipes-sota/config/aktualizr-virtualsec.bb
+++ b/recipes-sota/config/aktualizr-virtualsec.bb
@@ -12,13 +12,13 @@ SRC_URI = " \
             file://virtualsec.json \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/30-virtualsec.toml ${D}${libdir}/sota/conf.d/30-virtualsec.toml
     install -m 0644 ${WORKDIR}/virtualsec.json ${D}${libdir}/sota/virtualsec.json
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/30-virtualsec.toml \
                 ${libdir}/sota/virtualsec.json \
                 "
diff --git a/recipes-sota/fit-conf/fit-conf.bb b/recipes-sota/fit-conf/fit-conf.bb
index f409b9b..b3714f4 100644
--- a/recipes-sota/fit-conf/fit-conf.bb
+++ b/recipes-sota/fit-conf/fit-conf.bb
@@ -21,4 +21,4 @@ do_install() {
         done
 }
 
-FILES_${PN} += "${libdir}/fit_conf"
+FILES:${PN} += "${libdir}/fit_conf"
diff --git a/recipes-sota/ostree-initrd/ostree-initrd.bb b/recipes-sota/ostree-initrd/ostree-initrd.bb
index e7bd929..903d9ad 100644
--- a/recipes-sota/ostree-initrd/ostree-initrd.bb
+++ b/recipes-sota/ostree-initrd/ostree-initrd.bb
@@ -17,4 +17,4 @@ do_install() {
 
 inherit allarch
 
-FILES_${PN} += " /dev /etc/initrd-release /init "
+FILES:${PN} += " /dev /etc/initrd-release /init "
diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
index d711222..1957b8e 100644
--- a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
+++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
@@ -9,12 +9,12 @@ inherit module-base kernel-artifact-names
 
 PACKAGES = "ostree-kernel ostree-initramfs ostree-devicetrees"
 
-ALLOW_EMPTY_ostree-initramfs = "1"
-ALLOW_EMPTY_ostree-devicetrees = "1"
+ALLOW_EMPTY:ostree-initramfs = "1"
+ALLOW_EMPTY:ostree-devicetrees = "1"
 
-FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz"
-FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img"
-FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \
+FILES:ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz"
+FILES:ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img"
+FILES:ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \
     ${@'' if oe.types.boolean(d.getVar('OSTREE_MULTI_DEVICETREE_SUPPORT')) else '${nonarch_base_libdir}/modules/*/devicetree'} \
 "