SPEC-3723: restructure meta-agl-demo

All demo related components should be in here now.

We keep the packagegroups on purpose for now to stay backward-compatible.

v2: layer does pass yocto-check-layer, dependencies adapted
v3: remove the dynamic-layer setup, use all-in-one approach
v4: Fixed comments from Paul Barker. Tnx!
v5: Removed wayland/weston/agl-compositor additions, except for demo
    specific weston-init bbappend

Follow-up changes required later:
      - massaging packagegroups
      - scrub of recipes

Bug-AGL: SPEC-3723

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8

37 files changed, 0 insertions, 847 deletions

diff --git a/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb b/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb
deleted file mode 100644
index f73a97acb..000000000
--- a/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY     = "Demo voice capabilities template viewer for Alexa voiceagent"
-DESCRIPTION = "Demo voice capabilities template viewer for Alexa voiceagent"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/alexa-viewer"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = " \
-	qtquickcontrols2 \
-	qlibhomescreen \
-	af-binder \
-	libqtappfw \
-	wayland-native \
-	wayland \
-	qtwayland \
-	qtwayland-native \
-"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/alexa-viewer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-inherit cmake_qt5 aglwgt
-
-OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
-
-RDEPENDS_${PN} = " \
-	libqtappfw \
-	libafbwsc \
-	qlibhomescreen \
-	agl-service-voice-high-capabilities \
-"
diff --git a/recipes-demo-hmi/dashboard/dashboard_git.bb b/recipes-demo-hmi/dashboard/dashboard_git.bb
deleted file mode 100644
index 70a8793d2..000000000
--- a/recipes-demo-hmi/dashboard/dashboard_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY     = "Dashboard for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating dashboard on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/dashboard"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 qttools-native libqtappfw"
-
-inherit qmake5 aglwgt
-
-RDEPENDS_${PN} += " \
-	libqtappfw \
-	agl-service-signal-composer \
-"
diff --git a/recipes-demo-hmi/homescreen-demo-ci/homescreen-demo-ci_git.bb b/recipes-demo-hmi/homescreen-demo-ci/homescreen-demo-ci_git.bb
deleted file mode 100644
index c3814f114..000000000
--- a/recipes-demo-hmi/homescreen-demo-ci/homescreen-demo-ci_git.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY     = "homescreen-demo-ci AGL client shell for testing in CI"
-DESCRIPTION = "homescreen-demo-ci AGL client shell for testing in CI"
-HOMEPAGE    = "http://docs.automotivelinux.org"
-LICENSE     = "MIT"
-SECTION     = "apps"
-LIC_FILES_CHKSUM = "file://COPYING;md5=374fee6a7817f1e1a5a7bfb7b7989553"
-
-DEPENDS = "\
-        qtbase \
-        qtdeclarative \
-        qtquickcontrols2 \
-        agl-service-homescreen \
-        agl-service-weather \
-        libqtappfw \
-        libhomescreen \
-        libafb-helpers-qt \
-        wayland-native \
-        wayland \
-        qtwayland \
-        qtwayland-native \
-"
-
-inherit qmake5 systemd pkgconfig aglwgt
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen-demo-ci;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
-
-OE_QMAKE_CXXFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
-
-RDEPENDS_${PN} += " \
-        libqtappfw \
-"
diff --git a/recipes-demo-hmi/homescreen/homescreen_git.bb b/recipes-demo-hmi/homescreen/homescreen_git.bb
deleted file mode 100644
index bfdf06e72..000000000
--- a/recipes-demo-hmi/homescreen/homescreen_git.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY     = "AGL Home Screen Application"
-DESCRIPTION = "AGL Home Screen Application build with recipe method"
-HOMEPAGE    = "http://docs.automotivelinux.org"
-LICENSE     = "Apache-2.0"
-SECTION     = "apps"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "\
-        qtbase \
-        qtdeclarative \
-        qtquickcontrols2 \
-        agl-service-homescreen \
-        agl-service-weather \
-        libqtappfw \
-        libhomescreen \
-        libafb-helpers-qt \
-        wayland-native \
-        wayland \
-        qtwayland \
-        qtwayland-native \
-"
-
-inherit qmake5 systemd pkgconfig aglwgt
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
-
-OE_QMAKE_CXXFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
-
-RDEPENDS_${PN} += " \
-        libqtappfw \
-"
diff --git a/recipes-demo-hmi/html5-background/html5-background_git.bb b/recipes-demo-hmi/html5-background/html5-background_git.bb
deleted file mode 100644
index c0ac220f5..000000000
--- a/recipes-demo-hmi/html5-background/html5-background_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY     = "AGL HTML5 Background Application"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://github.com/AGL-web-applications/background.git;protocol=https;branch=master"
-SRCREV = "3b8dae349d428c0230b9885f86d421d43cda5638"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb b/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb
deleted file mode 100644
index ac874755e..000000000
--- a/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY     = "AGL HTML5 dashboard Application"
-HOMEPAGE    = "https://git.automotivelinux.org/apps/html5-dashboard/"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-dashboard;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb b/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb
deleted file mode 100644
index 37ca70737..000000000
--- a/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY     = "AGL HTML5 Homescreen Application"
-HOMEPAGE    = "https://git.automotivelinux.org/apps/html5-homescreen/"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-homescreen;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb b/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb
deleted file mode 100644
index 7fc89aed9..000000000
--- a/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY     = "AGL HTML5 HVAC Application"
-HOMEPAGE    = "https://git.automotivelinux.org/apps/html5-hvac/"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-hvac;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb b/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb
deleted file mode 100644
index 47760f676..000000000
--- a/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY     = "AGL HTML5 Launcher Application"
-HOMEPAGE    = "https://git.automotivelinux.org/apps/html5-launcher/"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-launcher;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb b/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb
deleted file mode 100644
index a87b9bcf4..000000000
--- a/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY     = "AGL HTML5 Mediaplayer Application"
-HOMEPAGE    = "https://git.automotivelinux.org/apps/html5-mediaplayer/"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mediaplayer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb b/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb
deleted file mode 100644
index 97b1195c8..000000000
--- a/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY     = "AGL HTML5 Mixer Application"
-HOMEPAGE    = "https://git.automotivelinux.org/apps/html5-mixer/"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mixer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/html5-settings/html5-settings_git.bb b/recipes-demo-hmi/html5-settings/html5-settings_git.bb
deleted file mode 100644
index a167b1428..000000000
--- a/recipes-demo-hmi/html5-settings/html5-settings_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY     = "AGL HTML5 Settings Application"
-HOMEPAGE    = "https://git.automotivelinux.org/apps/html5-settings/"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-settings;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-DEPENDS = "nodejs-native"
-
-inherit aglwgt
diff --git a/recipes-demo-hmi/hvac/hvac_git.bb b/recipes-demo-hmi/hvac/hvac_git.bb
deleted file mode 100644
index 5e36e2d41..000000000
--- a/recipes-demo-hmi/hvac/hvac_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY     = "HVAC for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating HVAC on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/hvac"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/hvac;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 libhomescreen \
-            qttools-native \
-            libqtappfw"
-
-RDEPENDS_${PN} = "agl-service-hvac libqtappfw"
-
-inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb b/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb
deleted file mode 100644
index 73da4878a..000000000
--- a/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY     = "AGL InputEventManager Application"
-DESCRIPTION = "InputEventManager"
-HOMEPAGE    = "http://docs.automotivelinux.org"
-LICENSE     = "Apache-2.0"
-SECTION     = "apps"
-S           = "${WORKDIR}/git/"
-
-inherit qmake5 systemd
-DEPENDS = " qtbase "
-
-LIC_FILES_CHKSUM = "file://inputeventmanager/LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/inputeventmanager.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "b2f1646ac78cf61acd66c643b7638bd1b007d5a0"
-# PV needs to be modified with SRCPV to work AUTOREV correctly
-PV = "0.0+git${SRCPV}"
-
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
-
-do_install() {
-    install -d ${D}/usr/AGL/${PN}
-    install -m 0755 ${B}/inputeventmanager/InputEventManager ${D}/usr/AGL/${PN}/
-    
-    install -d ${D}${systemd_user_unitdir}
-    install -m 0644 ${S}/inputeventmanager/conf/InputEventManager.service ${D}${systemd_user_unitdir}
-}
-
-FILES_${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}"
-FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug"
-
diff --git a/recipes-demo-hmi/launcher/launcher_git.bb b/recipes-demo-hmi/launcher/launcher_git.bb
deleted file mode 100644
index 5b1de0134..000000000
--- a/recipes-demo-hmi/launcher/launcher_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY     = "AGL Launcher Application"
-DESCRIPTION = "AGL Launcher Application build with recipe method"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/apps/launcher"
-SECTION     = "apps"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS = "\
-        qtbase \
-        qtdeclarative \
-        qtquickcontrols2 \
-        qtwebsockets \
-        qlibhomescreen \
-        wayland-native \
-        wayland \
-        qtwayland \
-        qtwayland-native \
-"
-
-inherit qmake5 systemd pkgconfig aglwgt
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/launcher;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV      = "1.0+git${SRCPV}"
-S       = "${WORKDIR}/git/"
-
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
diff --git a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
deleted file mode 100644
index 974b20275..000000000
--- a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY     = "Media Player for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating Media Player on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mediaplayer"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mediaplayer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            qtwebsockets \
-            libqtappfw \
-            libhomescreen \
-"
-
-inherit qmake5 aglwgt
-
-RDEPENDS_${PN} += "agl-service-mediaplayer libqtappfw"
diff --git a/recipes-demo-hmi/messaging/messaging_git.bb b/recipes-demo-hmi/messaging/messaging_git.bb
deleted file mode 100644
index d2e3ff80d..000000000
--- a/recipes-demo-hmi/messaging/messaging_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY     = "Messaging application for AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating messaging on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/messaging"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/messaging;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            libqtappfw \
-            libhomescreen \
-"
-
-inherit qmake5 aglwgt
-
-RDEPENDS_${PN} += "agl-service-bluetooth-map libqtappfw"
diff --git a/recipes-demo-hmi/mixer/mixer_git.bb b/recipes-demo-hmi/mixer/mixer_git.bb
deleted file mode 100644
index 1e4a2717c..000000000
--- a/recipes-demo-hmi/mixer/mixer_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY     = "Mixer for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI application for control of PipeWire mixer elements"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mixer"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            qtwebsockets \
-            libafb-helpers-qt \
-"
-
-RDEPENDS_${PN} += "agl-service-audiomixer"
-
-PROVIDES += "virtual/mixer"
-RPROVIDES_${PN} += "virtual/mixer"
-
-inherit cmake_qt5 aglwgt
-
-OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
diff --git a/recipes-demo-hmi/navigation/navigation-demo_git.bb b/recipes-demo-hmi/navigation/navigation-demo_git.bb
deleted file mode 100644
index 7f3fcdf10..000000000
--- a/recipes-demo-hmi/navigation/navigation-demo_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY     = "Navigation demo based on Qt examples"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/navigation"
-SECTION     = "apps"
-
-LICENSE     = "BSD-3-Clause & CC0v1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b6bbd37d85cd2b68082aa7be27853da1 \
-                    file://LICENSE.for_car_png;md5=65d3616852dbf7b1a6d4b53b00626032 \
-                   "
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/navigation;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-RPROVIDES_${PN} = "virtual/navigation"
-
-DEPENDS  += "qtquickcontrols2 \
-             libhomescreen \
-             qtvirtualkeyboard \
-             qtlocation \
-            "
-
-RDEPENDS_${PN} = " \
-             agl-service-gps \
-             agl-service-geoclue \
-             agl-service-geofence \
-             qtlocation \
-             qtvirtualkeyboard \
-            "
-
-inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/navigation/ondemandnavi-config/naviconfig.ini b/recipes-demo-hmi/navigation/ondemandnavi-config/naviconfig.ini
deleted file mode 100644
index 356c6ae61..000000000
--- a/recipes-demo-hmi/navigation/ondemandnavi-config/naviconfig.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"mapAccessToken":"MAPBOX_ACCESS_TOKEN",
-	"speed":60,
-	"interval":100,
-	"latitude":36.1363,
-	"longitude":-115.151,
-	"mapStyleUrls":"mapbox://styles/v1/mapbox/streets-v11",
-	"enableOSM":true
-}
diff --git a/recipes-demo-hmi/navigation/ondemandnavi-config_1.0.bb b/recipes-demo-hmi/navigation/ondemandnavi-config_1.0.bb
deleted file mode 100644
index 212971f26..000000000
--- a/recipes-demo-hmi/navigation/ondemandnavi-config_1.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY     = "AGL Reference On Demand Navigation application config."
-DESCRIPTION = "Config file for on-demand navigation app."
-HOMEPAGE    = "https://github.com/YoshitoMomiyama/aglqtnavigation.git"
-SECTION     = "apps"
-LICENSE     = "Proprietary"
-
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-SRC_URI = "file://naviconfig.ini \
-          "
-
-inherit allarch
-
-MAPBOX_ACCESS_TOKEN ?= "Please set mapbox access token"
-
-do_compile[noexec] = "1"
-
-do_install () {
-    install -D -m 644 ${WORKDIR}/naviconfig.ini ${D}${sysconfdir}/naviconfig.ini
-    sed -i -e 's/MAPBOX_ACCESS_TOKEN/${MAPBOX_ACCESS_TOKEN}/' ${D}${sysconfdir}/naviconfig.ini
-}
diff --git a/recipes-demo-hmi/navigation/ondemandnavi_git.bb b/recipes-demo-hmi/navigation/ondemandnavi_git.bb
deleted file mode 100644
index c06dcae22..000000000
--- a/recipes-demo-hmi/navigation/ondemandnavi_git.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY     = "AGL Reference On Demand Navigation application."
-DESCRIPTION = "Demo AGL navigation application based on QtLocation widget."
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/ondemandnavi"
-SECTION     = "apps"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS += "qtquickcontrols2 \
-            qlibhomescreen \
-            qtlocation \
-            libqtappfw \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-S = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt pkgconfig
-
-RDEPENDS_${PN} += "qtlocation \
-                   flite \
-                   libqtappfw \
-                   openjtalk \
-                   gstreamer1.0 \
-                   ondemandnavi-config \
-"
-
-RPROVIDES_${PN} = "virtual/navigation"
-
diff --git a/recipes-demo-hmi/navigation/poiapp-api-key_1.0.bb b/recipes-demo-hmi/navigation/poiapp-api-key_1.0.bb
deleted file mode 100644
index d353d7dd5..000000000
--- a/recipes-demo-hmi/navigation/poiapp-api-key_1.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "AGL Reference POI application API key."
-DESCRIPTION = "Preload the API key for the AGL POI application."
-HOMEPAGE = "https://github.com/AGLExport/genivi-navi-yelp-client"
-SECTION = "apps"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-inherit allarch
-
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_compile[noexec] = "1"
-
-POIAPP_CLIENT_ID ?= ""
-POIAPP_API_KEY ?= ""
-
-do_install () {
-    install -d ${D}${sysconfdir}
-    echo "${POIAPP_CLIENT_ID}" > ${D}${sysconfdir}/poikey
-    echo "${POIAPP_API_KEY}" >> ${D}${sysconfdir}/poikey
-}
diff --git a/recipes-demo-hmi/navigation/poiapp/0001-add-display-permission.patch b/recipes-demo-hmi/navigation/poiapp/0001-add-display-permission.patch
deleted file mode 100644
index 25a8fc313..000000000
--- a/recipes-demo-hmi/navigation/poiapp/0001-add-display-permission.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Add display permission
-
-Add display permission required to work with the running as non-root
-change for applications.
-
-Upstream-Status: pending
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
-diff --git a/config.xml.in b/config.xml.in
-index b8cfccd..bec206d 100755
---- a/config.xml.in
-+++ b/config.xml.in
-@@ -13,6 +13,7 @@
-   <feature name="urn:AGL:widget:required-permission">
-     <param name="urn:AGL:permission::public:no-htdocs" value="required" />
-     <param name="http://tizen.org/privilege/internal/dbus" value="required" />
-+    <param name="urn:AGL:permission::public:display" value="required" />
-   </feature>
-   <license>GPL</license>
- </widget>
diff --git a/recipes-demo-hmi/navigation/poiapp_git.bb b/recipes-demo-hmi/navigation/poiapp_git.bb
deleted file mode 100644
index 2942bf07c..000000000
--- a/recipes-demo-hmi/navigation/poiapp_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY     = "AGL Reference POI application."
-DESCRIPTION = "This application provides the function of destination search to AGL.  It uses the API provided by AGL Reference Navigation.  This application uses yelp WebAPI."
-HOMEPAGE    = "https://github.com/AGLExport/genivi-navi-yelp-client"
-SECTION     = "apps"
-
-LICENSE          = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4ee23c52855c222cba72583d301d2338"
-
-DEPENDS += "qtbase json-c \
-            libhomescreen \
-            libqtappfw \
-           "
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/poi-yelp;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-S = "${WORKDIR}/git"
-
-inherit cmake_qt5 pkgconfig aglwgt
-
-RDEPENDS_${PN} =  "qtbase libqtappfw"
diff --git a/recipes-demo-hmi/navigation/tbtnavi_git.bb b/recipes-demo-hmi/navigation/tbtnavi_git.bb
deleted file mode 100644
index d2e8e633e..000000000
--- a/recipes-demo-hmi/navigation/tbtnavi_git.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY     = "AGL Reference Navigation Cluster Streaming application"
-DESCRIPTION = "Demo AGL turn by turn cluster navigation application based on QtLocation widget."
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/admin/repos/apps/tbtnavi"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & ISC & BSD-3-Clause & BSL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
-                    file://LICENSE.mapbox-cheap-ruler-cpp;md5=761263ee6bdc98e8697d9fbc897021ba \
-                    file://LICENSE.mapbox-geometry.hpp;md5=6e44f5d6aeec54f40fc84eebe3c6fc6c \
-                    file://LICENSE.mapbox-variant;md5=79558839a9db3e807e4ae6f8cd100c1c \
-                    file://include/mapbox/recursive_wrapper.hpp;beginline=4;endline=13;md5=cd3341aae76c0cf8345935abd20f0051 \
-"
-
-DEPENDS += "qtbase \
-            qtquickcontrols2 \
-            qlibhomescreen \
-            qtlocation \
-            libqtappfw \
-            wayland-native \
-            qtwayland-native \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/tbtnavi;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-S = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt pkgconfig
-
-RDEPENDS_${PN} += "qtlocation \
-                   ondemandnavi-config \
-                   agl-service-navigation \
-                   libqtappfw \
-"
diff --git a/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb b/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb
deleted file mode 100644
index b0f63d162..000000000
--- a/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY     = "onscreenapp for displaying onscreen"
-DESCRIPTION = "AGL HMI Application for displaying onscreen"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/onscreenapp"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/onscreenapp;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 libhomescreen qlibhomescreen"
-
-inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/phone/phone_git.bb b/recipes-demo-hmi/phone/phone_git.bb
deleted file mode 100644
index a8781852d..000000000
--- a/recipes-demo-hmi/phone/phone_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY     = "Phone for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating phone on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/phone"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            libqtappfw \
-            libhomescreen \
-            gstreamer1.0 \
-"
-
-inherit qmake5 aglwgt
-
-RDEPENDS_${PN} += "agl-service-telephony agl-service-bluetooth-pbap libqtappfw"
diff --git a/recipes-demo-hmi/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb b/recipes-demo-hmi/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
deleted file mode 100644
index e9e8b2b37..000000000
--- a/recipes-demo-hmi/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY     = "AGL QtQuickControls2 style customizations"
-HOMEPAGE    = "https://git.automotivelinux.org/gerrit/#/admin/projects/src/qtquickcontrols2-agl-style"
-LICENSE     = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
-
-DEPENDS = "qtquickcontrols2"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtquickcontrols2-agl-style;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "c02692a3c20d9aed1192137a67d5be882c60e71f"
-
-S = "${WORKDIR}/git/"
-
-inherit qmake5
-
-FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtQuick/Controls.2/AGL/*"
-
-RDEPENDS_${PN} += " \
-	qtquickcontrols-qmlplugins \
-	qtquickcontrols2-qmlplugins \
-	qtsvg-plugins \
-"
-
-do_install_append_class-target() {
-    install -d ${D}/${sysconfdir}/afm/unit.env.d
-    echo "QT_QUICK_CONTROLS_STYLE=AGL" > ${D}${sysconfdir}/afm/unit.env.d/qtquickcontrols2-style
-}
diff --git a/recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb b/recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
deleted file mode 100644
index 0a432db0e..000000000
--- a/recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY     = "AGL demo custom QtQuickControls2 widgets"
-HOMEPAGE    = "https://git.automotivelinux.org/gerrit/#/admin/projects/src/qtquickcontrols2-agl"
-LICENSE     = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
-
-DEPENDS = "qtquickcontrols2"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtquickcontrols2-agl;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "22b538aae1f69de5273f1e42a854cfab23a32b60"
-
-S = "${WORKDIR}/git/"
-
-inherit qmake5
-
-FILES_${PN} += "${OE_QMAKE_PATH_QML}/AGL/Demo/Controls/*"
-
-RDEPENDS_${PN} += " \
-	qtquickcontrols-qmlplugins \
-	qtquickcontrols2-qmlplugins \
-	qtsvg-plugins \
-"
diff --git a/recipes-demo-hmi/radio/files/presets-ALS.conf b/recipes-demo-hmi/radio/files/presets-ALS.conf
deleted file mode 100644
index ff5592272..000000000
--- a/recipes-demo-hmi/radio/files/presets-ALS.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[fmPresets]
-1\frequency=76100000
-1\title=Inter FM
-2\frequency=77100000
-2\title=The Open University of Japan
-3\frequency=80000000
-3\title=TOKYO FM
-4\frequency=81300000
-4\title=J-WAVE
-5\frequency=82500000
-5\title=NHK FM Tokyo
-size=5
diff --git a/recipes-demo-hmi/radio/files/presets-CES.conf b/recipes-demo-hmi/radio/files/presets-CES.conf
deleted file mode 100644
index 83caeffe1..000000000
--- a/recipes-demo-hmi/radio/files/presets-CES.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[fmPresets]
-1\frequency=93100000
-1\title=93.1 The Mountain
-2\frequency=94100000
-2\title=Mix 94.1
-3\frequency=96300000
-3\title=96.3 KKLZ
-4\frequency=102700000
-4\title=102.7 THE COYOTE
-5\frequency=88900000
-5\title=News 88.9
-6\frequency=91500000
-6\title=KUNV
-size=6
diff --git a/recipes-demo-hmi/radio/files/presets-FOSDEM.conf b/recipes-demo-hmi/radio/files/presets-FOSDEM.conf
deleted file mode 100644
index b88364f72..000000000
--- a/recipes-demo-hmi/radio/files/presets-FOSDEM.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[fmPresets]
-1\frequency=92100000
-1\title=92.1 Radio Campus
-2\frequency=92500000
-2\title=92.5 RTBF La Première
-3\frequency=93200000
-3\title=93.2 RTBF Classic 21
-4\frequency=98800000
-4\title=98.8 FM Brussel
-5\frequency=103700000
-5\title=103.7 NRJ
-6\frequency=104000000
-6\title=104.0 Bel RTL
-size=6
diff --git a/recipes-demo-hmi/radio/radio_git.bb b/recipes-demo-hmi/radio/radio_git.bb
deleted file mode 100644
index 7b0934faa..000000000
--- a/recipes-demo-hmi/radio/radio_git.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY     = "Radio for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating Radio on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/radio"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & GPLv2+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=https;branch=${AGL_BRANCH} \
-           file://presets-ALS.conf \
-           file://presets-CES.conf \
-           file://presets-FOSDEM.conf \
-"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS = "qtquickcontrols2 rtl-sdr"
-DEPENDS += "libhomescreen libqtappfw"
-
-inherit qmake5 aglwgt
-
-# ALS, CES, FOSDEM available
-AGL_RADIO_PRESETS_LOCALE ?= "CES"
-do_install_append() {
-    install -d ${D}${sysconfdir}/xdg/AGL
-    install -m 0644 ${WORKDIR}/presets-CES.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-CES.conf
-    install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-ALS.conf
-    install -m 0644 ${WORKDIR}/presets-FOSDEM.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-FOSDEM.conf
-    install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}${sysconfdir}/xdg/AGL/radio-presets.conf
-}
-
-FILES_${PN} += "${sysconfdir}/xdg/AGL/*"
-
-RDEPENDS_${PN} += "agl-service-radio libqtappfw"
diff --git a/recipes-demo-hmi/settings/settings_git.bb b/recipes-demo-hmi/settings/settings_git.bb
deleted file mode 100644
index 776c764ca..000000000
--- a/recipes-demo-hmi/settings/settings_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY     = "Settings for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating Settings on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/settings"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/settings;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "libqtappfw qtquickcontrols2 qt-qrcode"
-DEPENDS += "libhomescreen qtvirtualkeyboard"
-
-# runtime dependencies
-RDEPENDS_${PN} += " \
-	qt-qrcode \
-	agl-service-bluetooth \
-	agl-service-network \
-	libqtappfw \
-"
-
-inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/taskmanager/taskmanager_git.bb b/recipes-demo-hmi/taskmanager/taskmanager_git.bb
deleted file mode 100644
index 68965eb55..000000000
--- a/recipes-demo-hmi/taskmanager/taskmanager_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY     = "Task Manager for AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating task visualisation and management on AGL Distribution"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/taskmanager"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/taskmanager;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            qtwebsockets \
-            qtcharts \
-            libqtappfw \
-            libhomescreen \
-"
-
-inherit qmake5 aglwgt
-
-RDEPENDS_${PN} += "agl-service-taskmanager libqtappfw"
diff --git a/recipes-demo-hmi/waltham-receiver/waltham-receiver_git.bb b/recipes-demo-hmi/waltham-receiver/waltham-receiver_git.bb
deleted file mode 100644
index d793b0669..000000000
--- a/recipes-demo-hmi/waltham-receiver/waltham-receiver_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY     = "Waltham-receiver"
-DESCRIPTION = "Waltham-receiver is a demo application for testing out Waltham"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/apps/waltham-receiver.git"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=374fee6a7817f1e1a5a7bfb7b7989553"
-
-SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/waltham-receiver.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "waltham wayland wayland-native \
-	    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
-
-inherit cmake pkgconfig aglwgt
-
-RDEPENDS_${PN} += " \
-	gstreamer1.0-plugins-base \
-	gstreamer1.0-plugins-good \
-	gstreamer1.0-plugins-bad \
-	waltham \
-"