summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorduerpei <duep.fnst@fujitsu.com>2022-05-20 18:23:46 +0800
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-05-26 20:51:19 +0000
commit48d540db10aff616ce23cbce7e96d122e7551782 (patch)
treebb23907b7f2e53e6dd2eb89180e0e020f9bbee07
parentb9a7d4e7b77c025c9156e0fc7a9bc71a94daa168 (diff)
agl_m3-salvator-x-nogfx.inc:
Masking out the weston_%.bbappend In patch 27430, may have forgotten to modify this file. Bug-AGL: SPEC-4389 Signed-off-by: duerpei <duep.fnst@fujitsu.com> Change-Id: I9b451f236613c7e9efba158713723051b10b489b Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27502 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc11
1 files changed, 11 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc
index 7f1248065..b50f36355 100644
--- a/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc
@@ -8,3 +8,14 @@ DTB_SUFFIX = "r8a7796-salvator-xs"
BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
# Mask MMP recipes
BBMASK += "kernel-module-uvcs-drv|omx-user-module"
+
+# Work around use of obsolete Weston backend-fbdev in meta-rcar-gen3
+# when building without the proprietary driver stack. Masking out the
+# weston_%.bbappend seems the simplest approach for now, as forcing
+# USE_GLES = "1" to disable the adding of -Dbackend-default="fbdev" to
+# EXTRA_OEMESON triggers adding "libgbm" to DEPENDS, which breaks due
+# to that being a component specific to the proprietary stack we are
+# explicitly disabling. If the "libgbm" usage in the bbappend was
+# instead "virtual/libgbm" as is now used in poky, it might be possible
+# to just tweak PREFERRED_PROVIDER_virtual/libgbm = "mesa".
+BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend"