kirkstone: Converted layer to new syntax

* Conversion of the OVERRIDE syntax * New folder names for NXP specific folders For NXP changes see the new MACHINE_OVERRIDES mechanism

kirkstone: Converted layer to new syntax
* Conversion of the OVERRIDE syntax * New folder names for NXP specific folders For NXP changes see the new MACHINE_OVERRIDES mechanism
19c4ff8e · Tobias Kahlki · 6ddee2e0 · 19c4ff8e · 19c4ff8e · 19c4ff8e
Commit 19c4ff8e authored 2 years ago by Tobias Kahlki
--- a/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
+++ b/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
 require imx-mkimage_kuk.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SOC_TARGET_imx8mguf = "iMX8MM"
 SOC_TARGET_imx8mpguf = "iMX8MP"
@@ -12,7 +12,7 @@ BOOT_STAGING_imx8mguf = "${S}/iMX8M"
 BOOT_STAGING_imx8mpguf = "${S}/iMX8M"
 # Using prepuilt bl31 for now
-DEPENDS_remove = "imx-atf"
+DEPENDS:remove = "imx-atf"
 # Remove some copy operations from the original compile_mx8m, because we already
 # have some of the files fscl wants to copy there checked out
@@ -32,7 +32,7 @@ compile_mx8m() {
    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}                     ${BOOT_STAGING}/u-boot.bin
 }
