Introduce meta-agl-profile-core and meta-agl-profile-graphics

Rework towards agl profiles.

This change is part of a series of changes to create the
AGL profiles.

This set will mainly introduce the 'core' profile.

It is setup to be a drop-in change, thus some files were kept
in (dummy) locations for now.
However, they'll be taken care of in the next changes in this series.

The main target of the meta-agl-profile-core layer is to host:
- a minimal, bootable image with network and package management enabled
  -- agl-image-boot
- a minimal image with network and packagemanagement and the AGL APIs
  -- agl-image-minimal

The layer meta-agl-profile-graphical is used as superset of these
and includes support for egl+wayland+weston. All recipes concerning
graphics were moved there. This is not a full profile as we still have
to migrate some parts of meta-agl-demo in a follow-up changeset.

The roadmap as discussed during the F2F session in Karlsruhe is:
- week 16 : core profile and profiles w/o graphics
- week 17 : graphical profiles
- week 18 : final conversion of the demo image

v2: moved agl-login-manager from -graphics to -core (see Jose's comment)
v3: moved back after discussion - follow-up in separate changeset

Change-Id: Idacb0d1274baac1f63f8d1b850d4b1104ac33918
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

236 files changed, 115 insertions, 216 deletions

diff --git a/meta-agl/classes/cloc.bbclass b/meta-agl-profile-core/classes/cloc.bbclass
index 53713bfc3..53713bfc3 100644
--- a/meta-agl/classes/cloc.bbclass
+++ b/meta-agl-profile-core/classes/cloc.bbclass
diff --git a/meta-agl/conf/include/agl-devel.inc b/meta-agl-profile-core/conf/include/agl-devel.inc
index fd11ade75..705b1739a 100644
--- a/meta-agl/conf/include/agl-devel.inc
+++ b/meta-agl-profile-core/conf/include/agl-devel.inc
@@ -1,8 +1,8 @@
 IMAGE_FEATURES =+ "debug-tweaks eclipse-debug tools-debug tools-profile"
 
-IMAGE_INSTALL_append = " \
-    packagegroup-agl-devel \
-"
+#IMAGE_INSTALL_append = " \
+#    packagegroup-agl-core-devel \
+#"
 
 IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'wic.vmdk', ' open-vm-tools vboxguestdrivers', '', d)}"
 
