Merge "Merge the agl-compositor sandbox into master"

[AGL/meta-agl.git] / meta-agl-bsp / meta-rcar-gen3-adas / conf / layer.conf

diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf b/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf
index 3ad30f2..6d8d1da 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf
@@ -3,14 +3,18 @@ BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES += " \
-    ${LAYERDIR}/../../../meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bb \
-    ${LAYERDIR}/../../../meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bbappend \
+    ${LAYERDIR}/../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bb \
+    ${LAYERDIR}/../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bbappend \
+    ${LAYERDIR}/recipes-*/*/*.bb \
+    ${LAYERDIR}/recipes-*/*/*.bbappend \
 "
 
 BBFILE_COLLECTIONS += "rcar-gen3-cogent"
-BBFILE_PATTERN_rcar-gen3-cogent := "^${LAYERDIR}/../../../meta-rcar/meta-rcar-gen3-adas/"
+BBFILE_PATTERN_rcar-gen3-cogent := "^${LAYERDIR}/../../../bsp/meta-rcar/meta-rcar-gen3-adas/"
 BBFILE_PRIORITY_rcar-gen3-cogent = "7"
 
+LAYERSERIES_COMPAT_rcar-gen3-cogent = "dunfell"
+
 # Custom packages
 IMAGE_INSTALL_append_rcar-gen3 = " \
     can-utils \
@@ -36,8 +40,8 @@ IMAGE_INSTALL_append_rcar-gen3 = " \
 # Radio packages
 IMAGE_INSTALL_append_rcar-gen3 += " \
     si-tools \
+    si-init \
     linux-firmware-wl18xx \
-    wireless-tools \
     ti-bt \
     ti-bt-firmware \
     bluez5 \
@@ -64,4 +68,8 @@ DISTRO_FEATURES_append = " bluetooth"
 
 
 BBMASK += "/meta-rcar-gen3-adas/recipes-core/systemd/"
+BBMASK += "/meta-rcar-gen3-adas/recipes-graphics/opencv/"
+BBMASK += "/meta-rcar-gen3-adas/recipes-devtools/valgrind/"
 
+# cogent is incompatible with YP 3.1.1
+BBMASK += "meta-rcar-gen3-adas/recipes-bsp/linux-firmware/linux-firmware_20200122.bbappend"