summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2025-02-08 12:42:50 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2025-02-11 10:35:41 +0000
commita7bb29c2984f993a2a5226ffe8d510e4ca53b0f1 (patch)
tree2a12921de3b5f49af5bc6ff4bac8b24722e3b6a9 /meta-agl-bsp/conf
parenta120153e6d3b7c23075aa0557cfab31dc2887b67 (diff)
Work around rcar-gen3 gstreamer issues
The kirkstone-dev branch of meta-rcar-gen3 has bbappends for the gstreamer1.0-plugins-* and gstreamer1.0-omx recipes that effectively build the Renesas 1.20.3 forks and package them as the version in poky (currently 1.20.7). This is now breaking due to conflicts with the large number of CVE fix patches in poky kirkstone, and is a bad idea due to a chance of breaking gstreamer users since there are mismatches between the main gstreamer package contents and the plugins. To fix this for now: - BBMASK out the bbappends - Remove the rcar-gen3 version of our local patch against gstreamer1.0-plugins-bad, as it no longer applies (since rcar-gen3 will be using the upstream version for now). This can be revisited when meta-rcar-gen3 is updated to resolve the mismatch. Bug-AGL: SPEC-5365, SPEC-5366 Change-Id: I70c519b7a85a7b69c71fc0ddd9daf3562c7009ec Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30818 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> ci-image-boot-test: Jenkins Job builder account ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account
Diffstat (limited to 'meta-agl-bsp/conf')
-rw-r--r--meta-agl-bsp/conf/include/agl_rcar-nogfx.inc11
1 files changed, 11 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
index fb67fd976..266ae3847 100644
--- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
@@ -58,3 +58,14 @@ BBMASK += "meta-renesas/meta-rcar-gen3/recipes-graphics/cogl/cogl-1.0_1.%.bbappe
# packagegroup bbclass is inherited. This can be removed when upstream
# is fixed to add the required PACKAGE_ARCH = "${MACHINE_ARCH}".
PACKAGE_ARCH:pn-packagegroup-multimedia-libs = "${MACHINE_ARCH}"
+
+# Mask out BSP layer gstreamer* 1.20.% bbappends for now, as the BSP
+# effectively is trying to patch in 1.20.3 source when upstream is at
+# 1.20.7, which breaks building at least gstreamer1.0-plugins-good, and
+# is an overall bad idea since it breaks downstream expectations with
+# respect to API versioning. The whole directory is not commented out
+# because we still want the vspfilter plugin. This can be removed if the
+# use of explicit 1.20.3 recipes in meta-renesas scarthgap branch is
+# backported.
+BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx"
+BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-"