summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-05-22 19:42:17 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-05-22 20:05:51 +0200
commit982685e1490be405195a11c99f69ee69ecdcf5d8 (patch)
tree8683f0230f7e10e9d5776ee3a9706331f2228db3
parent1e400c68e316635c83997dc45752bcb880112ccf (diff)
tdx-base.inc: gstreamer: set preferred version for use-mainline-bsp
Using python to conditionally set PREFERRED_VERSION_xxx does work, however bitbake evaluates the value of PREFERRED_VERSION_xxx before set in the python function. Reverting the conditional assignment in favour of a hard coded upstream value. fixes: 1e400c68e Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/distro/include/tdx-base.inc20
1 files changed, 11 insertions, 9 deletions
diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc
index d893097..a25c986 100644
--- a/conf/distro/include/tdx-base.inc
+++ b/conf/distro/include/tdx-base.inc
@@ -49,12 +49,14 @@ VIRTUAL-RUNTIME_init_manager = "systemd"
PACKAGECONFIG_append_pn-qemu-native = " libusb"
# Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver)
-python () {
- # only set imx override if use-mainline-bsp is not used
- overrides = d.getVar("OVERRIDES", True)
- if not "use-mainline-bsp" in overrides:
- d.setVar('PREFERRED_VERSION_gstreamer1.0_imx', '1.14.imx')
- d.setVar('PREFERRED_VERSION_gstreamer1.0-plugins-base_imx', '1.14.imx')
- d.setVar('PREFERRED_VERSION_gstreamer1.0-plugins-good_imx', '1.14.imx')
- d.setVar('PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx', '1.14.imx')
-}
+PREFERRED_VERSION_gstreamer1.0_imx = "1.14.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base_imx = "1.14.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good_imx = "1.14.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx = "1.14.imx"
+
+# these 1.14.imx variants have their COMPATIBLE set so that they don't build
+# for use-mainline-bsp
+PREFERRED_VERSION_gstreamer1.0_use-mainline-bsp = "1.14.4"
+PREFERRED_VERSION_gstreamer1.0-plugins-base_use-mainline-bsp = "1.14.4"
+PREFERRED_VERSION_gstreamer1.0-plugins-good_use-mainline-bsp = "1.14.4"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-mainline-bsp = "1.14.4"