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 From 7377f6c87e351ad702485fee1e9da42690f9f5e8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 6 Aug 2021 16:43:29 -0500 Subject: layer: More override fixes Adds fixes for _imx, _imxdpu, _imxdrm, _imxgpu, _imxgpu3d, virtual PREFERRED_PROVIDER versions Fix other places for imx/imxdpu/imxdrm overrides Signed-off-by: Tom Hochstein Signed-off-by: Khem Raj --- classes/use-imx-headers.bbclass | 4 ++-- conf/machine/include/imx-base.inc | 16 ++++++++-------- recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb | 2 +- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- recipes-graphics/wayland/weston-init.bbappend | 2 +- recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 2 +- recipes-multimedia/alsa/alsa-lib_%.bbappend | 4 ++-- .../gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'classes') diff --git a/classes/use-imx-headers.bbclass b/classes/use-imx-headers.bbclass index ea70e6a50..c6c7f0434 100644 --- a/classes/use-imx-headers.bbclass +++ b/classes/use-imx-headers.bbclass @@ -13,14 +13,14 @@ # # 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" -PACKAGE_ARCH_imx ?= "${MACHINE_SOCARCH}" +PACKAGE_ARCH:imx ?= "${MACHINE_SOCARCH}" STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b8bcecab7..18bf47003 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -204,7 +204,7 @@ MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl" MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER:append_imx = " \ +MACHINE_SOCARCH_FILTER:append:imx = " \ alsa-lib \ gstreamer1.0 \ weston \ @@ -355,17 +355,17 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" -PREFERRED_PROVIDER_virtual/egl_imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgl_imxgpu3d ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgl:imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" -PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" +PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston_imx ?= "9.0.0.imx" +PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" PREFERRED_VERSION_weston:use-mainline-bsp = "" PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.20.imx" @@ -474,7 +474,7 @@ KERNEL_IMAGETYPE:aarch64 = "Image" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" -# Add the ability to specify _imx machines +# Add the ability to specify imx machines MACHINEOVERRIDES =. "imx:" HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum" diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb index 4b6aee0b5..e57a4273b 100644 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb @@ -26,7 +26,7 @@ EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \ # libg2d. However, that implementation's g2d_alloc() function # is broken, so we cannot use it. LIBG2D_PACKAGECONFIG = "g2d" -LIBG2D_PACKAGECONFIG_imxdpu = "" +LIBG2D_PACKAGECONFIG:imxdpu = "" PACKAGECONFIG ?= " " PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index e486d6890..472c03c4d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -17,7 +17,7 @@ DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence libxxf86vm', \ '', d)} \ " -DEPENDS:append_imxdrm = " libdrm wayland" +DEPENDS:append:imxdrm = " libdrm wayland" DEPENDS:append:mx8 = " patchelf-native" # imx-gpu-viv does not provide everything it needs to for virtual/libgl diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index e6baac0be..5710e9b5e 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -12,7 +12,7 @@ SRC_URI:append:mx6sl = " file://weston.config" # commented out. For example: # #xwayland=true # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. -INI_UNCOMMENT_ASSIGNMENTS:append_imx = " \ +INI_UNCOMMENT_ASSIGNMENTS:append:imx = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ " INI_UNCOMMENT_ASSIGNMENTS:append:mx8 = " \ diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index c7b7e8794..34e2ed823 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -13,4 +13,4 @@ IMX_OPENGL_PKGCONFIGS_REMOVE = "" IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" -OPENGL_PKGCONFIGS:remove_imxdrm = "dri glx" +OPENGL_PKGCONFIGS:remove:imxdrm = "dri glx" diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index 74fcba8a2..d76c45d1e 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -6,6 +6,6 @@ IMX_PATCH = " \ file://0005-add-ak4458-conf-for-multichannel-support.patch \ file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ " -SRC_URI:append_imx = "${IMX_PATCH}" +SRC_URI:append:imx = "${IMX_PATCH}" -PACKAGE_ARCH_imx = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:imx = "${MACHINE_SOCARCH}" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb index eefa870a1..26f25d723 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb @@ -28,8 +28,8 @@ inherit pkgconfig meson use-imx-headers # is needed to improve performance. LIBG2D_DPU_OPTION = "-Dg2d-based-on-dpu=false" LIBG2D_DEPENDENCIES = "virtual/libg2d" -LIBG2D_DPU_OPTION_imxdpu = "-Dg2d-based-on-dpu=true" -LIBG2D_DEPENDENCIES_imxdpu = "virtual/libg2d libdrm" +LIBG2D_DPU_OPTION:imxdpu = "-Dg2d-based-on-dpu=true" +LIBG2D_DEPENDENCIES:imxdpu = "virtual/libg2d libdrm" EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX}" -- cgit v1.2.3-54-g00ecf From a31e8a6a7e8ba8a3eac1183349fd68a026fdaed1 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 10 Aug 2021 10:22:51 -0500 Subject: machine-overrides-extender.bbclass: Adjust for new override character Signed-off-by: Tom Hochstein Signed-off-by: Khem Raj --- classes/machine-overrides-extender.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass index 4b7d66d51..876ddd104 100644 --- a/classes/machine-overrides-extender.bbclass +++ b/classes/machine-overrides-extender.bbclass @@ -5,12 +5,12 @@ # # To indicate that a SoC contains following set of overrides, you can use: # -# MACHINEOVERRIDES_EXTENDER_soc = "group1:group2" +# MACHINEOVERRIDES_EXTENDER:soc = "group1:group2" # # However to indicate that an override replaces a set of other # overrides, you can use: # -# MACHINEOVERRIDES_EXTENDER_FILTER_OUT_override = "group1 group2" +# MACHINEOVERRIDES_EXTENDER_FILTER_OUT:override = "group1 group2" # # Copyright 2016-2018 (C) O.S. Systems Software LTDA. @@ -20,13 +20,13 @@ def machine_overrides_extender(d): # Gather the list of overrides to filter out machine_overrides_filter_out = [] for override in machine_overrides: - machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override) or '').split() + machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT:%s' % override) or '').split() # Drop any overrides of filter_out prior extending machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] for override in machine_overrides: - extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override) + extender = d.getVar('MACHINEOVERRIDES_EXTENDER:%s' % override) if extender: extender = extender.split(':') -- cgit v1.2.3-54-g00ecf From 229b84b66aa2eebd3947505a49f5711e5ea96466 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 Aug 2021 10:10:27 -0700 Subject: image_types_fsl.bbclass: Remove overzelous override replacements Override conversion script got confused here perhaps Signed-off-by: Khem Raj --- classes/image_types_fsl.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index 9f76273f3..cdd16a66f 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass @@ -9,7 +9,7 @@ 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() { mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ @@ -19,7 +19,7 @@ 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() { mxsboot ${MXSBOOT_NAND_ARGS} nand \ @@ -33,7 +33,7 @@ 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 -- cgit v1.2.3-54-g00ecf