From b7656b82730b40c5f5f811c8d873ad3fdbd4acdb Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Fri, 4 Dec 2020 06:49:22 +0100 Subject: Fix the -nogfx builds for the YP 3.1.4 uprev This fixes Missing or unbuildable dependency chain was: ['agl-image-minimal-crosssdk', 'waltham-dev'] Bug-AGL: SPEC-3706 Signed-off-by: Jan-Simon Moeller Change-Id: Ic80bf6cac57b53edda112f38a92884ed8506d74d Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25728 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc | 3 +++ meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 2 ++ 2 files changed, 5 insertions(+) (limited to 'meta-agl-bsp/conf') diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc index 25755d247..70bc68b2e 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc @@ -8,3 +8,6 @@ DTB_SUFFIX = "r8a7795-h3ulcb" BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK += "kernel-module-uvcs-drv|omx-user-module" + +# Workaround for SPEC-3706 - versioned bbappends and upstream moved on to 1.16.3 +BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-.*1.16.2\.bbappend" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 5092c4bcb..28360fcc9 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -12,3 +12,5 @@ BBMASK += "kernel-module-uvcs-drv|omx-user-module" DISTRO_FEATURES_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" IMAGE_INSTALL_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" +# Workaround for SPEC-3706 - versioned bbappends and upstream moved on to 1.16.3 +BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-.*1.16.2\.bbappend" -- cgit 1.2.3-korg