KIRSKSTONE: overwrite syntax

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>

recipes-bsp/alsa/alsa-lib_%.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
-SRC_URI_append_stm32mpcommon = " \
+FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/${PN}:"
+SRC_URI:append:stm32mpcommon = " \
         file://0001-conf-add-card-configs-for-stm32mp15x-boards.patch \
         "

recipes-bsp/alsa/alsa-state-stm32mp1.bb

@@ -25,7 +25,7 @@ SRC_URI = " \
 S = "${WORKDIR}"
 
 COMPATIBLE_MACHINE = "(stm32mpcommon)"
-RDEPENDS_${PN} = "alsa-state"
+RDEPENDS:${PN} = "alsa-state"
 
 do_install() {
     install -d ${D}${sysconfdir}
@@ -59,4 +59,4 @@ do_install() {
     fi
 }
 
-FILES_${PN} = "${localstatedir}/lib/alsa/*.state ${systemd_unitdir}/system-generators ${sysconfdir}/*.conf "
+FILES:${PN} = "${localstatedir}/lib/alsa/*.state ${systemd_unitdir}/system-generators ${sysconfdir}/*.conf "

recipes-bsp/drivers/gcnano-driver-stm32mp.inc

@@ -1,7 +1,7 @@
 COMPATIBLE_MACHINE = "(stm32mpcommon)"
 
 # To share stm32mp1 patches between layers
-FILESEXTRAPATHS_prepend := "${THISDIR}/gcnano-driver-stm32mp:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/gcnano-driver-stm32mp:"
 
 inherit module
 

recipes-bsp/drivers/sysdig-driver_git.bb

@@ -53,7 +53,7 @@ export KERNELDIR = "${STAGING_KERNEL_BUILDDIR}"
 MAKE_TARGETS = "all"
 
 # Compile prepend for cmake build first
-do_compile_prepend() {
+do_compile:prepend() {
 	cmake_runcmake_build --target ${OECMAKE_TARGET_COMPILE}
 }
 
@@ -62,8 +62,8 @@ do_install() {
 	install -m 0755 ${B}/driver/sysdig-probe.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/
 }
 
-FILES_${PN} += " ${base_libdir}/modules/${KERNEL_VERSION}/extra "
+FILES:${PN} += " ${base_libdir}/modules/${KERNEL_VERSION}/extra "
 
 KERNEL_MODULES_META_PACKAGE = ""
 
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"

recipes-bsp/trusted-firmware-a/tf-a-stm32mp-archiver.inc

@@ -1,11 +1,11 @@
 #
 # Archiver Configuration
 #
-SRC_URI_append = " file://README.HOW_TO.txt "
+SRC_URI:append = " file://README.HOW_TO.txt "
 
 inherit archiver
 ARCHIVER_MODE[src] = "original"
-COPYLEFT_LICENSE_INCLUDE_append = " BSD-3* "
+COPYLEFT_LICENSE_INCLUDE:append = " BSD-3* "
 
 inherit archiver_stm32mp_clean
 

recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common.inc

@@ -1,6 +1,6 @@
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/tf-a-stm32mp:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/tf-a-stm32mp:"
 
 inherit deploy
 inherit ${@bb.utils.contains('MACHINE_FEATURES', 'fip', 'fip-utils-stm32mp', '', d)}
@@ -17,20 +17,20 @@ SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8"
 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 LICENSE_MBEDTLS = "Apache-2.0"
 # Add MBEDTLS to our sources
-SRC_URI_append = " ${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '${SRC_URI_MBEDTLS}', '', d)}"
+SRC_URI:append = " ${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '${SRC_URI_MBEDTLS}', '', d)}"
 # Update license variables
-LICENSE_append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' & ${LICENSE_MBEDTLS}', '', d)}"
-LIC_FILES_CHKSUM_append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
+LICENSE:append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' & ${LICENSE_MBEDTLS}', '', d)}"
+LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
 # Add mbed TLS to version
-SRCREV_FORMAT_append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '_mbedtls', '', d)}"
+SRCREV_FORMAT:append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '_mbedtls', '', d)}"
 # ------------------------------------
 
 B = "${WORKDIR}/build"
 # Configure build dir for externalsrc class usage through devtool
-EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
+EXTERNALSRC_BUILD:pn-${PN} = "${WORKDIR}/build"
 
 DEPENDS += "dtc-native"
-DEPENDS_append = " ${@bb.utils.contains('TF_A_ENABLE_DEBUG_WRAPPER', '1', 'stm32wrapper4dbg-native', '', d)}"
+DEPENDS:append = " ${@bb.utils.contains('TF_A_ENABLE_DEBUG_WRAPPER', '1', 'stm32wrapper4dbg-native', '', d)}"
 
 # Default log level
 ST_TF_A_DEBUG_LOG_LEVEL ??= "40"
