6 files changed, 41 insertions, 1 deletions
diff --git a/templates/feature/agl-archiver/.50_FEATURE.md.swp b/templates/feature/agl-archiver/.50_FEATURE.md.swp
deleted file mode 100644
index b93845515..000000000
--- a/templates/feature/agl-archiver/.50_FEATURE.md.swp
+++ /dev/null
diff --git a/templates/feature/agl-archiver/50_local.conf.inc b/templates/feature/agl-archiver/50_local.conf.inc
index 946c262df..6ff284cdb 100644
--- a/templates/feature/agl-archiver/50_local.conf.inc
+++ b/templates/feature/agl-archiver/50_local.conf.inc
@@ -1,2 +1,4 @@
 INHERIT += "archiver"
 ARCHIVER_MODE[src] = "original"
+COPYLEFT_LICENSE_INCLUDE = "*"
+COPYLEFT_LICENSE_EXCLUDE += "CLOSED Proprietary Custom Firmware-* Freescale-* NXP-* TI TI-*"
diff --git a/templates/feature/agl-compositor/50_local.conf.inc b/templates/feature/agl-compositor/50_local.conf.inc
index be749b799..4bddfb6e9 100644
--- a/templates/feature/agl-compositor/50_local.conf.inc
+++ b/templates/feature/agl-compositor/50_local.conf.inc
@@ -1 +1,15 @@
 DISTRO_FEATURES_append = " agl-compositor"
+
+# note that these are for testing only, should be removed once the changes
+# land in their respective repositories
+
+# shell client
+AGL_BRANCH_pn-homescreen = "sandbox/mvlad/agl-compositor"
+DEPENDS_append_pn-homescreen = " wayland-native wayland qtwayland qtwayland-native"
+
+# normal apps
+AGL_BRANCH_pn-launcher = "sandbox/mvlad/agl-compositor"
+AGL_BRANCH_pn-hvac = "sandbox/mvlad/agl-compositor"
+DEPENDS_append_pn-hvac = " libafb-helpers-qt"
+AGL_BRANCH_pn-navigation-demo = "sandbox/mvlad/agl-compositor"
+AGL_BRANCH_pn-mediaplayer = "sandbox/mvlad/agl-compositor"
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
index 67c41d230..48655fdcb 100644
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ b/templates/feature/agl-sota/50_bblayers.conf.inc
@@ -1,6 +1,5 @@
 BBLAYERS =+ " \
 	${METADIR}/external/meta-updater \
-	${METADIR}/external/meta-updater-qemux86-64 \
 	${METADIR}/external/meta-openembedded/meta-filesystems \
 	${METADIR}/external/meta-openembedded/meta-python \
 	"
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 509cf6125..477694aed 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -2,3 +2,4 @@
 INHERIT += "sota"
 DISTRO_FEATURES_append = " sota usrmerge"
 DISTRO_FEATURES_NATIVE_append = " sota"
+AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz"
diff --git a/templates/feature/agl-sota/50_setup.sh b/templates/feature/agl-sota/50_setup.sh
new file mode 100644
index 000000000..c5aeb532d
--- /dev/null
+++ b/templates/feature/agl-sota/50_setup.sh
@@ -0,0 +1,24 @@
+
+cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# fragment {
+# ${METADIR}/meta-agl/templates/feature/agl-sota/50_setup.sh
+#
+EOF
+
+case ${MACHINE} in
+	"qemux86-64")
+	  echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-qemux86-64\"" >> ${BUILDDIR}/conf/bblayers.conf;;
+	*)
+	  echo "#No extra SOTA feature layer for MACHINE ${MACHINE}" >> ${BUILDDIR}/conf/bblayers.conf;;
+esac
+
+
+cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf
+
+#
+# }
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+EOF