diff --git a/meta-agl/conf/include/agl-gplv2.inc b/meta-agl-profile-core/conf/include/agl-gplv2.inc
index fc9a4072b..fc9a4072b 100644
--- a/meta-agl/conf/include/agl-gplv2.inc
+++ b/meta-agl-profile-core/conf/include/agl-gplv2.inc
diff --git a/meta-agl/conf/include/base-agl.inc b/meta-agl-profile-core/conf/include/base-agl.inc
index a332c08a4..a332c08a4 100644
--- a/meta-agl/conf/include/base-agl.inc
+++ b/meta-agl-profile-core/conf/include/base-agl.inc
diff --git a/meta-ivi-common/conf/layer.conf b/meta-agl-profile-core/conf/layer.conf
index 42517232a..83c5555bc 100644
--- a/meta-ivi-common/conf/layer.conf
+++ b/meta-agl-profile-core/conf/layer.conf
@@ -5,6 +5,6 @@ BBPATH =. "${LAYERDIR}:"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "ivi-common"
-BBFILE_PATTERN_ivi-common = "^${LAYERDIR}/"
-BBFILE_PRIORITY_ivi-common = "70"
+BBFILE_COLLECTIONS += "aglprofilecore"
+BBFILE_PATTERN_aglprofilecore = "^${LAYERDIR}/"
+BBFILE_PRIORITY_aglprofilecore = "80"
diff --git a/meta-agl/files/group b/meta-agl-profile-core/files/group
index f8a3843bd..f8a3843bd 100644
--- a/meta-agl/files/group
+++ b/meta-agl-profile-core/files/group
diff --git a/meta-agl/files/passwd b/meta-agl-profile-core/files/passwd
index 754cb819a..754cb819a 100644
--- a/meta-agl/files/passwd
+++ b/meta-agl-profile-core/files/passwd
diff --git a/meta-agl/recipes-connectivity/connman/.appends.core b/meta-agl-profile-core/recipes-core/dbus/.appends.core
index e69de29bb..e69de29bb 100644
--- a/meta-agl/recipes-connectivity/connman/.appends.core
+++ b/meta-agl-profile-core/recipes-core/dbus/.appends.core
diff --git a/meta-agl/recipes-core/dbus/dbus-cynara_%.bbappend b/meta-agl-profile-core/recipes-core/dbus/dbus-cynara_%.bbappend
index fcdfb1783..fcdfb1783 120000
--- a/meta-agl/recipes-core/dbus/dbus-cynara_%.bbappend
+++ b/meta-agl-profile-core/recipes-core/dbus/dbus-cynara_%.bbappend
diff --git a/meta-agl/recipes-core/dbus/dbus/dbus.service b/meta-agl-profile-core/recipes-core/dbus/dbus/dbus.service
index dee6ad741..dee6ad741 100644
--- a/meta-agl/recipes-core/dbus/dbus/dbus.service
+++ b/meta-agl-profile-core/recipes-core/dbus/dbus/dbus.service
diff --git a/meta-agl/recipes-core/dbus/dbus/dbus.socket b/meta-agl-profile-core/recipes-core/dbus/dbus/dbus.socket
index af76b2f12..af76b2f12 100644
--- a/meta-agl/recipes-core/dbus/dbus/dbus.socket
+++ b/meta-agl-profile-core/recipes-core/dbus/dbus/dbus.socket
diff --git a/meta-agl/recipes-core/dbus/dbus/dbus_env.conf b/meta-agl-profile-core/recipes-core/dbus/dbus/dbus_env.conf
index f8f02669b..f8f02669b 100644
--- a/meta-agl/recipes-core/dbus/dbus/dbus_env.conf
+++ b/meta-agl-profile-core/recipes-core/dbus/dbus/dbus_env.conf
diff --git a/meta-agl/recipes-core/dbus/dbus_%.bbappend b/meta-agl-profile-core/recipes-core/dbus/dbus_%.bbappend
index e63ea0f28..e63ea0f28 100644
--- a/meta-agl/recipes-core/dbus/dbus_%.bbappend
+++ b/meta-agl-profile-core/recipes-core/dbus/dbus_%.bbappend
diff --git a/meta-agl/recipes-core/dbus/.appends.core b/meta-agl-profile-core/recipes-core/glibc/.appends.core
index e69de29bb..e69de29bb 100644
--- a/meta-agl/recipes-core/dbus/.appends.core
+++ b/meta-agl-profile-core/recipes-core/glibc/.appends.core
diff --git a/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff b/meta-agl-profile-core/recipes-core/glibc/glibc/arm/local-arm-futex.diff
index 27d1144d0..27d1144d0 100644
--- a/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff
+++ b/meta-agl-profile-core/recipes-core/glibc/glibc/arm/local-arm-futex.diff
diff --git a/meta-agl/recipes-core/glibc/glibc_2.2%.bbappend b/meta-agl-profile-core/recipes-core/glibc/glibc_2.2%.bbappend
index 0868a2c7d..0868a2c7d 100644
--- a/meta-agl/recipes-core/glibc/glibc_2.2%.bbappend
+++ b/meta-agl-profile-core/recipes-core/glibc/glibc_2.2%.bbappend
diff --git a/meta-agl-profile-core/recipes-core/images/agl-image-boot.bb b/meta-agl-profile-core/recipes-core/images/agl-image-boot.bb
new file mode 100644
index 000000000..84cdbcf31
--- /dev/null
+++ b/meta-agl-profile-core/recipes-core/images/agl-image-boot.bb
@@ -0,0 +1,9 @@
+SUMMARY = "An AGL small image just capable of allowing a device to boot."
+
+require agl-image-boot.inc
+
+LICENSE = "MIT"
+
+IMAGE_INSTALL_append = "\
+    packagegroup-agl-image-boot \
+    "
diff --git a/meta-agl/recipes-core/images/agl-image-minimal.inc b/meta-agl-profile-core/recipes-core/images/agl-image-boot.inc
index 825393978..825393978 100644
--- a/meta-agl/recipes-core/images/agl-image-minimal.inc
+++ b/meta-agl-profile-core/recipes-core/images/agl-image-boot.inc
diff --git a/meta-agl/recipes-core/images/agl-image-minimal-qa.bb b/meta-agl-profile-core/recipes-core/images/agl-image-minimal-qa.bb
index b162f2904..b162f2904 100644
--- a/meta-agl/recipes-core/images/agl-image-minimal-qa.bb
+++ b/meta-agl-profile-core/recipes-core/images/agl-image-minimal-qa.bb
diff --git a/meta-agl/recipes-core/images/agl-image-minimal.bb b/meta-agl-profile-core/recipes-core/images/agl-image-minimal.bb
index 1fd213d0f..1fd213d0f 100644
--- a/meta-agl/recipes-core/images/agl-image-minimal.bb
+++ b/meta-agl-profile-core/recipes-core/images/agl-image-minimal.bb
diff --git a/meta-agl-profile-core/recipes-core/images/agl-image-minimal.inc b/meta-agl-profile-core/recipes-core/images/agl-image-minimal.inc
new file mode 100644
index 000000000..825393978
--- /dev/null
+++ b/meta-agl-profile-core/recipes-core/images/agl-image-minimal.inc
@@ -0,0 +1,10 @@
+IMAGE_LINGUAS = " "
+
+inherit core-image
+
+IMAGE_INSTALL = "${CORE_IMAGE_EXTRA_INSTALL}"
+
+IMAGE_ROOTFS_SIZE ?= "8192"
+
+# Allow extra IMAGE_FSTYPES to be added by boards configs
+IMAGE_FSTYPES += "${AGL_EXTRA_IMAGE_FSTYPES}"
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb
index d9f2279e1..d9f2279e1 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb
index e909d5e5f..e909d5e5f 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb
index 1cc6f457b..1cc6f457b 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb
index 3d5556fd5..3d5556fd5 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb
index 01ca4cb85..01ca4cb85 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb
index 2b04d5387..2b04d5387 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb
index c44166e12..c44166e12 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-security.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb
index eb5a68f0a..eb5a68f0a 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-security.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb
index a494e5889..a494e5889 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb
diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb
new file mode 100644
index 000000000..29f859c49
--- /dev/null
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "The minimal set of packages required by AGL"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-agl-image-boot \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN} += "\
+    packagegroup-core-boot-agl \
+    "
+
+
+RDEPENDS_${PN} += "\
+    "
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb
index 630c11d43..630c11d43 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb
diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-core-boot-agl.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb
index c9d679879..c9d679879 100644
--- a/meta-agl/recipes-core/packagegroups/packagegroup-core-boot-agl.bb
+++ b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb
diff --git a/meta-agl/recipes-core/glibc/.appends.core b/meta-agl-profile-core/recipes-core/psplash/.appends.core
index e69de29bb..e69de29bb 100644
--- a/meta-agl/recipes-core/glibc/.appends.core
+++ b/meta-agl-profile-core/recipes-core/psplash/.appends.core
diff --git a/meta-agl/recipes-core/psplash/files/psplash-anim b/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim
index ac9bf674a..ac9bf674a 100755
--- a/meta-agl/recipes-core/psplash/files/psplash-anim
+++ b/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim
diff --git a/meta-agl/recipes-core/psplash/files/psplash-colors.h b/meta-agl-profile-core/recipes-core/psplash/files/psplash-colors.h
index 447490397..447490397 100644
--- a/meta-agl/recipes-core/psplash/files/psplash-colors.h
+++ b/meta-agl-profile-core/recipes-core/psplash/files/psplash-colors.h
diff --git a/meta-agl/recipes-core/psplash/files/psplash-poky-img.h b/meta-agl-profile-core/recipes-core/psplash/files/psplash-poky-img.h
index c0e8b0818..c0e8b0818 100644
--- a/meta-agl/recipes-core/psplash/files/psplash-poky-img.h
+++ b/meta-agl-profile-core/recipes-core/psplash/files/psplash-poky-img.h
diff --git a/meta-agl/recipes-core/psplash/files/psplash-quit.service b/meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service
index 14bd4994b..14bd4994b 100644
--- a/meta-agl/recipes-core/psplash/files/psplash-quit.service
+++ b/meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service
diff --git a/meta-agl/recipes-core/psplash/files/psplash-start.service b/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service
index d3b6940d0..d3b6940d0 100644
--- a/meta-agl/recipes-core/psplash/files/psplash-start.service
+++ b/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service
diff --git a/meta-agl/recipes-core/psplash/psplash_git.bbappend b/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend
index bdc196b6f..bdc196b6f 100644
--- a/meta-agl/recipes-core/psplash/psplash_git.bbappend
+++ b/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend
diff --git a/meta-agl/recipes-core/psplash/.appends.core b/meta-agl-profile-core/recipes-core/systemd/.appends.core
index e69de29bb..e69de29bb 100644
--- a/meta-agl/recipes-core/psplash/.appends.core
+++ b/meta-agl-profile-core/recipes-core/systemd/.appends.core
diff --git a/meta-agl/recipes-core/systemd/systemd/0001-Switch-Smack-label-earlier.patch b/meta-agl-profile-core/recipes-core/systemd/systemd/0001-Switch-Smack-label-earlier.patch
index 46445be73..46445be73 100644
--- a/meta-agl/recipes-core/systemd/systemd/0001-Switch-Smack-label-earlier.patch
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd/0001-Switch-Smack-label-earlier.patch
diff --git a/meta-agl/recipes-core/systemd/systemd/e2fsck.conf b/meta-agl-profile-core/recipes-core/systemd/systemd/e2fsck.conf
index b774f9ebf..b774f9ebf 100644
--- a/meta-agl/recipes-core/systemd/systemd/e2fsck.conf
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd/e2fsck.conf
diff --git a/meta-agl/recipes-core/systemd/systemd/wired.network b/meta-agl-profile-core/recipes-core/systemd/systemd/wired.network
index 3559b0155..3559b0155 100644
--- a/meta-agl/recipes-core/systemd/systemd/wired.network
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd/wired.network
diff --git a/meta-agl/recipes-core/systemd/systemd_%.bbappend b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
index f64ca8c8a..f64ca8c8a 100644
--- a/meta-agl/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
diff --git a/meta-agl/recipes-core/systemd/systemd_234.bbappend b/meta-agl-profile-core/recipes-core/systemd/systemd_234.bbappend
index 4df7684d0..4df7684d0 100644
--- a/meta-agl/recipes-core/systemd/systemd_234.bbappend
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd_234.bbappend
diff --git a/meta-agl/recipes-devtools/gdb/gdb_%.bbappend b/meta-agl-profile-core/recipes-devtools/gdb/gdb_%.bbappend
index 7cba933af..7cba933af 100644
--- a/meta-agl/recipes-devtools/gdb/gdb_%.bbappend
+++ b/meta-agl-profile-core/recipes-devtools/gdb/gdb_%.bbappend
diff --git a/meta-agl/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb b/meta-agl-profile-core/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb
index d364939b5..d364939b5 100644
--- a/meta-agl/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb
+++ b/meta-agl-profile-core/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb
diff --git a/meta-agl/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-agl-profile-core/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
index 504a019b4..504a019b4 100644
--- a/meta-agl/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
+++ b/meta-agl-profile-core/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
diff --git a/meta-agl/recipes-devtools/packagegroups/packagegroup-agl-devel.bb b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-devel.bb
index ade8560ab..ade8560ab 100644
--- a/meta-agl/recipes-devtools/packagegroups/packagegroup-agl-devel.bb
+++ b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-devel.bb
diff --git a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts b/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts
index 1d1a5a059..1d1a5a059 100755
--- a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts
+++ b/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts
diff --git a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service b/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
index 8f8667db6..8f8667db6 100644
--- a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
+++ b/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
diff --git a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb b/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
index b1ecccf85..b1ecccf85 100644
--- a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
+++ b/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
diff --git a/meta-agl/recipes-devtools/run-postinsts/run-postinsts_%.bbappend b/meta-agl-profile-core/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
index fc327b6ef..fc327b6ef 100644
--- a/meta-agl/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
+++ b/meta-agl-profile-core/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi-crosssdk.bb b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-crosssdk.bb
index 0303d051d..0303d051d 100644
--- a/meta-agl/recipes-ivi/images/agl-image-ivi-crosssdk.bb
+++ b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-crosssdk.bb
diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi-qa.bb b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-qa.bb
index 017439454..017439454 100644
--- a/meta-agl/recipes-ivi/images/agl-image-ivi-qa.bb
+++ b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-qa.bb
diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi.bb b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.bb
index dd4f89b15..dd4f89b15 100644
--- a/meta-agl/recipes-ivi/images/agl-image-ivi.bb
+++ b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.bb
diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi.inc b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.inc
index 0b564840b..0b564840b 100644
--- a/meta-agl/recipes-ivi/images/agl-image-ivi.inc
+++ b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.inc
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb
index 27e90f808..075af913a 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb
@@ -12,7 +12,6 @@ ALLOW_EMPTY_${PN} = "1"
 
 RDEPENDS_${PN} += "\
     packagegroup-agl-image-minimal \
-    packagegroup-ivi-common-core \
 "
 
 RDEPENDS_${PN} += "\
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb
index f7221517f..f7221517f 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb
index 664180d55..664180d55 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb
index d7650564b..d7650564b 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb
index be51817b7..be51817b7 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb
index 11536405e..11536405e 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb
index b7f47eecc..b7f47eecc 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb
index 0a9de8d5f..0a9de8d5f 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb
index f651c50cd..f651c50cd 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb
diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb
index eccebee9f..eccebee9f 100644
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb
+++ b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb
diff --git a/meta-agl/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend b/meta-agl-profile-core/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend
index 86a181fbb..86a181fbb 100644
--- a/meta-agl/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend
+++ b/meta-agl-profile-core/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/.appends.meta-efl b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/.appends.meta-efl
index e69de29bb..e69de29bb 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/.appends.meta-efl
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/.appends.meta-efl
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch
index 15d4b3f0e..15d4b3f0e 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/files/dbus-lightmediascanner.conf b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/dbus-lightmediascanner.conf
index 9cb321ba9..9cb321ba9 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/files/dbus-lightmediascanner.conf
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/dbus-lightmediascanner.conf
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch
index 9528bec79..9528bec79 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/files/lightmediascanner.service b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/lightmediascanner.service
index 33cf27ed0..33cf27ed0 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/files/lightmediascanner.service
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/lightmediascanner.service
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/files/plugin-ogg-fix-chucksize-issue.patch b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/plugin-ogg-fix-chucksize-issue.patch
index 6a0b8ff93..6a0b8ff93 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/files/plugin-ogg-fix-chucksize-issue.patch
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/plugin-ogg-fix-chucksize-issue.patch
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend
index cf248d3fd..cf248d3fd 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend
diff --git a/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb
index f2158760f..f2158760f 100644
--- a/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb
+++ b/meta-agl-profile-core/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb
diff --git a/meta-agl/recipes-multimedia/pulseaudio/agl-audio-plugin_0.1.bb b/meta-agl-profile-core/recipes-multimedia/pulseaudio/agl-audio-plugin_0.1.bb
index 633a3e248..633a3e248 100644
--- a/meta-agl/recipes-multimedia/pulseaudio/agl-audio-plugin_0.1.bb
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/agl-audio-plugin_0.1.bb
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-install-files-for-a-module-development.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-install-files-for-a-module-development.patch
index 8c5f9efd4..8c5f9efd4 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-install-files-for-a-module-development.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-install-files-for-a-module-development.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch
index 9cee6f5de..9cee6f5de 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch
index eb485ca7c..eb485ca7c 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch
index 64d7b141d..64d7b141d 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch
index e371b7ec5..e371b7ec5 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch
index 50110bd14..50110bd14 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/enable-ofono-hfp-backend.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/enable-ofono-hfp-backend.patch
index 85b1ae03d..85b1ae03d 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/enable-ofono-hfp-backend.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/enable-ofono-hfp-backend.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0008-install-files-for-a-module-development.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0008-install-files-for-a-module-development.patch
index ac164d643..ac164d643 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0008-install-files-for-a-module-development.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0008-install-files-for-a-module-development.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0010-volume-ramp-additions-to-the-low-level-infra.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0010-volume-ramp-additions-to-the-low-level-infra.patch
index e249bc438..e249bc438 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0010-volume-ramp-additions-to-the-low-level-infra.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0010-volume-ramp-additions-to-the-low-level-infra.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0011-volume-ramp-adding-volume-ramping-to-sink-input.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0011-volume-ramp-adding-volume-ramping-to-sink-input.patch
index 08fb79248..08fb79248 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0011-volume-ramp-adding-volume-ramping-to-sink-input.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0011-volume-ramp-adding-volume-ramping-to-sink-input.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0012-volume-ramp-add-volume-ramping-to-sink.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0012-volume-ramp-add-volume-ramping-to-sink.patch
index 43e8283ef..43e8283ef 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0012-volume-ramp-add-volume-ramping-to-sink.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0012-volume-ramp-add-volume-ramping-to-sink.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0013-add-internal-corking-state-for-sink-input.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0013-add-internal-corking-state-for-sink-input.patch
index cb68e26af..cb68e26af 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0013-add-internal-corking-state-for-sink-input.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0013-add-internal-corking-state-for-sink-input.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0020-core-util-Add-pa_join.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0020-core-util-Add-pa_join.patch
index 891a5b83a..891a5b83a 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0020-core-util-Add-pa_join.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0020-core-util-Add-pa_join.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0021-dynarray-Add-pa_dynarray_get_raw_array.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0021-dynarray-Add-pa_dynarray_get_raw_array.patch
index 040913c8f..040913c8f 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0021-dynarray-Add-pa_dynarray_get_raw_array.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0021-dynarray-Add-pa_dynarray_get_raw_array.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0022-device-port-Add-pa_device_port.active.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0022-device-port-Add-pa_device_port.active.patch
index 4a8143f61..4a8143f61 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0022-device-port-Add-pa_device_port.active.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0022-device-port-Add-pa_device_port.active.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0030-volume-api-Add-libvolume-api.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0030-volume-api-Add-libvolume-api.patch
index b904ac315..b904ac315 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0030-volume-api-Add-libvolume-api.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0030-volume-api-Add-libvolume-api.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0031-Add-module-main-volume-policy.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0031-Add-module-main-volume-policy.patch
index 216ed21e9..216ed21e9 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0031-Add-module-main-volume-policy.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0031-Add-module-main-volume-policy.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0039-main-volume-policy-adapt-to-pa6rev.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0039-main-volume-policy-adapt-to-pa6rev.patch
index 4f2777112..4f2777112 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio/0039-main-volume-policy-adapt-to-pa6rev.patch
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/0039-main-volume-policy-adapt-to-pa6rev.patch
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index a54ec60f1..a54ec60f1 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend
index f59ee89d5..f59ee89d5 100644
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend
diff --git a/meta-agl/recipes-navigation/geoclue/files/org.freedesktop.GeoClue2.Client.conf b/meta-agl-profile-core/recipes-navigation/geoclue/files/org.freedesktop.GeoClue2.Client.conf
index a7486d055..a7486d055 100644
--- a/meta-agl/recipes-navigation/geoclue/files/org.freedesktop.GeoClue2.Client.conf
+++ b/meta-agl-profile-core/recipes-navigation/geoclue/files/org.freedesktop.GeoClue2.Client.conf
diff --git a/meta-agl/recipes-navigation/geoclue/geoclue_%.bbappend b/meta-agl-profile-core/recipes-navigation/geoclue/geoclue_%.bbappend
index 9d61a9f61..9d61a9f61 100644
--- a/meta-agl/recipes-navigation/geoclue/geoclue_%.bbappend
+++ b/meta-agl-profile-core/recipes-navigation/geoclue/geoclue_%.bbappend
diff --git a/meta-agl/recipes-navigation/gpsd/gpsd_%.bbappend b/meta-agl-profile-core/recipes-navigation/gpsd/gpsd_%.bbappend
index af72aece9..af72aece9 100644
--- a/meta-agl/recipes-navigation/gpsd/gpsd_%.bbappend
+++ b/meta-agl-profile-core/recipes-navigation/gpsd/gpsd_%.bbappend
diff --git a/meta-agl/recipes-support/libsoup/libsoup-2.4_%.bbappend b/meta-agl-profile-core/recipes-support/libsoup/libsoup-2.4_%.bbappend
index 06651fc11..06651fc11 100644
--- a/meta-agl/recipes-support/libsoup/libsoup-2.4_%.bbappend
+++ b/meta-agl-profile-core/recipes-support/libsoup/libsoup-2.4_%.bbappend
diff --git a/meta-ivi-common/recipes-test/aiostress/aiostress_0.22.bb b/meta-agl-profile-core/recipes-test/aiostress/aiostress_0.22.bb
index 7803d74ed..7803d74ed 100644
--- a/meta-ivi-common/recipes-test/aiostress/aiostress_0.22.bb
+++ b/meta-agl-profile-core/recipes-test/aiostress/aiostress_0.22.bb
diff --git a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0001-Makefile.patch b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0001-Makefile.patch
index 0ae56cee1..0ae56cee1 100755..100644
--- a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0001-Makefile.patch
+++ b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0001-Makefile.patch
diff --git a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0002-auto.patch b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0002-auto.patch
index b61da2c1f..b61da2c1f 100755..100644
--- a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0002-auto.patch
+++ b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0002-auto.patch
diff --git a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0003-printcleanup.patch b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0003-printcleanup.patch
index 630871dfd..630871dfd 100755..100644
--- a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0003-printcleanup.patch
+++ b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0003-printcleanup.patch
diff --git a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0004-bs_main.c.patch b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0004-bs_main.c.patch
index ae15408de..ae15408de 100755..100644
--- a/meta-ivi-common/recipes-test/blobsallad/blobsallad/0004-bs_main.c.patch
+++ b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad/0004-bs_main.c.patch
diff --git a/meta-ivi-common/recipes-test/blobsallad/blobsallad_2006-11-14-23-57.bb b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad_2006-11-14-23-57.bb
index 373d4ddc6..373d4ddc6 100644
--- a/meta-ivi-common/recipes-test/blobsallad/blobsallad_2006-11-14-23-57.bb
+++ b/meta-agl-profile-core/recipes-test/blobsallad/blobsallad_2006-11-14-23-57.bb
diff --git a/meta-ivi-common/recipes-test/dung/dung_3.4.25-m2.bb b/meta-agl-profile-core/recipes-test/dung/dung_3.4.25-m2.bb
index 28bf858a0..28bf858a0 100644
--- a/meta-ivi-common/recipes-test/dung/dung_3.4.25-m2.bb
+++ b/meta-agl-profile-core/recipes-test/dung/dung_3.4.25-m2.bb
diff --git a/meta-ivi-common/recipes-test/ebizzy/ebizzy_0.3.bb b/meta-agl-profile-core/recipes-test/ebizzy/ebizzy_0.3.bb
index 08b0425c0..08b0425c0 100644
--- a/meta-ivi-common/recipes-test/ebizzy/ebizzy_0.3.bb
+++ b/meta-agl-profile-core/recipes-test/ebizzy/ebizzy_0.3.bb
diff --git a/meta-ivi-common/recipes-test/ffsb/ffsb_6.0-rc2.bb b/meta-agl-profile-core/recipes-test/ffsb/ffsb_6.0-rc2.bb
index 66db133e3..66db133e3 100644
--- a/meta-ivi-common/recipes-test/ffsb/ffsb_6.0-rc2.bb
+++ b/meta-agl-profile-core/recipes-test/ffsb/ffsb_6.0-rc2.bb
diff --git a/meta-ivi-common/recipes-test/fontconfig/fontconfig_%.bbappend b/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
index c4bebdc1f..c4bebdc1f 100644
--- a/meta-ivi-common/recipes-test/fontconfig/fontconfig_%.bbappend
+++ b/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
diff --git a/meta-ivi-common/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch b/meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch
index 1f3acf28e..1f3acf28e 100644
--- a/meta-ivi-common/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch
+++ b/meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch
diff --git a/meta-ivi-common/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch b/meta-agl-profile-core/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch
index 7803ad7e0..7803ad7e0 100644
--- a/meta-ivi-common/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch
+++ b/meta-agl-profile-core/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch
diff --git a/meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend b/meta-agl-profile-core/recipes-test/freetype/freetype_2.8.bbappend
index 282ce784a..282ce784a 100644
--- a/meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend
+++ b/meta-agl-profile-core/recipes-test/freetype/freetype_2.8.bbappend
diff --git a/meta-ivi-common/recipes-test/fsfuzzer/files/0001-fix_missing_header_sys_stat.patch b/meta-agl-profile-core/recipes-test/fsfuzzer/files/0001-fix_missing_header_sys_stat.patch
index e834becf3..e834becf3 100644
--- a/meta-ivi-common/recipes-test/fsfuzzer/files/0001-fix_missing_header_sys_stat.patch
+++ b/meta-agl-profile-core/recipes-test/fsfuzzer/files/0001-fix_missing_header_sys_stat.patch
diff --git a/meta-ivi-common/recipes-test/fsfuzzer/fsfuzzer_0.7.bb b/meta-agl-profile-core/recipes-test/fsfuzzer/fsfuzzer_0.7.bb
index d2ddb59b1..d2ddb59b1 100644
--- a/meta-ivi-common/recipes-test/fsfuzzer/fsfuzzer_0.7.bb
+++ b/meta-agl-profile-core/recipes-test/fsfuzzer/fsfuzzer_0.7.bb
diff --git a/meta-ivi-common/recipes-test/glmark2/glmark2_%.bbappend b/meta-agl-profile-core/recipes-test/glmark2/glmark2_%.bbappend
index a64e0506c..a64e0506c 100644
--- a/meta-ivi-common/recipes-test/glmark2/glmark2_%.bbappend
+++ b/meta-agl-profile-core/recipes-test/glmark2/glmark2_%.bbappend
diff --git a/meta-ivi-common/recipes-test/himeno/himeno_2.0.bb b/meta-agl-profile-core/recipes-test/himeno/himeno_2.0.bb
index f890e23a4..f890e23a4 100644
--- a/meta-ivi-common/recipes-test/himeno/himeno_2.0.bb
+++ b/meta-agl-profile-core/recipes-test/himeno/himeno_2.0.bb
diff --git a/meta-ivi-common/recipes-test/interbench/files/interbench.c.patch b/meta-agl-profile-core/recipes-test/interbench/files/interbench.c.patch
index c882739ba..c882739ba 100755..100644
--- a/meta-ivi-common/recipes-test/interbench/files/interbench.c.patch
+++ b/meta-agl-profile-core/recipes-test/interbench/files/interbench.c.patch
diff --git a/meta-ivi-common/recipes-test/interbench/interbench_0.31.bb b/meta-agl-profile-core/recipes-test/interbench/interbench_0.31.bb
index 3e6490374..3e6490374 100644
--- a/meta-ivi-common/recipes-test/interbench/interbench_0.31.bb
+++ b/meta-agl-profile-core/recipes-test/interbench/interbench_0.31.bb
diff --git a/meta-ivi-common/recipes-test/iperf/iperf-2.0.9/0001-fix-out-of-tree-config.patch b/meta-agl-profile-core/recipes-test/iperf/iperf-2.0.9/0001-fix-out-of-tree-config.patch
index e8a029790..e8a029790 100644
--- a/meta-ivi-common/recipes-test/iperf/iperf-2.0.9/0001-fix-out-of-tree-config.patch
+++ b/meta-agl-profile-core/recipes-test/iperf/iperf-2.0.9/0001-fix-out-of-tree-config.patch
diff --git a/meta-ivi-common/recipes-test/iperf/iperf-2.0.9/0002-fix-bool-size-m4.patch b/meta-agl-profile-core/recipes-test/iperf/iperf-2.0.9/0002-fix-bool-size-m4.patch
index 348e316ce..348e316ce 100644
--- a/meta-ivi-common/recipes-test/iperf/iperf-2.0.9/0002-fix-bool-size-m4.patch
+++ b/meta-agl-profile-core/recipes-test/iperf/iperf-2.0.9/0002-fix-bool-size-m4.patch
diff --git a/meta-ivi-common/recipes-test/iperf/iperf-2.0.9/iperf-2.0.5_ManPage.patch b/meta-agl-profile-core/recipes-test/iperf/iperf-2.0.9/iperf-2.0.5_ManPage.patch
index 12e8f4631..12e8f4631 100755..100644
--- a/meta-ivi-common/recipes-test/iperf/iperf-2.0.9/iperf-2.0.5_ManPage.patch
+++ b/meta-agl-profile-core/recipes-test/iperf/iperf-2.0.9/iperf-2.0.5_ManPage.patch
diff --git a/meta-ivi-common/recipes-test/iperf/iperf_2.0.9.bb b/meta-agl-profile-core/recipes-test/iperf/iperf_2.0.9.bb
index f297f7f7f..f297f7f7f 100644
--- a/meta-ivi-common/recipes-test/iperf/iperf_2.0.9.bb
+++ b/meta-agl-profile-core/recipes-test/iperf/iperf_2.0.9.bb
diff --git a/meta-ivi-common/recipes-test/ipv6connect/ipv6connect.bb b/meta-agl-profile-core/recipes-test/ipv6connect/ipv6connect.bb
index a8b93716a..a8b93716a 100644
--- a/meta-ivi-common/recipes-test/ipv6connect/ipv6connect.bb
+++ b/meta-agl-profile-core/recipes-test/ipv6connect/ipv6connect.bb
diff --git a/meta-ivi-common/recipes-test/linpack/linpack.bb b/meta-agl-profile-core/recipes-test/linpack/linpack.bb
index 84bed0ff6..84bed0ff6 100644
--- a/meta-ivi-common/recipes-test/linpack/linpack.bb
+++ b/meta-agl-profile-core/recipes-test/linpack/linpack.bb
diff --git a/meta-ivi-common/recipes-test/linus-stress/linus-stress.bb b/meta-agl-profile-core/recipes-test/linus-stress/linus-stress.bb
index 01b3cfce5..01b3cfce5 100644
--- a/meta-ivi-common/recipes-test/linus-stress/linus-stress.bb
+++ b/meta-agl-profile-core/recipes-test/linus-stress/linus-stress.bb
diff --git a/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb b/meta-agl-profile-core/recipes-test/packagegroups/packagegroup-agl-test.bb
index 84a951bce..1c3412e84 100644
--- a/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb
+++ b/meta-agl-profile-core/recipes-test/packagegroups/packagegroup-agl-test.bb
@@ -6,8 +6,9 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
+    packagegroup-agl-test \
+    packagegroup-agl-test-ltp \
     packagegroup-ivi-common-test \