@@ -165,7 +165,7 @@ do_unpack[cleandirs] += "${S}"
 do_unpack[cleandirs] += "${@bb.utils.contains('TFA_SHARED_SOURCES', '1', '${STAGING_TFA_DIR}', '', d)}"
 do_clean[cleandirs] += "${S}"
 do_clean[cleandirs] += "${@bb.utils.contains('TFA_SHARED_SOURCES', '1', '${STAGING_TFA_DIR}', '', d)}"
-base_do_unpack_append () {
+base_do_unpack:append () {
     # Specific part to update devtool-source class
     if bb.data.inherits_class('devtool-source', d):
         # We don't want to move the source to STAGING_TFA_DIR here

recipes-bsp/trusted-firmware-a/tf-a-stm32mp-config.inc

@@ -14,11 +14,11 @@ TF_A_CONFIG[trusted] ?= "${STM32MP_DEVICETREE},AARCH32_SP=sp_min ${@bb.utils.con
 
 TF_A_CONFIG[serialboot] ?= "${STM32MP_DEVICETREE},AARCH32_SP=sp_min STM32MP_UART_PROGRAMMER=1 STM32MP_USB_PROGRAMMER=1 STM32MP_USE_STM32IMAGE=1"
 
-TF_A_CONFIG[emmc]    ?= "${DEVICE_BOARD_ENABLE_EMMC},STM32MP_EMMC=1"
-TF_A_CONFIG[nand]    ?= "${DEVICE_BOARD_ENABLE_NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''}"
-TF_A_CONFIG[nor]     ?= "${DEVICE_BOARD_ENABLE_NOR},STM32MP_SPI_NOR=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NOR}' if ${TF_A_MTD_START_OFFSET_NOR} else ''}"
-TF_A_CONFIG[sdcard]  ?= "${DEVICE_BOARD_ENABLE_SDCARD},STM32MP_SDMMC=1"
-TF_A_CONFIG[spinand] ?= "${DEVICE_BOARD_ENABLE_SPINAND},STM32MP_SPI_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_SPINAND}' if ${TF_A_MTD_START_OFFSET_SPINAND} else ''}"
+TF_A_CONFIG[emmc]    ?= "${DEVICE_BOARD_ENABLE:EMMC},STM32MP_EMMC=1"
+TF_A_CONFIG[nand]    ?= "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''}"
+TF_A_CONFIG[nor]     ?= "${DEVICE_BOARD_ENABLE:NOR},STM32MP_SPI_NOR=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NOR}' if ${TF_A_MTD_START_OFFSET_NOR} else ''}"
+TF_A_CONFIG[sdcard]  ?= "${DEVICE_BOARD_ENABLE:SDCARD},STM32MP_SDMMC=1"
+TF_A_CONFIG[spinand] ?= "${DEVICE_BOARD_ENABLE:SPINAND},STM32MP_SPI_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_SPINAND}' if ${TF_A_MTD_START_OFFSET_SPINAND} else ''}"
 TF_A_CONFIG[uart]    ?= "${STM32MP_DEVICETREE},STM32MP_UART_PROGRAMMER=1"
 TF_A_CONFIG[usb]     ?= "${STM32MP_DEVICETREE},STM32MP_USB_PROGRAMMER=1"
 

recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.4.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
 PROVIDES += "virtual/trusted-firmware-a"
 
-FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/tf-a-stm32mp:"
+FILESEXTRAPATHS:prepend_stm32mpcommon := "${THISDIR}/tf-a-stm32mp:"
 
 SRC_URI = "git://github.com/ARM-software/arm-trusted-firmware.git;protocol=https;nobranch=1"
 SRCREV = "e2c509a39c6cc4dda8734e6509cdbe6e3603cdfc"
@@ -48,8 +48,8 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-
 # ---------------------------------
 BBCLASSEXTEND = "devupstream:target"
 
-SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
-SRCREV_class-devupstream = "3e1e3f0a6149d04946ff5debcd871173e782111c"
+SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
+SRCREV:class-devupstream = "3e1e3f0a6149d04946ff5debcd871173e782111c"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github

recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bb

@@ -9,7 +9,7 @@ SRCREV = "e2c509a39c6cc4dda8734e6509cdbe6e3603cdfc"
 # Mandatory fix to allow feeding password through command line
 SRC_URI += "file://0099-tools-allow-to-use-a-root-key-password-from-command-.patch"
 
-DEPENDS_class-nativesdk = "nativesdk-openssl"
+DEPENDS:class-nativesdk = "nativesdk-openssl"
 
 S = "${WORKDIR}/git"
 
@@ -25,8 +25,8 @@ do_install() {
     install -m 0755 ${B}/tools/fiptool/fiptool ${D}${bindir}/fiptool
 }
 
-FILES_${PN}_class-nativesdk = "${bindir}/cert_create ${bindir}/fiptool"
+FILES:${PN}:class-nativesdk = "${bindir}/cert_create ${bindir}/fiptool"
 
-RDEPENDS_${PN}_class-nativesdk += "nativesdk-libcrypto"
+RDEPENDS:${PN}:class-nativesdk += "nativesdk-libcrypto"
 
 BBCLASSEXTEND += "native nativesdk"

recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2020.10.bb

@@ -20,5 +20,5 @@ do_install () {
     fi
 }
 
-FILES_${PN} += "${sysconfdir}/"
-RDEPENDS_${PN} += "u-boot-fw-utils"
+FILES:${PN} += "${sysconfdir}/"
+RDEPENDS:${PN} += "u-boot-fw-utils"

recipes-bsp/u-boot/u-boot-stm32mp-archiver.inc

@@ -1,7 +1,7 @@
 #
 # Archiver Configuration
 #
-SRC_URI_append = " file://README.HOW_TO.txt "
+SRC_URI:append = " file://README.HOW_TO.txt "
 
 inherit archiver
 ARCHIVER_MODE[src] = "original"

recipes-bsp/u-boot/u-boot-stm32mp-common_2020.10.inc

@@ -51,8 +51,8 @@ S = "${WORKDIR}/git"
 # ---------------------------------
 BBCLASSEXTEND = "devupstream:target"
 
-SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
-SRCREV_class-devupstream = "6fde82adf71ebad4b16d99f76ed69abfd9cfaf42"
+SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
+SRCREV:class-devupstream = "6fde82adf71ebad4b16d99f76ed69abfd9cfaf42"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github

recipes-bsp/u-boot/u-boot-stm32mp-splash_2018.11.bb

@@ -27,5 +27,5 @@ do_install() {
     fi
 }
 
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = "/boot"
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = "/boot"

recipes-bsp/u-boot/u-boot-stm32mp.inc

@@ -1,9 +1,9 @@
 require recipes-bsp/u-boot/u-boot.inc
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-stm32mp:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-stm32mp:"
 
 # Configure build dir for externalsrc class usage through devtool
-EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
+EXTERNALSRC_BUILD:pn-${PN} = "${WORKDIR}/build"
 B = "${WORKDIR}/build"
 
 # Define dedicated var to configure SPL binary name to override U-Boot default
@@ -34,7 +34,7 @@ STAGING_UBOOT_DIR = "${TMPDIR}/work-shared/${MACHINE}/uboot-source"
 # the symlink.
 do_unpack[cleandirs] += " ${S} ${STAGING_UBOOT_DIR}"
 do_clean[cleandirs] += " ${S} ${STAGING_UBOOT_DIR}"
-base_do_unpack_append () {
+base_do_unpack:append () {
     # Specific part to update devtool-source class
     if bb.data.inherits_class('devtool-source', d):
         # We don't want to move the source to STAGING_UBOOT_DIR here
@@ -62,7 +62,7 @@ base_do_unpack_append () {
 # -----------------------------------------------------------------------------
 # Prepend configure to handle specific configuration (here fip)
 #
-do_configure_prepend() {
+do_configure:prepend() {
     if [ -n "${UBOOT_CONFIG}" ]; then
         unset i j
         for config in ${UBOOT_MACHINE}; do
@@ -91,7 +91,7 @@ do_configure_prepend() {
 # -----------------------------------------------------------------------------
 # Append configure to handle specific MTDPART check if required
 #
-do_configure_append() {
+do_configure:append() {
     if [ -n "${UBOOT_MTDPART_CHECK_ENABLE}" ]; then
         if [ -n "${UBOOT_CONFIG}" ]; then
             for config in ${UBOOT_MACHINE}; do
@@ -139,7 +139,7 @@ do_configure_append() {
 # -----------------------------------------------------------------------------
 # Append compile to handle specific device tree compilation
 #
-do_compile_append() {
+do_compile:append() {
     if [ -n "${UBOOT_DEVICETREE}" ]; then
         if [ -n "${UBOOT_CONFIG}" ]; then
             unset i j k
@@ -194,7 +194,7 @@ do_compile_append() {
 # Append deploy to handle specific device tree binary deployement
 #
 do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}/u-boot"
-do_deploy_append() {
+do_deploy:append() {
     if [ -n "${UBOOT_DEVICETREE}" ]; then
         if [ -n "${UBOOT_CONFIG}" ]; then
             # Clean deploydir from any available binary first
@@ -274,8 +274,8 @@ do_deploy_append() {
 
 # ---------------------------------------------------------------------
 # Avoid QA Issue: No GNU_HASH in the elf binary
-INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP:${PN} += "ldflags"
 # ---------------------------------------------------------------------
 # Avoid QA Issue: ELF binary has relocations in .text
 # (uboot no need -fPIC option : remove check)
-INSANE_SKIP_${PN} += "textrel"
+INSANE_SKIP:${PN} += "textrel"

recipes-bsp/u-boot/u-boot-stm32mp_2020.10.bb

@@ -5,7 +5,7 @@ SUMMARY = "Universal Boot Loader for embedded devices for stm32mp"
 LICENSE = "GPLv2+"
 
 PROVIDES += "u-boot"
-RPROVIDES_${PN} += "u-boot"
+RPROVIDES:${PN} += "u-boot"
 
 # ---------------------------------
 # Configure archiver use