From 6ddae219515fda5e6ffb0ad6a2fdc5430d9fa926 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 22 Feb 2021 18:18:13 +0100 Subject: distro: tdx-base.inc: preferred_versions: follow gstreamer changes meta-freescale added the revision part of the gstreamer imx forks to the version, i.e. 1.16.imx -> 1.16.2.imx. Rework the preferred versions. Signed-off-by: Max Krummenacher --- conf/distro/include/tdx-base.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index aeb18fd..81a27e9 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -66,21 +66,22 @@ PACKAGECONFIG_append_pn-qemu-native = " libusb" PREFERRED_PROVIDER_u-boot-fw-utils = "libubootenv" PREFERRED_RPROVIDER_u-boot-fw-utils = "libubootenv" +PREFERRED_RPROVIDER_u-boot-default-env = "${PREFERRED_PROVIDER_virtual/bootloader}" PREFERRED_PROVIDER_virtual/dtb ?= "device-tree-overlays" # Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) -PREFERRED_VERSION_gstreamer1.0_imx = "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base_imx = "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good_imx = "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx = "1.16.imx" +PREFERRED_VERSION_gstreamer1.0_imx = "1.16.2.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base_imx = "1.16.2.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good_imx = "1.16.3.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx = "1.16.3.imx" # the 1.16.imx variants have their COMPATIBLE set so that they don't build # for use-mainline-bsp -PREFERRED_VERSION_gstreamer1.0_use-mainline-bsp = "1.16%" -PREFERRED_VERSION_gstreamer1.0-plugins-base_use-mainline-bsp = "1.16%" -PREFERRED_VERSION_gstreamer1.0-plugins-good_use-mainline-bsp = "1.16%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-mainline-bsp = "1.16%" +PREFERRED_VERSION_gstreamer1.0_use-mainline-bsp = "1.18%" +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" -- cgit v1.2.3