-do_compile_append() {
+do_compile:append() {
    # Integrate fw_env.config and u-boot-initial-env
    cp "${DEPLOY_DIR_IMAGE}/u-boot-initial-env-${MACHINE}-${UBOOT_CONFIG}.bin" "${S}"
@@ -50,7 +50,7 @@ do_compile_append() {
    cd -
 }
-do_deploy_append() {
+do_deploy:append() {
    for target in ${IMXBOOT_TARGETS}; do
        # Create a tar from the bootfiles, compressed gz, dereference links (copy the file not the link into the tar)
        cd ${S}

--- a/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
+++ b/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
 require imx-mkimage_kuk.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
--- a/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-imx_%.bbappend
+++ b/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-imx_%.bbappend
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 # Get include file from poky layer
-FILESEXTRAPATHS_append := "${BSPDIR}/sources/poky/meta/recipes-bsp/u-boot/files:"
+FILESEXTRAPATHS:append := "${BSPDIR}/sources/poky/meta/recipes-bsp/u-boot/files:"
 COMPATIBLE_MACHINE = "(imx8mguf|imx8mpguf)"
@@ -17,7 +17,7 @@ SRCREV = "${AUTOREV}"
 ## Keith und Koep u-boot for imx8
 # imx8mp
-SRC_URI_remove_imx8mpguf = " \
+SRC_URI:remove_imx8mpguf = " \
           file://add-u-boot-initial-env-target-to-Makefile.patch \
           "
@@ -26,12 +26,12 @@ SRC_URI_remove_imx8mpguf = " \
 # but fw_printenv expects then name u-boot-initial-env
 UBOOT_INITIAL_ENV = "u-boot-initial-env"
 PACKAGES += "${PN}-fw-env"
-FILES_${PN}-env_remove = "/etc/fw_env.config"
+FILES:${PN}-env:remove = "/etc/fw_env.config"
-FILES_${PN}-fw-env = "/etc/fw_env*config"
+FILES:${PN}-fw-env = "/etc/fw_env*config"
 # Create an uboot-initial-env.bin that can be dd'd to the env offset
 # and then correctly read by u-boot and the libuboot-tools
-do_compile_append () {
+do_compile:append () {
    if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ]
    then
@@ -73,7 +73,7 @@ do_compile_append () {
    fi
 }
-do_install_append () {
+do_install:append () {
    if [ -n "${UBOOT_CONFIG}" ]
    then
        for config in ${UBOOT_MACHINE}; do
@@ -113,7 +113,7 @@ do_install_append () {
    fi
 }
-do_deploy_append () {
+do_deploy:append () {
    if [ -n "${UBOOT_CONFIG}" ]
    then
        for config in ${UBOOT_MACHINE}; do

--- a/recipes-bsp/bootscript/bootscript-alt.bb
+++ b/recipes-bsp/bootscript/bootscript-alt.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 inherit deploy
-RPROVIDES_${PN} += " boot-alt.cfg  "
+RPROVIDES:${PN} += " boot-alt.cfg  "
 PROVIDES += " boot-alt.cfg  "
@@ -34,6 +34,6 @@ do_deploy() {
    install ${S}/boot-alt.cfg ${DEPLOYDIR}/boot-alt.cfg
 }
-FILES_${PN} = "boot/boot-alt.cfg"
+FILES:${PN} = "boot/boot-alt.cfg"
 addtask do_deploy after do_install
 do_deploy[cleandirs] = "${DEPLOYDIR}"
--- a/recipes-bsp/bootscript/bootscript-uboot-alt.bb
+++ b/recipes-bsp/bootscript/bootscript-uboot-alt.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 inherit deploy
-RPROVIDES_${PN} += " boot-alt.scr  "
+RPROVIDES:${PN} += " boot-alt.scr  "
 PROVIDES += " boot-alt.scr  "
 DEPENDS += "u-boot-mkimage-native"
@@ -31,4 +31,4 @@ do_deploy() {
 addtask do_deploy after do_install
 do_deploy[cleandirs] = "${DEPLOYDIR}"
-FILES_${PN} = " /boot/* "
+FILES:${PN} = " /boot/* "
--- a/recipes-bsp/bootscript/bootscript-uboot.bb
+++ b/recipes-bsp/bootscript/bootscript-uboot.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 inherit deploy
-RPROVIDES_${PN} += " boot.scr  "
+RPROVIDES:${PN} += " boot.scr  "
 PROVIDES += " boot.scr  "
 DEPENDS += "u-boot-mkimage-native"
@@ -24,4 +24,4 @@ do_install() {
    install ${WORKDIR}/boot.scr ${D}/boot/boot.scr
 }
-FILES_${PN} = " /boot/* "
+FILES:${PN} = " /boot/* "
--- a/recipes-bsp/bootscript/bootscript.bb
+++ b/recipes-bsp/bootscript/bootscript.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 inherit deploy
-RPROVIDES_${PN} += " boot.cfg  "
+RPROVIDES:${PN} += " boot.cfg  "
 PROVIDES += " boot.cfg  "
 SRC_URI = "\
@@ -20,7 +20,7 @@ do_configure() {
 }
 # Hardcode the logo rotation for now
-do_configure_append_imx8mpguf() {
+do_configure:append_imx8mpguf() {
    sed -i boot.cfg -e "s|rotate:[0-3]|rotate:2|"
 }
@@ -29,4 +29,4 @@ do_install() {
    install -m 0644 ${S}/boot.cfg ${D}/boot/boot.cfg
 }
-FILES_${PN} = "boot/boot.cfg"
+FILES:${PN} = "boot/boot.cfg"
--- a/recipes-connectivity/rtl8723ds-bt-uart-driver/rtl8723ds-bt-uart-driver_git.bb
+++ b/recipes-connectivity/rtl8723ds-bt-uart-driver/rtl8723ds-bt-uart-driver_git.bb
@@ -24,7 +24,7 @@ S = "${WORKDIR}/git"
 #inherit module
-#EXTRA_OEMAKE_append_task-install = " -C ${STAGING_KERNEL_DIR} M=${S}"
+#EXTRA_OEMAKE:append:task-install = " -C ${STAGING_KERNEL_DIR} M=${S}"
 #EXTRA_OEMAKE += "KDIR=${STAGING_KERNEL_DIR}"
 do_configure() {
@@ -32,7 +32,7 @@ do_configure() {
 	oe_runmake clean
 }
-do_compile_prepend() {
+do_compile:prepend() {
 	cd rtk_hciattach
 }
@@ -44,7 +44,7 @@ do_install() {
 	install -m755 ${S}/8723D/rtl8723d_fw ${D}/lib/firmware/rtlbt/
 }
-FILES_${PN} += " \
+FILES:${PN} += " \
 	/lib/firmware/rtlbt/rtl8723d_config \
 	/lib/firmware/rtlbt/rtl8723d_fw \
 "
--- a/recipes-connectivity/rtl8723ds/rtl8723ds.bb
+++ b/recipes-connectivity/rtl8723ds/rtl8723ds.bb
@@ -23,6 +23,6 @@ do_install() {
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.
-RRECOMMENDS_${PN} = "kernel-module-${PN}"
+RRECOMMENDS:${PN} = "kernel-module-${PN}"
 do_configure[depends] += "virtual/kernel:do_compile_kernelmodules"
--- a/recipes-guf/gfxml2dto/gfxml2dto_git.bb
+++ b/recipes-guf/gfxml2dto/gfxml2dto_git.bb
-SUMMARY = "Tool to create a devicetree overlay from the G&F xml device config file."
+SUMMARY = "Tool to create a devicetree overlay from the SECO North xml device config file."
 HOMEPAGE = "https://git.seco.com/seco-ne/tools/gfxml2dto"
 LICENSE = "Apache-2.0"
@@ -12,7 +12,7 @@ SRC_URI = "git://git@git.seco.com:4444/seco-ne/tools/gfxml2dto.git;protocol=ssh;
 # Hack: in the 60b9 + 1 we removed the fec1 prop 'local-mac-address'
 # With fngsystem network does not work without, in yocto it does not work with 
 # the property. Just to get it running for now.
-SRCREV_fng = "60b9fbcf1ea23eb6c17b4937323842795db9e242"
+SRCREV:fng = "60b9fbcf1ea23eb6c17b4937323842795db9e242"
 # Create a <tag>-<number of commits since tag>-<hash> Version string
 inherit gitpkgv

--- a/recipes-guf/spreadspectrum/spreadspectrum.bb
+++ b/recipes-guf/spreadspectrum/spreadspectrum.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 SRC_URI = "file://spreadspectrum.py"
-RDEPENDS_${PN} = " python3 devmem2 "
+RDEPENDS:${PN} = " python3 devmem2 "
 COMPATIBLE_MACHINE = "mx8"
@@ -17,6 +17,6 @@ do_install() {
 	install -m 0700 ${S}/spreadspectrum.py ${D}/sbin/spreadspectrum.py
 }
-FILES_${PN} = " \
+FILES:${PN} = " \
 	sbin/spreadspectrum.py \
 	"
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
 	file://vpu/vpu_fw_imx6d.bin;subdir=${BPN}-${PV} \
@@ -15,38 +15,38 @@ LIC_FILES_CHKSUM =+ "file://LICENSE.vpu_firmware;md5=8cf95184c220e247b9917e72441
 NO_GENERIC_LICENSE[Firmware-imx-vpu_firmware] = "LICENSE.vpu_firmware"
-LICENSE_${PN}-imx-vpu = "Firmware-imx-vpu_firmware"
+LICENSE:${PN}-imx-vpu = "Firmware-imx-vpu_firmware"
-LICENSE_${PN}-imx-vpu-license = "Firmware-imx-vpu_firmware"
+LICENSE:${PN}-imx-vpu-license = "Firmware-imx-vpu_firmware"
-FILES_${PN}-imx-vpu = " \
+FILES:${PN}-imx-vpu = " \
    ${nonarch_base_libdir}/firmware/vpu_fw_imx6d.bin \
    ${nonarch_base_libdir}/firmware/vpu_fw_imx6q.bin \
    ${nonarch_base_libdir}/firmware/v4l-coda960-imx6dl.bin \
    ${nonarch_base_libdir}/firmware/v4l-coda960-imx6q.bin \
 "
-RPROVIDES_${PN}-imx-vpu = "firmware-imx-vpu"
+RPROVIDES:${PN}-imx-vpu = "firmware-imx-vpu"
-RREPLACES_${PN}-imx-vpu = "firmware-imx-vpu"
+RREPLACES:${PN}-imx-vpu = "firmware-imx-vpu"
-RCONFLICTS_${PN}-imx-vpu = "firmware-imx-vpu"
+RCONFLICTS:${PN}-imx-vpu = "firmware-imx-vpu"
-FILES_${PN}-imx-vpu-license = "${nonarch_base_libdir}/firmware/LICENSE.vpu_firmware"
+FILES:${PN}-imx-vpu-license = "${nonarch_base_libdir}/firmware/LICENSE.vpu_firmware"
-RDEPENDS_${PN}-imx-vpu += "${PN}-imx-vpu-license"
+RDEPENDS:${PN}-imx-vpu += "${PN}-imx-vpu-license"
-LICENSE_${PN} =+ "Firmware-imx-vpu_firmware &"
+LICENSE:${PN} =+ "Firmware-imx-vpu_firmware &"
-do_install_prepend () {
+do_install:prepend () {
    set -x
 }
-do_install_append () {
+do_install:append () {
    install -m 644 vpu/vpu_fw_imx6d.bin ${D}/${nonarch_base_libdir}/firmware
    install -m 644 vpu/vpu_fw_imx6q.bin ${D}/${nonarch_base_libdir}/firmware
    install -m 644 vpu/v4l-coda960-imx6dl.bin ${D}/${nonarch_base_libdir}/firmware
    install -m 644 vpu/v4l-coda960-imx6q.bin ${D}/${nonarch_base_libdir}/firmware
 }
-FILES_${PN}-rtl8723_append = " \
+FILES:${PN}-rtl8723:append = " \
  ${nonarch_base_libdir}/firmware/rtl_bt/rtl8723*.bin \
 "
--- a/recipes-kernel/linux/linux-guf-5.10/mx8m/defconfig
+++ b/recipes-kernel/linux/linux-guf-5.10/mx8m/defconfig
--- a/recipes-kernel/linux/linux-guf.inc
+++ b/recipes-kernel/linux/linux-guf.inc
@@ -12,13 +12,13 @@ EXTRA_OEMAKE += " 'DTC_FLAGS=-@' "
 # Remove ${PKGE}- from file names, as PE is always unset,
 # it generates the -- in the name
-KERNEL_ARTIFACT_NAME="${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+KERNEL_ARTIFACT_NAME = "${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_install_append() {
+do_install:append() {
    # Remove the links, we have a fat partition as /boot
    find "${D}/${KERNEL_IMAGEDEST}/" -type l -exec rm -v {} \;
 }
-do_configure_prepend_fng() {
+do_configure:prepend:fng() {
    sed -i -e 's|# CONFIG_LOGO_GF_FNGSYSTEM_CLUT224 is not set|# CONFIG_LOGO_GF_CLUT224 is not set|' ${WORKDIR}/defconfig
 }
--- a/recipes-kernel/linux/linux-guf_5.10.bb
+++ b/recipes-kernel/linux/linux-guf_5.10.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(imx6guf|imx6ullguf)"
 LINUX_VERSION = "5.10"
 LINUX_VERSION_EXTENSION = "-guf"
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
 S = "${WORKDIR}/git"
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 # branch= combined with nobranch=1 looks weird, but the branch is used for the
 # AUTOREV, the nobranch tells the fetcher to not check the SHA validation for the branch
 # This way the SRCREV can be specified to a specific revision also outside that branch
-# with SRCREV_pn-linux-guf =
+# with SRCREV:pn-linux-guf =
 SRC_URI = " \
    git://git@git.seco.com:4444/seco-ne/kernel/linux-guf.git;protocol=ssh;branch=linux-${PV}-guf;nobranch=1 \
    file://defconfig \

--- a/recipes-kernel/linux/linux-guf_5.15.bb
+++ b/recipes-kernel/linux/linux-guf_5.15.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(imx6guf|imx6ullguf)"
 LINUX_VERSION = "5.15"
 LINUX_VERSION_EXTENSION = "-guf"
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
 S = "${WORKDIR}/git"
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 # branch= combined with nobranch=1 looks weird, but the branch is used for the
 # AUTOREV, the nobranch tells the fetcher to not check the SHA validation for the branch
 # This way the SRCREV can be specified to a specific revision also outside that branch
-# with SRCREV_pn-linux-guf =
+# with SRCREV:pn-linux-guf =
 SRC_URI = " \
    git://git@git.seco.com:4444/seco-ne/kernel/linux-guf.git;protocol=ssh;branch=linux-${PV}-guf;nobranch=1 \
    file://defconfig \

--- a/recipes-kernel/linux/linux-guf_5.4.bb
+++ b/recipes-kernel/linux/linux-guf_5.4.bb
@@ -8,7 +8,7 @@ LINUX_VERSION = "5.4"
 LINUX_VERSION_EXTENSION = "-guf"
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
 S = "${WORKDIR}/git"
@@ -18,7 +18,7 @@ SRCREV = "${AUTOREV}"
 # branch= combined with nobranch=1 looks weird, but the branch is used for the
 # AUTOREV, the nobranch tells the fetcher to not check the SHA validation for the branch
 # This way the SRCREV can be specified to a specific revision also outside that branch
-# with SRCREV_pn-linux-guf =
+# with SRCREV:pn-linux-guf =
 SRC_URI = " \
    git://git@git.seco.com:4444/seco-ne/kernel/linux-guf.git;protocol=ssh;branch=linux-${PV}-guf;nobranch=1 \
    file://defconfig \

--- a/recipes-kernel/linux/linux-imx-kuk_5.10.bb
+++ b/recipes-kernel/linux/linux-imx-kuk_5.10.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(imx8mguf|imx8mpguf)"
 LINUX_VERSION = "5.10"
 LINUX_VERSION_EXTENSION = "-guf"
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
 S = "${WORKDIR}/git"
@@ -17,7 +17,7 @@ SRCREV = "${AUTOREV}"
 # branch= combined with nobranch=1 looks weird, but the branch is used for the
 # AUTOREV, the nobranch tells the fetcher to not check the SHA validation for the branch
 # This way the SRCREV can be specified to a specific revision also outside that branch
-# with SRCREV_pn-linux-guf =
+# with SRCREV:pn-linux-guf =
 SRC_URI = " \
    git://git@git.seco.com:4444/seco-ne/kernel/linux-imx-kuk.git;protocol=ssh;branch=linux-${PV}-guf;nobranch=1 \
    file://defconfig \

--- a/recipes-kernel/linux/linux-imx-kuk_5.4.bb
+++ b/recipes-kernel/linux/linux-imx-kuk_5.4.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(imx8mguf)"
 LINUX_VERSION = "5.4"
 LINUX_VERSION_EXTENSION = "-guf"
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
 S = "${WORKDIR}/git"
@@ -17,7 +17,7 @@ SRCREV = "${AUTOREV}"
 # branch= combined with nobranch=1 looks weird, but the branch is used for the
 # AUTOREV, the nobranch tells the fetcher to not check the SHA validation for the branch
 # This way the SRCREV can be specified to a specific revision also outside that branch
-# with SRCREV_pn-linux-guf =
+# with SRCREV:pn-linux-guf =
 SRC_URI = " \
    git://git@git.seco.com:4444/seco-ne/kernel/linux-imx-kuk.git;protocol=ssh;branch=linux-${PV}-guf;nobranch=1 \
    file://defconfig \

--- a/recipes-kernel/modules/gfplatdetect_0.1.bb
+++ b/recipes-kernel/modules/gfplatdetect_0.1.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.
-RPROVIDES_${PN} += "kernel-module-${PN}"
+RPROVIDES:${PN} += "kernel-module-${PN}"
-RRECOMMENDS_${PN} = "kernel-module-${PN}"
+RRECOMMENDS:${PN} = "kernel-module-${PN}"
 KERNEL_MODULE_AUTOLOAD += "${PN}"