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: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>

10 files changed, 40 insertions, 40 deletions

diff --git a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
index 42daadf7..3bc136da 100755
--- a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
@@ -20,5 +20,5 @@ inherit module
 
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb b/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb
index ed2652e3..f57b2b19 100644
--- a/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb
+++ b/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb
@@ -19,7 +19,7 @@ DEPENDS += "libyaml dtc"
 
 inherit distutils3
 
-do_configure_prepend() {
+do_configure:prepend() {
     (cd ${S}/../ ; make version_gen.h )
 }
 
diff --git a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
index 9c70fe7f..65484fca 100644
--- a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
@@ -20,5 +20,5 @@ inherit module
 
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
index c3adcf58..1ad8ae2e 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
+++ b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
@@ -53,13 +53,13 @@ do_install() {
 #  11.8.32   =   WL180x, WL183x, WL185x PG2.1 or PG2.2, 8.32 ROM Version
 PACKAGES =+ "${PN}-wl180x ${PN}-license"
 
-FILES_${PN}-license = "${nonarch_base_libdir}/firmware/License.ti-bt"
+FILES:${PN}-license = "${nonarch_base_libdir}/firmware/License.ti-bt"
 
-FILES_${PN}-wl180x = "${nonarch_base_libdir}/firmware/TIInit_11.8.32.bts \
+FILES:${PN}-wl180x = "${nonarch_base_libdir}/firmware/TIInit_11.8.32.bts \
                       ${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_11.8.32.bts"
 
-RDEPENDS_${PN}-wl180x = "${PN}-license linux-firmware-wl18xx"
+RDEPENDS:${PN}-wl180x = "${PN}-license linux-firmware-wl18xx"
 
-LICENSE_${PN}-wl180x = "Firmware-ti-bt"
+LICENSE:${PN}-wl180x = "Firmware-ti-bt"
 
 INSANE_SKIP = "arch"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
index b4928fba..49f96865 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
@@ -7,7 +7,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 KBRANCH ?= "xlnx_rebase_v5.10"
 SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}"
 
-FILESOVERRIDES_append = ":${XILINX_RELEASE_VERSION}"
+FILESOVERRIDES:append = ":${XILINX_RELEASE_VERSION}"
 KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine"
 YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=yocto-kmeta"
 SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}"
@@ -25,11 +25,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 EXTKERNELSRC = "${@'1' if d.getVar('EXTERNALSRC') else ''}"
 
 # Force the use of the KBUILD_DEFCONFIG even if some other defconfig was generated in the ${WORKDIR}
-do_kernel_metadata_prepend () {
+do_kernel_metadata:prepend () {
         [ -n "${KBUILD_DEFCONFIG}" ] && [ -e ${WORKDIR}/defconfig ] && rm ${WORKDIR}/defconfig
 }
 
-do_configure_prepend () {
+do_configure:prepend () {
         if [ -n "${KBUILD_DEFCONFIG}" ] && [ -n "${EXTKERNELSRC}" ]; then
                 cp ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
         fi
@@ -39,27 +39,27 @@ inherit kernel-simpleimage
 
 # Default to be only compatible with specific machines or soc families
 COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynq = ".*"
-COMPATIBLE_MACHINE_zynqmp = ".*"
-COMPATIBLE_MACHINE_microblaze = ".*"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:microblaze = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
 
 # Use DEFCONFIGs for configuring linux-xlnx kernels
 KCONFIG_MODE ?= "alldefconfig"
-KBUILD_DEFCONFIG_zynqmp ?= "xilinx_defconfig"
-KBUILD_DEFCONFIG_zynq ?= "xilinx_zynq_defconfig"
-KBUILD_DEFCONFIG_microblaze ?= "mmu_defconfig"
-KBUILD_DEFCONFIG_versal ?= "xilinx_defconfig"
+KBUILD_DEFCONFIG:zynqmp ?= "xilinx_defconfig"
+KBUILD_DEFCONFIG:zynq ?= "xilinx:zynq_defconfig"
+KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig"
+KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig"
 
 KERNEL_MODULE_AUTOLOAD_k26 += "usb5744"
 
 # MicroBlaze BSP fragments
-KERNEL_FEATURES_append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
+KERNEL_FEATURES:append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
 
-KERNEL_FEATURES_append_zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}"
+KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}"
 
-KERNEL_FEATURES_append_zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
+KERNEL_FEATURES:append:zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
 
-KERNEL_FEATURES_append_versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc"
+KERNEL_FEATURES:append:versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc"
 
-KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
index 24f7551e..79fde54f 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
@@ -6,4 +6,4 @@ KCONF_AUDIT_LEVEL="0"
 
 include linux-xlnx.inc
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc
index e99785d1..51eab948 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc
@@ -1,23 +1,23 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx:"
 
 require linux-microblaze.inc
 
 # Zynq default generic KMACHINE
-COMPATIBLE_MACHINE_zynq = "zynq"
-KMACHINE_zynq = "zynq"
+COMPATIBLE_MACHINE:zynq = "zynq"
+KMACHINE:zynq = "zynq"
 
 # ZynqMP default generic KMACHINE
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
-KMACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+KMACHINE:zynqmp = "zynqmp"
 
 # MicroBlaze KMACHINEs
 KMACHINE_ml605-qemu-microblazeel = "qemumicroblazeel"
 KMACHINE_s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb"
 
 # MicroBlaze default generic KMACHINE
-KMACHINE_microblaze = "microblaze"
-COMPATIBLE_MACHINE_microblaze = "microblaze"
+KMACHINE:microblaze = "microblaze"
+COMPATIBLE_MACHINE:microblaze = "microblaze"
 
 # Default kernel config fragements for specific machines
-KERNEL_FEATURES_append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
+KERNEL_FEATURES:append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
 
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
index 8ca7135e..fc8dc755 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Tool to subset a system device tree"
 SECTION = "bootloader"
 LICENSE = "BSD-3-Clause"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     python3-core \
     dtc \
     python3-dtc \
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb
index cfa1bc87..77456376 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xilinx specific lop files"
 SECTION = "bootloader"
 LICENSE = "BSD-3-Clause"
 
-RDEPENDS_${PN} += "lopper"
+RDEPENDS:${PN} += "lopper"
 
 SRC_URI = " \
         file://lop-microblaze-yocto.dts \
@@ -23,5 +23,5 @@ do_install() {
         cp ${S}/lop-xilinx-id-cpus.dts   ${D}/${datadir}/lopper/lops/.
 }
 
-FILES_${PN} += "${datadir}/lopper/lops"
+FILES:${PN} += "${datadir}/lopper/lops"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
index d710c10f..72eb4665 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
@@ -230,12 +230,12 @@
                                    tname = tname[0]+str(cpu_addr)
                                    cpu_addr += 1
                                    print( 'AVAILTUNES += \"microblaze-%s\"' % tname )
-                                   print( 'TUNE_FEATURES_tune-microblaze-%s = \"' % tname, end='' )
+                                   print( 'TUNE_FEATURES:tune-microblaze-%s = \"' % tname, end='' )
                                    for t in n.tunes.values():
                                        print( ' %s' % t, end='' )
                                    print( '\"' )
-                                   print( 'PACKAGE_EXTRA_ARCHS_tune-microblaze-%s = \"${TUNE_PKGARCH}\"' % tname )
-                                   print( 'TUNE_FEATURES_tune-%s = \"${TUNE_FEATURES_tune-microblaze-%s}\"\\n' % (n.tune_type,tname) )
+                                   print( 'PACKAGE_EXTRA_ARCHS:tune-microblaze-%s = \"${TUNE_PKGARCH}\"' % tname )
+                                   print( 'TUNE_FEATURES:tune-%s = \"${TUNE_FEATURES:tune-microblaze-%s}\"\\n' % (n.tune_type,tname) )
 
                                ";
                       };