6 files changed, 3 insertions, 10 deletions
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 22a718f43..dd64eda24 100644
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ b/templates/feature/agl-sota/50_bblayers.conf.inc
@@ -2,6 +2,5 @@ BBLAYERS =+ " \
 	${METADIR}/meta-updater \
 	${METADIR}/meta-openembedded/meta-filesystems \
 	${METADIR}/meta-openembedded/meta-python \
-	${METADIR}/meta-rust \
 	"
 
diff --git a/templates/machine/qemux86/50_local.conf.inc b/templates/machine/qemux86/50_local.conf.inc
deleted file mode 100644
index b500b3c60..000000000
--- a/templates/machine/qemux86/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "qemux86"
-#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86.inc
-require conf/include/agl_qemux86.inc
diff --git a/templates/machine/wandboard/50_bblayers.conf.inc b/templates/machine/wandboard/50_bblayers.conf.inc
deleted file mode 100644
index 0198eb464..000000000
--- a/templates/machine/wandboard/50_bblayers.conf.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-fsl-arm \
-  ${METADIR}/meta-fsl-arm-extra \
-  "
diff --git a/templates/machine/wandboard/50_local.conf.inc b/templates/machine/wandboard/50_local.conf.inc
deleted file mode 100644
index 42f9e5f77..000000000
--- a/templates/machine/wandboard/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-MACHINE = "wandboard"
-