From 59d36c9832702989bfcca8a5af29fb2dff01efcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Aug 2021 11:01:05 -0700 Subject: layer: Convert to new override syntax Signed-off-by: Khem Raj --- recipes-kernel/ceetm/ceetm_git.bb | 4 ++-- .../kernel-modules/kernel-module-ar_git.bb | 6 +++--- .../kernel-modules/kernel-module-ipc-multi_git.bb | 4 ++-- .../kernel-modules/kernel-module-ipc-single_git.bb | 4 ++-- recipes-kernel/kernel-modules/kernel-module-ipc.inc | 2 +- .../kernel-modules/kernel-module-qca6174_3.0.bb | 2 +- .../kernel-modules/kernel-module-qca9377_3.1.bb | 2 +- .../kernel-modules/kernel-module-qcacld-lea.inc | 2 +- recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb | 2 +- recipes-kernel/linux/linux-fslc-mfgtool_5.12.bb | 2 +- recipes-kernel/linux/linux-imx-headers_5.10.bb | 4 ++-- recipes-kernel/linux/linux-imx-mfgtool_5.10.bb | 2 +- recipes-kernel/linux/linux-qoriq.inc | 20 ++++++++++---------- recipes-kernel/skmm-host/skmm-host_git.bb | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb index 2e92ad49e..00790c8e0 100644 --- a/recipes-kernel/ceetm/ceetm_git.bb +++ b/recipes-kernel/ceetm/ceetm_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bac620b9883d38a84dfb73ca7122d915" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ceetm;nobranch=1" SRCREV = "6a7f2ec2091df2f4380cb8d25a36c399aed5af1b" -SRC_URI_append = " file://0001-Makefile-update-CFLAGS.patch \ +SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \ file://0001-use-new-api-tc_print_rate.patch \ " DEPENDS = "iproute2" @@ -22,7 +22,7 @@ do_install(){ cp ${S}/q_ceetm.so ${D}/${libdir}/tc/ } -FILES_${PN} += "${libdir}/tc" +FILES:${PN} += "${libdir}/tc" INHIBIT_PACKAGE_STRIP = "1" COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb index feddc8faa..f2cd1a579 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb @@ -14,7 +14,7 @@ export KERNEL_PATH INHIBIT_PACKAGE_STRIP = "1" -do_compile_prepend() { +do_compile:prepend() { sed -i -e 's,EXTRA_CFLAGS += -I$(PWD),EXTRA_CFLAGS += -I${S},' ${S}/armodule/source/Makefile } @@ -25,8 +25,8 @@ do_install(){ cp -f ${S}/bin/ar_* ${D}${bindir}/ } -FILES_${PN} += "${bindir}/" -INSANE_SKIP_${PN} = "ldflags" +FILES:${PN} += "${bindir}/" +INSANE_SKIP:${PN} = "ldflags" COMPATIBLE_MACHINE = "(t1040|t1042)" CLEANBROKEN = "1" diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb index 74e01bd9c..c2effd01b 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb @@ -7,7 +7,7 @@ do_install(){ install -m 755 ${S}/kernel/*.ko ${D}/usr/driver/IPC/multi_rat } -FILES_${PN} += "/usr/driver/IPC/multi_rat/*.ko" -FILES_${PN}-dbg += "/usr/driver/IPC/multi_rat/.debug" +FILES:${PN} += "/usr/driver/IPC/multi_rat/*.ko" +FILES:${PN}-dbg += "/usr/driver/IPC/multi_rat/.debug" COMPATIBLE_MACHINE = "(b4860qds|b4420qds)" diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb index 86155423b..234181759 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb @@ -7,7 +7,7 @@ do_install(){ install -m 755 ${S}/kernel/*.ko ${D}/usr/driver/IPC/single_rat } -FILES_${PN} += "/usr/driver/IPC/single_rat/*.ko" -FILES_${PN}-dbg += "/usr/driver/IPC/single_rat/.debug" +FILES:${PN} += "/usr/driver/IPC/single_rat/*.ko" +FILES:${PN}-dbg += "/usr/driver/IPC/single_rat/.debug" COMPATIBLE_MACHINE = "(b4860qds|b4420qds)" diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc index 350ba186a..903c53a48 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc +++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc @@ -11,7 +11,7 @@ SRCREV = "74d662707558290f070f9589177db730444bc435" S = "${WORKDIR}/git" do_configure[depends] += "virtual/kernel:do_shared_workdir" -do_compile_prepend () { +do_compile:prepend () { cd ${S}/kernel } diff --git a/recipes-kernel/kernel-modules/kernel-module-qca6174_3.0.bb b/recipes-kernel/kernel-modules/kernel-module-qca6174_3.0.bb index f78a4c5b8..40eadef35 100644 --- a/recipes-kernel/kernel-modules/kernel-module-qca6174_3.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-qca6174_3.0.bb @@ -11,4 +11,4 @@ EXTRA_OEMAKE += " \ CONFIG_WLAN_FEATURE_DSRC=y \ " -RDEPENDS_${PN} += "firmware-qca6174" +RDEPENDS:${PN} += "firmware-qca6174" diff --git a/recipes-kernel/kernel-modules/kernel-module-qca9377_3.1.bb b/recipes-kernel/kernel-modules/kernel-module-qca9377_3.1.bb index fbc87ea26..92bc01fc7 100644 --- a/recipes-kernel/kernel-modules/kernel-module-qca9377_3.1.bb +++ b/recipes-kernel/kernel-modules/kernel-module-qca9377_3.1.bb @@ -14,4 +14,4 @@ EXTRA_OEMAKE += " \ SAP_AUTH_OFFLOAD=1 \ " -RDEPENDS_${PN} += "firmware-qca9377" +RDEPENDS:${PN} += "firmware-qca9377" diff --git a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc index 0b23a47c0..a7b8a4e68 100644 --- a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc +++ b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc @@ -20,4 +20,4 @@ EXTRA_OEMAKE += " \ " COMPATIBLE_MACHINE = "(imx)" -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb b/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb index 63527d132..95dd72fb8 100644 --- a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb +++ b/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ environment" -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-fslc:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" require linux-fslc-lts_${PV}.bb require linux-mfgtool.inc diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_5.12.bb b/recipes-kernel/linux/linux-fslc-mfgtool_5.12.bb index c155ebb96..09d35c915 100644 --- a/recipes-kernel/linux/linux-fslc-mfgtool_5.12.bb +++ b/recipes-kernel/linux/linux-fslc-mfgtool_5.12.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ environment" -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-fslc:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" require linux-fslc_${PV}.bb require linux-mfgtool.inc diff --git a/recipes-kernel/linux/linux-imx-headers_5.10.bb b/recipes-kernel/linux/linux-imx-headers_5.10.bb index c656fa557..c282fc624 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.10.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.10.bb @@ -65,7 +65,7 @@ do_install() { # Without this setting the RDEPENDS in other recipes fails to find this # package, therefore causing the -dev package also to be skipped effectively not # populating it into SDK -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native bison-native rsync-native" @@ -75,4 +75,4 @@ PACKAGE_ARCH = "${MACHINE_SOCARCH}" # Restrict this recipe to NXP BSP only, this recipe is not compatible # with mainline BSP COMPATIBLE_HOST = '(null)' -COMPATIBLE_HOST_use-nxp-bsp = '.*' +COMPATIBLE_HOST:use-nxp-bsp = '.*' diff --git a/recipes-kernel/linux/linux-imx-mfgtool_5.10.bb b/recipes-kernel/linux/linux-imx-mfgtool_5.10.bb index 0a9f5259e..311245b19 100644 --- a/recipes-kernel/linux/linux-imx-mfgtool_5.10.bb +++ b/recipes-kernel/linux/linux-imx-mfgtool_5.10.bb @@ -5,7 +5,7 @@ SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" DESCRIPTION = "Linux Kernel provided and supported by Freescale that produces a \ Manufacturing Tool compatible Linux Kernel to be used in updater environment" -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-imx:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-imx:" require linux-imx_${PV}.bb require linux-mfgtool.inc diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index 4d134b476..edac10550 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -7,12 +7,12 @@ LICENSE = "GPLv2" S = "${WORKDIR}/git" -DEPENDS_append = " libgcc" +DEPENDS:append = " libgcc" # not put Images into /boot of rootfs, install kernel-image if needed -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" -KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" +KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}" +KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" @@ -24,9 +24,9 @@ PV = "${LINUX_VERSION}+git${SRCPV}" SCMVERSION ?= "y" LOCALVERSION = "" DELTA_KERNEL_DEFCONFIG ?= "" -DELTA_KERNEL_DEFCONFIG_prepend_qoriq-arm64 = "lsdk.config " -DELTA_KERNEL_DEFCONFIG_prepend_fsl-lsch2-32b = "multi_v7_lpae.config multi_v8.config lsdk.config " -DELTA_KERNEL_DEFCONFIG_prepend_ls102xa = "multi_v7_lpae.config lsdk.config " +DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm64 = "lsdk.config " +DELTA_KERNEL_DEFCONFIG:prepend:fsl-lsch2-32b = "multi_v7_lpae.config multi_v8.config lsdk.config " +DELTA_KERNEL_DEFCONFIG:prepend:ls102xa = "multi_v7_lpae.config lsdk.config " do_merge_delta_config[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot bison-native:do_populate_sysroot" do_merge_delta_config[dirs] = "${B}" @@ -56,13 +56,13 @@ do_merge_delta_config() { addtask merge_delta_config before do_kernel_localversion after do_patch # The link of dts folder is needed for 32b compile of aarch64 targets(e.g. ls1043ardb-32b) -do_compile_prepend_fsl-lsch2-32b() { +do_compile:prepend:fsl-lsch2-32b() { ln -sfT ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/freescale ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale } -do_install_prepend_fsl-lsch2-32b() { +do_install:prepend:fsl-lsch2-32b() { rm -f ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale } -FILES_${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*" +FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*" COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb index 4b111b5dc..6d4b48648 100644 --- a/recipes-kernel/skmm-host/skmm-host_git.bb +++ b/recipes-kernel/skmm-host/skmm-host_git.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' -FILES_${PN} += "/etc/skmm/ /usr/bin/" +FILES:${PN} += "/etc/skmm/ /usr/bin/" COMPATIBLE_MACHINE = "(p4080ds|t4240qds)" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf