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 --- classes/fsl-eula-unpack.bbclass | 4 ++-- classes/fsl-u-boot-localversion.bbclass | 2 +- classes/fsl-vivante-kernel-driver-handler.bbclass | 8 ++++---- classes/image_types_fsl.bbclass | 12 ++++++------ classes/imx-boot-container.bbclass | 4 ++-- classes/kernel-imximage.bbclass | 4 ++-- classes/kernel-itbimage.bbclass | 2 +- classes/mfgtool-initramfs-image.bbclass | 2 +- classes/qoriq_build_64bit_kernel.bbclass | 6 +++--- classes/use-imx-headers.bbclass | 6 +++--- classes/use-imx-security-controller-firmware.bbclass | 6 +++--- 11 files changed, 28 insertions(+), 28 deletions(-) (limited to 'classes') diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index 498d7826d..5690898c5 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -79,11 +79,11 @@ FSL_EULA_FILE_MD5SUM ?= \ LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" -LIC_FILES_CHKSUM_append = " ${LIC_FILES_CHKSUM_LAYER}" +LIC_FILES_CHKSUM:append = " ${LIC_FILES_CHKSUM_LAYER}" LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE" -do_fetch_prepend() { +do_fetch:prepend() { if "Proprietary" not in d.getVar("LICENSE"): bb.fatal("The recipe LICENSE should include Proprietary but is " + d.getVar("LICENSE") + ".") } diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass index 617aae1de..ebde8ea71 100644 --- a/classes/fsl-u-boot-localversion.bbclass +++ b/classes/fsl-u-boot-localversion.bbclass @@ -14,7 +14,7 @@ LOCALVERSION ??= "+fslc" UBOOT_LOCALVERSION = "${LOCALVERSION}" -do_compile_prepend() { +do_compile:prepend() { if [ "${SCMVERSION}" = "y" ]; then # Add GIT revision to the local version head=`cd ${S} ; git rev-parse --verify --short HEAD 2> /dev/null` diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass index 8ac8a3344..54954aabc 100644 --- a/classes/fsl-vivante-kernel-driver-handler.bbclass +++ b/classes/fsl-vivante-kernel-driver-handler.bbclass @@ -41,15 +41,15 @@ python fsl_vivante_kernel_driver_handler () { return if use_vivante_kernel_driver_module != "1": - e.data.appendVar('RPROVIDES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RREPLACES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RCONFLICTS_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') } addhandler fsl_vivante_kernel_driver_handler fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise" -do_configure_append () { +do_configure:append () { if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then config="${B}/.config" diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index c49c51b7a..9f76273f3 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass @@ -9,9 +9,9 @@ UBOOT_SUFFIX ?= "bin" MXSBOOT_NAND_ARGS ?= "" # U-Boot mxsboot generation for uSD -do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ +do_image_uboot:mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ u-boot:do_deploy" -IMAGE_CMD_uboot-mxsboot-sdcard() { +IMAGE_CMD:uboot-mxsboot-sdcard() { mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard \ @@ -19,9 +19,9 @@ IMAGE_CMD_uboot-mxsboot-sdcard() { } # U-Boot mxsboot generation for NAND -do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ +do_image_uboot:mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ u-boot:do_deploy" -IMAGE_CMD_uboot-mxsboot-nand() { +IMAGE_CMD:uboot-mxsboot-nand() { mxsboot ${MXSBOOT_NAND_ARGS} nand \ ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand @@ -33,11 +33,11 @@ IMAGE_CMD_uboot-mxsboot-nand() { # image stream built before the wic generation do_image_wic[depends] += " \ ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', \ - '${IMAGE_BASENAME}:do_image_uboot_mxsboot_sdcard', '', d)} \ + '${IMAGE_BASENAME}:do_image_uboot:mxsboot_sdcard', '', d)} \ " # We need to apply a fixup inside of the partition table -IMAGE_CMD_wic_append_mxs() { +IMAGE_CMD:wic:append:mxs() { # Change partition type for mxs processor family bbnote "Setting partition type to 0x53 as required for mxs' SoC family." echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass index 41fe9cca7..33de45c52 100644 --- a/classes/imx-boot-container.bbclass +++ b/classes/imx-boot-container.bbclass @@ -23,7 +23,7 @@ # Define ATF binary file to be deployed to the U-Boot build folder ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin" -ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" +ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" # This package aggregates output deployed by other packages, so set the # appropriate dependencies for populate binaries task @@ -76,7 +76,7 @@ addtask do_resolve_and_populate_binaries before do_compile after do_configure # This effectively would allow the usage of the same WKS file for those # derivatives that are using the boot container from U-Boot and those # that are not yet have support for it enabled. -do_deploy_append() { +do_deploy:append() { # Deploy the resulted flash.bin for WIC to pick it up if [ -n "${UBOOT_CONFIG}" ]; then for config in ${UBOOT_MACHINE}; do diff --git a/classes/kernel-imximage.bbclass b/classes/kernel-imximage.bbclass index 234cc00d3..ccf7ec53b 100644 --- a/classes/kernel-imximage.bbclass +++ b/classes/kernel-imximage.bbclass @@ -17,7 +17,7 @@ # # Copyright 2017 (C) O.S. Systems Software LTDA. -DEPENDS_append = ' u-boot-mkimage-native' +DEPENDS:append = ' u-boot-mkimage-native' IMXIMAGE_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}" @@ -55,6 +55,6 @@ gen_imximage() { done } -do_deploy_append() { +do_deploy:append() { gen_imximage } diff --git a/classes/kernel-itbimage.bbclass b/classes/kernel-itbimage.bbclass index 84262879c..51a87319c 100644 --- a/classes/kernel-itbimage.bbclass +++ b/classes/kernel-itbimage.bbclass @@ -459,7 +459,7 @@ addtask assemble_fitimage_initramfs before do_deploy after do_install kernel_do_deploy[vardepsexclude] = "DATETIME" -kernel_do_deploy_append() { +kernel_do_deploy:append() { # Update deploy directory if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then cd ${B} diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass index 65028b8fa..1d4c55131 100644 --- a/classes/mfgtool-initramfs-image.bbclass +++ b/classes/mfgtool-initramfs-image.bbclass @@ -13,7 +13,7 @@ FEATURE_PACKAGES_extfs = "packagegroup-fsl-mfgtool-extfs" FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs" IMAGE_FSTYPES = "cpio.gz.u-boot" -IMAGE_FSTYPES_mxs = "cpio.gz.u-boot" +IMAGE_FSTYPES:mxs = "cpio.gz.u-boot" IMAGE_ROOTFS_SIZE ?= "8192" # Filesystems enabled by default diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass index 93b4d412f..5186c2a41 100644 --- a/classes/qoriq_build_64bit_kernel.bbclass +++ b/classes/qoriq_build_64bit_kernel.bbclass @@ -1,13 +1,13 @@ inherit features_check -REQUIRED_DISTRO_FEATURES_e6500 += "multiarch" +REQUIRED_DISTRO_FEATURES:e6500 += "multiarch" python () { promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False) if promote_kernel == "1": sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR', False) + 'mllib64-' + d.getVar('HOST_OS', False) tc_options = d.getVar('TOOLCHAIN_OPTIONS', False) + '/../lib64-' + d.getVar("MACHINE", False) - d.setVar('DEPENDS_append', ' lib64-gcc-cross-powerpc64 lib64-libgcc') - d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib) + d.setVar('DEPENDS:append', ' lib64-gcc-cross-powerpc64 lib64-libgcc') + d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib) d.setVar('KERNEL_CC', d.getVar('CCACHE', False) + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH', False) + tc_options) d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options) d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False)) diff --git a/classes/use-imx-headers.bbclass b/classes/use-imx-headers.bbclass index fcec68c8b..ea70e6a50 100644 --- a/classes/use-imx-headers.bbclass +++ b/classes/use-imx-headers.bbclass @@ -13,12 +13,12 @@ # # Copyright 2018 (C) O.S. Systems Software LTDA. -DEPENDS_append_imx = " linux-imx-headers" +DEPENDS:append_imx = " linux-imx-headers" # Set runtime dependency of -dev for package inheriting this class to # linux-imx-headers-dev package. This is required in order to propagate # headers into the SDK -RDEPENDS_${PN}-dev += "linux-imx-headers-dev" +RDEPENDS:${PN}-dev += "linux-imx-headers-dev" PACKAGE_ARCH_imx ?= "${MACHINE_SOCARCH}" @@ -34,4 +34,4 @@ STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx" # Typical example here would be imx-vpu-hantro recipe, which requires NXP # BSP and is not compatible with mainline. COMPATIBLE_HOST = '(null)' -COMPATIBLE_HOST_use-nxp-bsp = '.*' +COMPATIBLE_HOST:use-nxp-bsp = '.*' diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass index 7c79fc62b..9650059b5 100644 --- a/classes/use-imx-security-controller-firmware.bbclass +++ b/classes/use-imx-security-controller-firmware.bbclass @@ -18,11 +18,11 @@ SECO_FIRMWARE_NAME ?= "" -SECO_FIRMWARE_NAME_mx8qm = "mx8qmb0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8qxp = \ +SECO_FIRMWARE_NAME:mx8qm = "mx8qmb0-ahab-container.img" +SECO_FIRMWARE_NAME:mx8qxp = \ "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \ 'mx8qxc0-ahab-container.img', d)}" -SECO_FIRMWARE_NAME_mx8dxl = "mx8dxla1-ahab-container.img" +SECO_FIRMWARE_NAME:mx8dxl = "mx8dxla1-ahab-container.img" python () { if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"): -- cgit v1.2.3-54-g00ecf