Also apply adaptations for BSPs to -nofgx variants and extend bbe

These changes are required for the next set of BSP updates.

Bug-AGL: SPEC-5097

Change-Id: I15100512b2ef5dc2f787f71c46d7897c2ba22c0b
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29843

diff --git a/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl-bsp/conf/include/agl_bbe.inc
index a56ca19..b47efec 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_bbe.inc
+++ b/meta-agl-bsp/conf/include/agl_bbe.inc
@@ -41,6 +41,8 @@ SECURITY_LDFLAGS:pn-libatasmart = ""
 
 # DISABLE LTTNG-MODULES
 LTTNGMODULES:forcevariable = ""
+LTTNGTOOLS:forcevariable = ""
+LTTNGUST:forcevariable = ""
 
 # imaging might fail on nonexistant package
 ALLOW_EMPTY_gdbserver = "1"

diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
index eb29f1a..dba0ab3 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
@@ -45,3 +45,9 @@ PSEUDO_IGNORE_PATHS:append:pn-kernel-module-vspm = ",${KERNELSRC}"
 # Mask out base-files and systemd bbappends to avoid changing systemd-tmpfiles
 # behavior, see SPEC-4256 for a more involved explanation.
 BBMASK += "meta-rcar-gen3/recipes-core/base-files/ meta-rcar-gen3/recipes-core/systemd/"
+
+# DISABLE LTTNG-MODULES
+LTTNGMODULES:forcevariable = ""
+
+# broken recipe
+BBMASK += "meta-rcar-gen3/recipes-connectivity/linuxptp/linuxptp_2.0.bbappend"