summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-03-21 14:33:03 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-03-21 14:33:03 +0000
commit646138f47c45364cca0c80a57294ace4075dbfb9 (patch)
tree9a8d6dc8daac2ff1407e2582d02f4f0015d5267e
parent09e1ad5f70dee77998a55179a4e0a14ebe41d531 (diff)
parentf6508c442909fd92c30b88192b37b9d1308c01d2 (diff)
Merge "[rcar-gen3] blacklist the recipes-forward-port from bsp"
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc1
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb.inc2
3 files changed, 6 insertions, 1 deletions
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/"