From f092834a777cf82dcf25c8609221e4639832e045 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 14 Feb 2022 10:18:13 +0100 Subject: distro: tdx-base.inc: drop preferring versions These versions were pinned when backporting a newer NXP BSP to dunfell. In master these versions were bumped in meta-freescale and the new versions are set to preferred there. The override here interferes and instead of the i.MX specific recipe the upstream recipe from OE-Core is built. Signed-off-by: Max Krummenacher --- conf/distro/include/tdx-base.inc | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index 7b31a25..6e46914 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -92,20 +92,6 @@ PREFERRED_VERSION_gstreamer1.0-plugins-base:use-mainline-bsp ?= "1.18%" PREFERRED_VERSION_gstreamer1.0-plugins-good:use-mainline-bsp ?= "1.18%" PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-mainline-bsp ?= "1.18%" -# Override Wayland/Weston Version set in meta-freescale imx-base.inc -PREFERRED_VERSION_wayland-protocols:mx6 = "1.20.imx" -PREFERRED_VERSION_wayland-protocols:mx7 = "1.20.imx" -PREFERRED_VERSION_wayland-protocols:mx8 = "1.20.imx" - -PREFERRED_VERSION_weston:mx6 ?= "9.0.0.imx" -PREFERRED_VERSION_weston:mx7 ?= "9.0.0.imx" -PREFERRED_VERSION_weston:mx8 ?= "9.0.0.imx" - -# Use i.MX libdrm Version -PREFERRED_VERSION_libdrm:mx6 = "2.4.102.imx" -PREFERRED_VERSION_libdrm:mx7 = "2.4.102.imx" -PREFERRED_VERSION_libdrm:mx8 = "2.4.102.imx" - PREFERRED_PROVIDER_opencl-headers:imxgpu = "imx-gpu-viv" PREFERRED_PROVIDER_opencl-clhpp:imxgpu = "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu = "imx-gpu-viv" -- cgit v1.2.3