From f6508c442909fd92c30b88192b37b9d1308c01d2 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 1 Mar 2017 18:48:17 +0100 Subject: [rcar-gen3] blacklist the recipes-forward-port from bsp * AGL must use Wayland/Weston from yocto, so to be sure AGL does not use Wayland/Weston from Renesas rcar gen3 BSP, blacklist the recipes forward ported.(but not the recipes .bbappend). Bug-AGL: SPEC-471 Bug-AGL: SPEC-411 Change-Id: I8310de2210273eb592c6ce865d300e0e5a8dbd0a Signed-off-by: Ronan Le Martret --- meta-agl-bsp/conf/include/agl_h3ulcb.inc | 4 +++- meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 1 + meta-agl-bsp/conf/include/agl_m3ulcb.inc | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index a35f7ef16..8ee7048cf 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -44,4 +44,6 @@ IMAGE_INSTALL_append_rcar-gen3 = " \ kernel-module-vspm-if \ omx-user-module \ weston-bin \ -" \ No newline at end of file +" + +BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 8985a2738..35ed8ba43 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -9,3 +9,4 @@ BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" +BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index bae0e2643..90e029287 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -45,3 +45,5 @@ IMAGE_INSTALL_append_rcar-gen3 = " \ omx-user-module \ weston-bin \ " + +BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" -- cgit 1.2.3-korg