-    packagegroup-ivi-common-test-ltp \
     "
 
 ALLOW_EMPTY_${PN} = "1"
@@ -25,9 +26,7 @@ RDEPENDS_${PN} += "\
     linpack \
     linus-stress \
     lmbench \
-    ltp \
     nbench-byte \
-    packagegroup-ivi-common-test-ltp \
     rt-tests \
     stress \
     "
@@ -39,13 +38,20 @@ RDEPENDS_${PN} += "\
 # FTBS, SPEC-1384
 #    trinity
 
+#    packagegroup-agl-test-ltp \
+#    ltp \
+#
 
 # Packages for shell commands which are required by LTP
 #   readelf, logrotate, vsftpd, crontab, sar, arp, ftp,
 #   host, rcp, rlogin, rsh, tcpdump, expect, iptables, dnsmasq,
 #   pgrep
-RDEPENDS_packagegroup-ivi-common-test-ltp += " \
+RDEPENDS_packagegroup-agl-test-ltp += " \
     initscripts-functions bind-utils binutils \
     cronie dnsmasq expect inetutils-ftp inetutils-rsh \
     iptables logrotate net-tools sysstat tcpdump vsftpd \
     "
+
+RDEPENDS_packagegroup-ivi-common-test = " \
+    packagegroup-agl-test \
+    "
diff --git a/meta-ivi-common/recipes-test/trinity/trinity_git.bb b/meta-agl-profile-core/recipes-test/trinity/trinity_git.bb
index f0f09a855..f0f09a855 100644
--- a/meta-ivi-common/recipes-test/trinity/trinity_git.bb
+++ b/meta-agl-profile-core/recipes-test/trinity/trinity_git.bb
diff --git a/meta-agl-profile-demo/conf/layer.conf b/meta-agl-profile-demo/conf/layer.conf
new file mode 100644
index 000000000..bf7347e58
--- /dev/null
+++ b/meta-agl-profile-demo/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH =. "${LAYERDIR}:"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "aglprofiledemo"
+BBFILE_PATTERN_aglprofiledemo = "^${LAYERDIR}/"
+BBFILE_PRIORITY_aglprofiledemo = "70"
diff --git a/meta-agl/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/meta-agl-profile-demo/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
index 6379ec38f..6379ec38f 100644
--- a/meta-agl/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
+++ b/meta-agl-profile-demo/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
diff --git a/meta-agl/recipes-connectivity/bluez-alsa/files/bluez-alsa.service b/meta-agl-profile-demo/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
index 671815e03..671815e03 100644
--- a/meta-agl/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
+++ b/meta-agl-profile-demo/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
diff --git a/meta-agl/recipes-connectivity/bluez5/bluez5/bluetooth.conf b/meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5/bluetooth.conf
index 1f2762de7..1f2762de7 100644
--- a/meta-agl/recipes-connectivity/bluez5/bluez5/bluetooth.conf
+++ b/meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5/bluetooth.conf
diff --git a/meta-agl/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5_%.bbappend
index ffb9d5b53..ffb9d5b53 100644
--- a/meta-agl/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5_%.bbappend
diff --git a/meta-agl/recipes-connectivity/busybox/busybox_%.bbappend b/meta-agl-profile-demo/recipes-connectivity/busybox/busybox_%.bbappend
index 198b651dd..198b651dd 100644
--- a/meta-agl/recipes-connectivity/busybox/busybox_%.bbappend
+++ b/meta-agl-profile-demo/recipes-connectivity/busybox/busybox_%.bbappend
diff --git a/meta-agl/recipes-connectivity/busybox/files/enable-wget-https.cfg b/meta-agl-profile-demo/recipes-connectivity/busybox/files/enable-wget-https.cfg
index e92006bef..e92006bef 100644
--- a/meta-agl/recipes-connectivity/busybox/files/enable-wget-https.cfg
+++ b/meta-agl-profile-demo/recipes-connectivity/busybox/files/enable-wget-https.cfg
diff --git a/meta-agl/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb b/meta-agl-profile-demo/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb
index 02afef75f..02afef75f 100644
--- a/meta-agl/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb
+++ b/meta-agl-profile-demo/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb
diff --git a/meta-agl/recipes-core/systemd/.appends.core b/meta-agl-profile-demo/recipes-connectivity/connman/.appends.core
index e69de29bb..e69de29bb 100644
--- a/meta-agl/recipes-core/systemd/.appends.core
+++ b/meta-agl-profile-demo/recipes-connectivity/connman/.appends.core
diff --git a/meta-agl/recipes-connectivity/connman/connman_%.bbappend b/meta-agl-profile-demo/recipes-connectivity/connman/connman_%.bbappend
index e41cbe954..e41cbe954 100644
--- a/meta-agl/recipes-connectivity/connman/connman_%.bbappend
+++ b/meta-agl-profile-demo/recipes-connectivity/connman/connman_%.bbappend
diff --git a/meta-agl/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch b/meta-agl-profile-demo/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
index 95fc0a905..95fc0a905 100644
--- a/meta-agl/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
+++ b/meta-agl-profile-demo/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
diff --git a/meta-agl/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch b/meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch
index 86b7392df..86b7392df 100644
--- a/meta-agl/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch
+++ b/meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch
diff --git a/meta-agl/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb b/meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb
index 7d5c0217d..7d5c0217d 100644
--- a/meta-agl/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb
+++ b/meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb
diff --git a/meta-agl/recipes-connectivity/rygel/.appends.meta-multimedia b/meta-agl-profile-demo/recipes-connectivity/rygel/.appends.meta-multimedia
index e69de29bb..e69de29bb 100644
--- a/meta-agl/recipes-connectivity/rygel/.appends.meta-multimedia
+++ b/meta-agl-profile-demo/recipes-connectivity/rygel/.appends.meta-multimedia
diff --git a/meta-agl/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch b/meta-agl-profile-demo/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch
index 57b97a6ca..57b97a6ca 100644
--- a/meta-agl/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch
+++ b/meta-agl-profile-demo/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch
diff --git a/meta-agl/recipes-connectivity/rygel/files/rygel.service b/meta-agl-profile-demo/recipes-connectivity/rygel/files/rygel.service
index fb94d7160..fb94d7160 100644
--- a/meta-agl/recipes-connectivity/rygel/files/rygel.service
+++ b/meta-agl-profile-demo/recipes-connectivity/rygel/files/rygel.service
diff --git a/meta-agl/recipes-connectivity/rygel/rygel_%.bbappend b/meta-agl-profile-demo/recipes-connectivity/rygel/rygel_%.bbappend
index 4ae59259f..4ae59259f 100644
--- a/meta-agl/recipes-connectivity/rygel/rygel_%.bbappend
+++ b/meta-agl-profile-demo/recipes-connectivity/rygel/rygel_%.bbappend
diff --git a/meta-agl-profile-demo/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb b/meta-agl-profile-demo/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb
new file mode 100644
index 000000000..abe6786f2
--- /dev/null
+++ b/meta-agl-profile-demo/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "The minimal set of packages for Multimedia Subsystem"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-ivi-common-core-multimedia \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN} += "\
+    "
diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch
index 5bf6bf88e..5bf6bf88e 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch
+++ b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch
diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
index 168847990..168847990 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
+++ b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch
index 691a50027..691a50027 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch
+++ b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch
diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch
index 685dfcddc..685dfcddc 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch
+++ b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch
diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
index b521bca91..b521bca91 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
+++ b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb
index dbc87c9ac..dbc87c9ac 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb
+++ b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb
diff --git a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch
index fcdf9c540..fcdf9c540 100644
--- a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch
+++ b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch
diff --git a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager/audiomanager.service b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/audiomanager.service
index 2210a377b..2210a377b 100644
--- a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager/audiomanager.service
+++ b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/audiomanager.service
diff --git a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager_7.4.bb
index 15eb36252..15eb36252 100644
--- a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager_7.4.bb
+++ b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager_7.4.bb
diff --git a/meta-agl/classes/agl-graphical.bbclass b/meta-agl-profile-graphical/classes/agl-graphical.bbclass
index 0004d9c1a..0004d9c1a 100644
--- a/meta-agl/classes/agl-graphical.bbclass
+++ b/meta-agl-profile-graphical/classes/agl-graphical.bbclass
diff --git a/meta-agl-profile-graphical/conf/layer.conf b/meta-agl-profile-graphical/conf/layer.conf
new file mode 100644
index 000000000..4b0b8cb9b
--- /dev/null
+++ b/meta-agl-profile-graphical/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH =. "${LAYERDIR}:"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "aglprofilegraphical"
+BBFILE_PATTERN_aglprofilegraphical = "^${LAYERDIR}/"
+BBFILE_PRIORITY_aglprofilegraphical = "70"
diff --git a/meta-agl/recipes-config/agl-login-manager/agl-login-manager_0.1.bb b/meta-agl-profile-graphical/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
index cd6dc6792..cd6dc6792 100644
--- a/meta-agl/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
+++ b/meta-agl-profile-graphical/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
diff --git a/meta-agl/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb
index e0358d615..e0358d615 100644
--- a/meta-agl/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb
diff --git a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.path b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.path
index 9481840e5..9481840e5 100644
--- a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.path
+++ b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.path
diff --git a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.service b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.service
index ad8b9583b..ad8b9583b 100644
--- a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.service
+++ b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.service
diff --git a/meta-agl/recipes-graphics/images/agl-image-weston.bb b/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb
index 427132ed6..427132ed6 100644
--- a/meta-agl/recipes-graphics/images/agl-image-weston.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb
diff --git a/meta-agl/recipes-graphics/images/agl-image-weston.inc b/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc
index 947d22b50..947d22b50 100644
--- a/meta-agl/recipes-graphics/images/agl-image-weston.inc
+++ b/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc
diff --git a/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb b/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb
index dcf21bcfb..dcf21bcfb 100644
--- a/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb
diff --git a/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf b/meta-agl-profile-graphical/recipes-graphics/wayland/Readme.weston-ini-conf
index bbd5a80c4..bbd5a80c4 100644
--- a/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/Readme.weston-ini-conf
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch
index 636ecf1b9..636ecf1b9 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch
index 9e95167ed..9e95167ed 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch
index f44786a36..f44786a36 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch
index d2d027256..d2d027256 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch
index df5d616fd..df5d616fd 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch
index 86b448be1..86b448be1 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb
index 68e92adb5..68e92adb5 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb
index ea74e384c..ea74e384c 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb
diff --git a/meta-agl/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch
index b04127b57..b04127b57 100644
--- a/meta-agl/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch
diff --git a/meta-agl/recipes-graphics/wayland/wayland_%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland_%.bbappend
index 9d1822697..7a1a6c6c1 100644
--- a/meta-agl/recipes-graphics/wayland/wayland_%.bbappend
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland_%.bbappend
@@ -3,3 +3,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append = "\
     file://0001-Change-socket-mode-add-rw-for-group.patch \
     "
