12 files changed, 9 insertions, 36 deletions
diff --git a/templates/base/00_local.conf.agl.inc b/templates/base/00_local.conf.agl.inc
index 1cfd90557..1128b323b 100644
--- a/templates/base/00_local.conf.agl.inc
+++ b/templates/base/00_local.conf.agl.inc
@@ -6,3 +6,6 @@ DISTRO = "poky-agl"
 
 #see meta-agl/meta-agl/conf/include/base-agl.inc
 require conf/include/base-agl.inc
+
+# Temporarily disable GObject Introspection Data
+GI_DATA_ENABLED = "False"
diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index 6bccb7932..d86954698 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -35,7 +35,6 @@ AGL_CORE_LAYERS = " \
 AGL_CORE_DEPENDENCY_LAYERS = " \
   ${METADIR}/meta-openembedded/meta-oe \
   ${METADIR}/meta-openembedded/meta-multimedia \
-  ${METADIR}/meta-openembedded/meta-efl \
   ${METADIR}/meta-openembedded/meta-networking \
   ${METADIR}/meta-openembedded/meta-python \
   ${METADIR}/meta-openembedded/meta-filesystems \
diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
index 344c25070..7f5f24eb5 100644
--- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
+++ b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
@@ -1,6 +1,7 @@
 BBLAYERS =+ " \
-	${METADIR}/meta-intel-iot-security/meta-security-smack \
-	${METADIR}/meta-intel-iot-security/meta-security-framework \
+        ${METADIR}/meta-security \
+	${METADIR}/meta-openembedded/meta-perl \
+        ${METADIR}/meta-agl/meta-security \
 	${METADIR}/meta-agl/meta-app-framework \
     "
 
diff --git a/templates/feature/agl-gplv2/50_bblayers.conf.inc b/templates/feature/agl-gplv2/50_bblayers.conf.inc
new file mode 100644
index 000000000..4c31c45c5
--- /dev/null
+++ b/templates/feature/agl-gplv2/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/meta-gplv2"
diff --git a/templates/feature/agl-gplv2/50_local.conf.inc b/templates/feature/agl-gplv2/50_local.conf.inc
new file mode 100644
index 000000000..8e0d5df74
--- /dev/null
+++ b/templates/feature/agl-gplv2/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-gplv2.inc
+require conf/include/agl-gplv2.inc
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
index bdcf07605..dd64eda24 100644
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ b/templates/feature/agl-sota/50_bblayers.conf.inc
@@ -2,7 +2,5 @@ BBLAYERS =+ " \
 	${METADIR}/meta-updater \
 	${METADIR}/meta-openembedded/meta-filesystems \
 	${METADIR}/meta-openembedded/meta-python \
-	${METADIR}/meta-openembedded/meta-ruby \
-	${METADIR}/meta-rust \
 	"
 
diff --git a/templates/machine/dragonboard-410c/50_setup.sh b/templates/machine/dragonboard-410c/50_setup.sh
deleted file mode 100644
index 7be1dad32..000000000
--- a/templates/machine/dragonboard-410c/50_setup.sh
+++ /dev/null
@@ -1 +0,0 @@
-find_and_ack_eula $METADIR/meta-qcom
diff --git a/templates/machine/porter-nogfx/50_bblayers.conf.inc b/templates/machine/porter-nogfx/50_bblayers.conf.inc
deleted file mode 100644
index ba0e17ef3..000000000
--- a/templates/machine/porter-nogfx/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-renesas \
-  ${METADIR}/meta-renesas/meta-rcar-gen2 \
-  "
-
diff --git a/templates/machine/porter-nogfx/50_local.conf.inc b/templates/machine/porter-nogfx/50_local.conf.inc
deleted file mode 100644
index 87ec427e3..000000000
--- a/templates/machine/porter-nogfx/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "porter"
-#see meta-agl/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
-require conf/include/agl_porter-nogfx.inc
diff --git a/templates/machine/porter/50_bblayers.conf.inc b/templates/machine/porter/50_bblayers.conf.inc
deleted file mode 100644
index ba0e17ef3..000000000
--- a/templates/machine/porter/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-renesas \
-  ${METADIR}/meta-renesas/meta-rcar-gen2 \
-  "
-
diff --git a/templates/machine/porter/50_local.conf.inc b/templates/machine/porter/50_local.conf.inc
deleted file mode 100644
index f2794b0d0..000000000
--- a/templates/machine/porter/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "porter"
-#see meta-agl/meta-agl-bsp/conf/include/agl_porter.inc
-require conf/include/agl_porter.inc
diff --git a/templates/machine/porter/50_setup.sh b/templates/machine/porter/50_setup.sh
deleted file mode 100644
index f51d4f4f5..000000000
--- a/templates/machine/porter/50_setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# setup proprietary gfx drivers and multimedia packages
-pushd $METADIR 2>/dev/null
-
-SETUP_MM_SCRIPT=$METADIR/meta-renesas/meta-rcar-gen2/scripts/setup_mm_packages.sh
-if [ -f $SETUP_MM_SCRIPT ]; then
-	. $SETUP_MM_SCRIPT $MACHINE
-	copy_mm_packages $MACHINE
-	if [ $? -ne 0 ]; then
-		echo "Copying gfx drivers and multimedia packages for '$MACHINE' failed."
-		exit 1
-	fi
-fi
-
-popd 2>/dev/null