Fix m3ulcb/m3ulcb-nogfx builds

Temporarily disable the Kingfisher support layer in the m3ulcb and
m3ulcb-nogfx machine templates as was done for the h3ulcb templates.
This fixes building with these machine types.

Bug-AGL: SPEC-3380

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib54490ef95582909a34c9d3001283c40debf241b
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24589
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 5f410f0..794f66c 100644 (file)
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,7 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
-  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
   "
+
+# disable kingfisher until fixed
+#  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+#  "

diff --git a/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/templates/machine/m3ulcb-nogfx/50_local.conf.inc
index 3fd5d6e..865b52f 100644 (file)
--- a/templates/machine/m3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_local.conf.inc
@@ -3,4 +3,4 @@ MACHINE = "m3ulcb"
 require conf/include/agl_m3ulcb-nogfx.inc
 
 #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-require conf/include/rcar-gen3-adas.inc
+#require conf/include/rcar-gen3-adas.inc

diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index 5f410f0..794f66c 100644 (file)
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,7 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
-  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
   "
+
+# disable kingfisher until fixed
+#  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+#  "

diff --git a/templates/machine/m3ulcb/50_local.conf.inc b/templates/machine/m3ulcb/50_local.conf.inc
index e2fe41a..a516e94 100644 (file)
--- a/templates/machine/m3ulcb/50_local.conf.inc
+++ b/templates/machine/m3ulcb/50_local.conf.inc
@@ -3,4 +3,4 @@ MACHINE = "m3ulcb"
 require conf/include/agl_m3ulcb.inc
 
 #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-require conf/include/rcar-gen3-adas.inc
+#require conf/include/rcar-gen3-adas.inc