+EXTRA_OECONF_append = " --enable-ivi-shell"
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bb
index 4628f96f8..4628f96f8 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bb
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/core.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/core.cfg
index a0ec1e181..a0ec1e181 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/core.cfg
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/core.cfg
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg
index dffc2b6dd..dffc2b6dd 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg
index 88a692a1b..88a692a1b 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg
index 726fca5f1..726fca5f1 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg
index f0548f291..f0548f291 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/shell.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/shell.cfg
index 056770427..056770427 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/shell.cfg
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/shell.cfg
diff --git a/meta-agl/recipes-graphics/wayland/weston-init.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend
index 1ca63b5de..1ca63b5de 100644
--- a/meta-agl/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend
diff --git a/meta-agl/recipes-graphics/wayland/weston-init/weston.service.add b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add
index 3596e9c39..3596e9c39 100644
--- a/meta-agl/recipes-graphics/wayland/weston-init/weston.service.add
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add
diff --git a/meta-agl/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf
index c4b302faf..c4b302faf 100644
--- a/meta-agl/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf
diff --git a/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston_2.0.0.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston_2.0.0.patch
index bd1a72b0f..bd1a72b0f 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston_2.0.0.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston_2.0.0.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch
index 449b7a0fd..449b7a0fd 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0002-ivi-shell-removed-assert.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-ivi-shell-removed-assert.patch
index 4507e769c..4507e769c 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0002-ivi-shell-removed-assert.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-ivi-shell-removed-assert.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0003-ivi-shell-introduction-of-IVI_INVALID_ID.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0003-ivi-shell-introduction-of-IVI_INVALID_ID.patch
index 6f683ca92..6f683ca92 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0003-ivi-shell-introduction-of-IVI_INVALID_ID.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0003-ivi-shell-introduction-of-IVI_INVALID_ID.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0004-layout-interface-added-interface-to-change-surface-id.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-layout-interface-added-interface-to-change-surface-id.patch
index 6401c5b81..6401c5b81 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0004-layout-interface-added-interface-to-change-surface-id.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-layout-interface-added-interface-to-change-surface-id.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0005-ivi-layout-introcuded-configure_desktop_changed.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0005-ivi-layout-introcuded-configure_desktop_changed.patch
index ddd949e35..ddd949e35 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0005-ivi-layout-introcuded-configure_desktop_changed.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0005-ivi-layout-introcuded-configure_desktop_changed.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0006-ivi-layout-introcuded-surface_create_and_configure.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0006-ivi-layout-introcuded-surface_create_and_configure.patch
index 04461a1d4..04461a1d4 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0006-ivi-layout-introcuded-surface_create_and_configure.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0006-ivi-layout-introcuded-surface_create_and_configure.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0007-ivi-shell-linked-libweston-desktop-and-added-structs.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0007-ivi-shell-linked-libweston-desktop-and-added-structs.patch
index 9286ba00b..9286ba00b 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0007-ivi-shell-linked-libweston-desktop-and-added-structs.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0007-ivi-shell-linked-libweston-desktop-and-added-structs.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0008-ivi-layout-use-libweston-desktop-api-for-views.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0008-ivi-layout-use-libweston-desktop-api-for-views.patch
index e53a8c458..e53a8c458 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0008-ivi-layout-use-libweston-desktop-api-for-views.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0008-ivi-layout-use-libweston-desktop-api-for-views.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0009-ivi-shell-added-libweston-desktop-api_implementation.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0009-ivi-shell-added-libweston-desktop-api_implementation.patch
index 6a72f15d8..6a72f15d8 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0009-ivi-shell-added-libweston-desktop-api_implementation.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0009-ivi-shell-added-libweston-desktop-api_implementation.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0010-ivi-shell-remove-surface_destroy_listener.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0010-ivi-shell-remove-surface_destroy_listener.patch
index b76c35d4f..b76c35d4f 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0010-ivi-shell-remove-surface_destroy_listener.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0010-ivi-shell-remove-surface_destroy_listener.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch
index 551e449ad..551e449ad 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0012-hmi-controller-register-for-desktop_surface_configured.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0012-hmi-controller-register-for-desktop_surface_configured.patch
index c5d85bb17..c5d85bb17 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0012-hmi-controller-register-for-desktop_surface_configured.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0012-hmi-controller-register-for-desktop_surface_configured.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0013-simple-egl-remove-ivi-application-support.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0013-simple-egl-remove-ivi-application-support.patch
index 8094f9b85..8094f9b85 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0013-simple-egl-remove-ivi-application-support.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0013-simple-egl-remove-ivi-application-support.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0014-simple-shm-remove-ivi-application-support.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0014-simple-shm-remove-ivi-application-support.patch
index 495e50ca2..495e50ca2 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0014-simple-shm-remove-ivi-application-support.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0014-simple-shm-remove-ivi-application-support.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0015-window-client-remove-ivi-application-support.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0015-window-client-remove-ivi-application-support.patch
index f3d2fe47f..f3d2fe47f 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0015-window-client-remove-ivi-application-support.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0015-window-client-remove-ivi-application-support.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston/0016-ivi-shell_add_screen_remove_layer_api.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0016-ivi-shell_add_screen_remove_layer_api.patch
index 3e85e93f6..3e85e93f6 100644
--- a/meta-agl/recipes-graphics/wayland/weston/0016-ivi-shell_add_screen_remove_layer_api.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0016-ivi-shell_add_screen_remove_layer_api.patch
diff --git a/meta-agl/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_2.0.0.bbappend
index f6f88a6d6..f6f88a6d6 100644
--- a/meta-agl/recipes-graphics/wayland/weston_2.0.0.bbappend
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_2.0.0.bbappend
diff --git a/meta-agl/classes/.gitkeep b/meta-agl/classes/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-agl/classes/.gitkeep
+++ /dev/null
diff --git a/meta-agl/recipes-automotive/.gitkeep b/meta-agl/recipes-automotive/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-agl/recipes-automotive/.gitkeep
+++ /dev/null
diff --git a/meta-agl/recipes-bsp/.gitkeep b/meta-agl/recipes-bsp/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-agl/recipes-bsp/.gitkeep
+++ /dev/null
diff --git a/meta-agl/recipes-navi-lbs/.gitkeep b/meta-agl/recipes-navi-lbs/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-agl/recipes-navi-lbs/.gitkeep
+++ /dev/null
diff --git a/meta-agl/recipes-support/.gitkeep b/meta-agl/recipes-support/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-agl/recipes-support/.gitkeep
+++ /dev/null
diff --git a/meta-agl/recipes-test/packagegroups/packagegroup-agl-test.bb b/meta-agl/recipes-test/packagegroups/packagegroup-agl-test.bb
deleted file mode 100644
index 2a18cbc89..000000000
--- a/meta-agl/recipes-test/packagegroups/packagegroup-agl-test.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Utilities for testing of AGL"
-DESCRIPTION = "A set of packages required by testing AGL for Quality Assurance"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-test \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    "
diff --git a/meta-ivi-common/classes/.gitkeep b/meta-ivi-common/classes/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-ivi-common/classes/.gitkeep
+++ /dev/null
diff --git a/meta-ivi-common/recipes-connectivity/.gitkeep b/meta-ivi-common/recipes-connectivity/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-ivi-common/recipes-connectivity/.gitkeep
+++ /dev/null
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-automotive.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-automotive.bb
deleted file mode 100644
index e63333157..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-automotive.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Automotive Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-automotive \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += " "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-connectivity.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-connectivity.bb
deleted file mode 100644
index 2453c3cb0..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-connectivity.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Connectivity Subsystem "
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-connectivity \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb
deleted file mode 100644
index c474b9fc5..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Graphics Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-graphics \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    weston weston-init weston-ini-conf weston-examples \
-    wayland-ivi-extension \
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-kernel.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-kernel.bb
deleted file mode 100644
index 14e5f4347..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-kernel.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Kernel Subysystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-kernel \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb
deleted file mode 100644
index 602d247b4..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Multimedia Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-multimedia \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , 'agl-audio-plugin', d)} \
-    alsa-utils \
-    pulseaudio-server \
-    pulseaudio-misc \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '\
-        pulseaudio-module-bluetooth-discover \
-        pulseaudio-module-bluetooth-policy \
-        pulseaudio-module-bluez5-discover \
-        pulseaudio-module-bluez5-device \
-        pulseaudio-module-switch-on-connect \
-        pulseaudio-module-loopback \
-        ','', d)} \
-    gstreamer1.0-meta-base \
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-navi-lbs.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-navi-lbs.bb
deleted file mode 100644
index 63c27348c..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-navi-lbs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Navigation and Location Based Services Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-navi-lbs \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-os-commonlibs.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-os-commonlibs.bb
deleted file mode 100644
index 99a3abd31..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-os-commonlibs.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Operating System and Common libraries Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-os-commonlibs \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    procps \
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-security.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-security.bb
deleted file mode 100644
index b7c15399b..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-security.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Security Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-security \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-speech-services.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-speech-services.bb
deleted file mode 100644
index 72105ee3a..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-speech-services.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of common packages required by Speech Services Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core-speech-services \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core.bb
deleted file mode 100644
index b3cff10a6..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of packagegroups which contain common packages required by AGL Distribution"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common-core \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    packagegroup-ivi-common-core-automotive \
-    packagegroup-ivi-common-core-connectivity \
-    packagegroup-ivi-common-core-graphics \
-    packagegroup-ivi-common-core-multimedia \
-    packagegroup-ivi-common-core-navi-lbs \
-    packagegroup-ivi-common-core-os-commonlibs \
-    packagegroup-ivi-common-core-speech-services \
-    packagegroup-ivi-common-core-security \
-    packagegroup-ivi-common-core-kernel \
-    "
diff --git a/meta-ivi-common/recipes-devtools/.gitkeep b/meta-ivi-common/recipes-devtools/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-ivi-common/recipes-devtools/.gitkeep
+++ /dev/null
diff --git a/meta-ivi-common/recipes-extended/.gitkeep b/meta-ivi-common/recipes-extended/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-ivi-common/recipes-extended/.gitkeep
+++ /dev/null
diff --git a/meta-ivi-common/recipes-graphics/.gitkeep b/meta-ivi-common/recipes-graphics/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-ivi-common/recipes-graphics/.gitkeep
+++ /dev/null
diff --git a/meta-ivi-common/recipes-graphics/wayland/weston_%.bbappend b/meta-ivi-common/recipes-graphics/wayland/weston_%.bbappend
deleted file mode 100644
index 226126378..000000000
--- a/meta-ivi-common/recipes-graphics/wayland/weston_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_OECONF_append = " --enable-ivi-shell"
diff --git a/meta-ivi-common/recipes-support/.gitkeep b/meta-ivi-common/recipes-support/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-ivi-common/recipes-support/.gitkeep
+++ /dev/null
diff --git a/templates/base/00_local.conf.agl.inc b/templates/base/00_local.conf.agl.inc
index 1cfd90557..30fc68f7d 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
+
+#see meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc
+require conf/include/agl-appfw-smack.inc
diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index d86954698..0c3114f8c 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -24,12 +24,19 @@ YOCTO_LAYERS = " \
 #   with some automotive tools/libraries
 #-----------------------------------------------------
 AGL_CORE_LAYERS = " \
-  ${METADIR}/meta-agl/meta-ivi-common \
-  ${METADIR}/meta-agl/meta-agl \
+  ${METADIR}/meta-agl/meta-agl-profile-core \
   ${METADIR}/meta-agl/meta-agl-distro \
   ${METADIR}/meta-agl/meta-agl-bsp \
   "
 
