From 7377f6c87e351ad702485fee1e9da42690f9f5e8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 6 Aug 2021 16:43:29 -0500 Subject: [PATCH] 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 ++++++++-------- .../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 +- .../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(-) diff --git a/classes/use-imx-headers.bbclass b/classes/use-imx-headers.bbclass index ea70e6a5..c6c7f043 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 b8bcecab..18bf4700 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 4b6aee0b..e57a4273 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 e486d689..472c03c4 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 e6baac0b..5710e9b5 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 c7b7e879..34e2ed82 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 74fcba8a..d76c45d1 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 eefa870a..26f25d72 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}" -- 2.40.1