+AGL_APPFW_LAYERS = " \
+  ${METADIR}/meta-security \
+  ${METADIR}/meta-openembedded/meta-perl \
+  ${METADIR}/meta-agl/meta-security \
+  ${METADIR}/meta-agl/meta-app-framework \
+    "
+
+
 # These are the direct dependencies of the AGL CORE Layers
 #---------------------------------------------------------
 AGL_CORE_DEPENDENCY_LAYERS = " \
@@ -40,18 +47,29 @@ AGL_CORE_DEPENDENCY_LAYERS = " \
   ${METADIR}/meta-openembedded/meta-filesystems \
   "
 
+# temporary ... to avoid build breakage. To move to upper layers.
+AGL_TEMP_GFX_LAYERS = " \
+  ${METADIR}/meta-agl/meta-agl-profile-graphical \
+  ${METADIR}/meta-agl/meta-agl-profile-demo \
+  "
+
+
 ####################
 # Combine the layers
 BBLAYERS ?= " \
   ${AGL_CORE_DEPENDENCY_LAYERS} \
   ${AGL_CORE_LAYERS} \
+  ${AGL_APPFW_LAYERS} \
+  ${AGL_TEMP_GFX_LAYERS} \
   ${YOCTO_LAYERS} \
   "
 
 BBLAYERS_NON_REMOVABLE ?= " \
   ${METADIR}/poky/meta \
   ${METADIR}/poky/meta-poky \
-  ${METADIR}//meta-agl/meta-agl \
+  ${METADIR}/meta-agl/meta-agl-profile-core \
+  ${METADIR}/meta-agl/meta-agl-distro \
   "
 
 
+
diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
deleted file mode 100644
index 7f5f24eb5..000000000
--- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-BBLAYERS =+ " \
-        ${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-appfw-smack/50_local.conf.inc b/templates/feature/agl-appfw-smack/50_local.conf.inc
index 0a11f07c2..e69de29bb 100644
--- a/templates/feature/agl-appfw-smack/50_local.conf.inc
+++ b/templates/feature/agl-appfw-smack/50_local.conf.inc
@@ -1,2 +0,0 @@
-#see meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc
-require conf/include/agl-appfw-smack.inc
diff --git a/templates/feature/agl-ci-change-features-nogfx/included.dep b/templates/feature/agl-ci-change-features-nogfx/included.dep
index 49f5dd12d..56b4cd1a9 100644
--- a/templates/feature/agl-ci-change-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-change-features-nogfx/included.dep
@@ -1 +1 @@
-agl-devel agl-netboot agl-appfw-smack
\ No newline at end of file
+agl-devel agl-netboot
\ No newline at end of file
diff --git a/templates/feature/agl-ci-change-features/included.dep b/templates/feature/agl-ci-change-features/included.dep
index fdd01e6a8..280452454 100644
--- a/templates/feature/agl-ci-change-features/included.dep
+++ b/templates/feature/agl-ci-change-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-appfw-smack
+agl-demo agl-devel agl-netboot
diff --git a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
index 00e77831a..c2e48284f 100644
--- a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
@@ -1 +1 @@
-agl-devel agl-netboot agl-appfw-smack agl-archiver
+agl-devel agl-netboot agl-archiver
diff --git a/templates/feature/agl-ci-snapshot-features/included.dep b/templates/feature/agl-ci-snapshot-features/included.dep
index 219beeec4..c382e609c 100644
--- a/templates/feature/agl-ci-snapshot-features/included.dep
+++ b/templates/feature/agl-ci-snapshot-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-appfw-smack agl-archiver
+agl-demo agl-devel agl-netboot agl-archiver