Prepare master for new framework integration

During the last workshop the transition to the new framework was presented.
This change essentially deprecates the SMACK-based application framework.

To prepare the integration of it, we remove the deprecated components:
- recipes-apis : all agl-service-*
- recipes-demos: all demo apps but homescreen
- non-essential configurations

Todo:
We need to bring-back the html5 image in a follow-up w/o ties into the old framework.

v2: kept WAM + Chromium recipes for reference
v3: rebased

Bug-AGL: SPEC-4121

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I58075f5f1e477106a1aad3d2171a0904bf0cb16e

44 files changed, 13 insertions, 1063 deletions

diff --git a/recipes-demo/alexa-viewer/alexa-viewer_git.bb b/recipes-demo/alexa-viewer/alexa-viewer_git.bb
deleted file mode 100644
index d8af6888c..000000000
--- a/recipes-demo/alexa-viewer/alexa-viewer_git.bb
+++ /dev/null
@@ -1,38 +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 \
-    agl-compositor \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/alexa-viewer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-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-homescreen \
-    agl-service-voice-high-capabilities \
-"
diff --git a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb b/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
deleted file mode 100644
index 4fe09e913..000000000
--- a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY     = "Camera gstreamer demo application"
-DESCRIPTION = "AGL demonstration of displaying incoming camera feed"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/camera-gstreamer"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = " \
-    wayland wayland-native \
-    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/camera-gstreamer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit cmake pkgconfig aglwgt
-
-RDEPENDS:${PN} += " \
-    gstreamer1.0-plugins-base \
-    gstreamer1.0-plugins-good \
-    gstreamer1.0-plugins-bad \
-"
diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
deleted file mode 100644
index 480d1f22d..000000000
--- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY     = "Instrument Cluster Dashboard application"
-DESCRIPTION = "AGL demonstration instrument cluster dashboard application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-cluster-demo-dashboard"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
-                    file://app/cluster-gauges.qml;beginline=9;endline=48;md5=54187d50b29429abee6095fe8b7c1a78"
-
-DEPENDS = " \
-    qtquickcontrols2 libqtappfw glib-2.0 \
-    wayland-native wayland qtwayland qtwayland-native \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-dashboard;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit pkgconfig cmake_qt5 aglwgt
-
-RDEPENDS:${PN} += " \
-    qtquickcontrols \
-    qtquickcontrols-qmlplugins \
-    qtquickcontrols2 \
-    qtquickcontrols2-qmlplugins \
-    libqtappfw \
-    agl-service-signal-composer \
-"
diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
deleted file mode 100644
index 8b5b62093..000000000
--- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY     = "Minimal cluster demo gauges that can be used standalone"
-DESCRIPTION = "AGL HMI Application for demonstrating instrument cluster gauges as a wayland compositor"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-cluster-demo-gauges"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
-                    file://app/cluster-gauges.qml;beginline=10;endline=49;md5=54187d50b29429abee6095fe8b7c1a78"
-
-DEPENDS = "qtquickcontrols2 qtwebsockets"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-gauges;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit pkgconfig cmake_qt5 aglwgt
-
-RDEPENDS:${PN} += " \
-    qtquickcontrols \
-    qtquickcontrols-qmlplugins \
-    qtquickcontrols2 \
-    qtquickcontrols2-qmlplugins \
-    qtwebsockets \
-    qtwebsockets-qmlplugins \
-    kms-conf \
-"
diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb
deleted file mode 100644
index 7028d5fc1..000000000
--- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY     = "Instrument Cluster Receiver application"
-DESCRIPTION = "AGL demonstration instrument cluster remote display application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-cluster-demo-receiver"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=374fee6a7817f1e1a5a7bfb7b7989553"
-
-DEPENDS = " \
-    wayland wayland-native \
-    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad agl-compositor \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit cmake pkgconfig aglwgt
-
-RDEPENDS:${PN} += " \
-    gstreamer1.0-plugins-base \
-    gstreamer1.0-plugins-good \
-    gstreamer1.0-plugins-bad \
-"
diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
deleted file mode 100644
index 80f8edbb0..000000000
--- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY     = "Instrument Cluster Receiver AGL Demonstration"
-DESCRIPTION = "AGL HMI Application for demonstrating instrument cluster remote display"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/admin/repos/apps/agl-qt-cluster-demo-receiver"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
-                    file://app/surface.hpp;beginline=5;endline=21;md5=5351c531a191f0e3463aafcd0a6a00a3"
-
-DEPENDS = " \
-    wayland wayland-native \
-    qtwayland qtwayland-native \
-    qtquickcontrols2 qtwebsockets qtbase qtdeclarative \
-    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-qt-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit cmake_qt5 pkgconfig aglwgt
-
-RDEPENDS:${PN} += " \
-    gstreamer1.0-plugins-base \
-    gstreamer1.0-plugins-good \
-    gstreamer1.0-plugins-bad \
-"
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json b/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json
deleted file mode 100644
index 90180dcaf..000000000
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "areas": [
-        {
-            "name": "fullscreen",
-            "rect": {
-                "x": 0,
-                "y": 0,
-                "w": 1920,
-                "h": 1080
-            }
-        },
-        {
-            "name": "normal.full",
-            "rect": {
-                "x": 640,
-                "y": 180,
-                "w": 640,
-                "h": 720
-            }
-        },
-        {
-            "name": "restriction.normal",
-            "rect": {
-                "x": 640,
-                "y": 180,
-                "w": 640,
-                "h": 720
-            }
-        },
-        {
-            "name": "on_screen",
-            "rect": {
-                "x": 640,
-                "y": 180,
-                "w": 640,
-                "h": 720
-            }
-        }
-    ]
-}
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json b/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json
deleted file mode 100644
index 5c6a5b35d..000000000
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "description": "Layer mapping",
-    "mappings": [
-        {
-            "name": "BackGroundLayer",
-            "role" : "receiver",
-            "id_range_begin": 0,
-            "id_range_end": 0,
-            "comment": "Work Around: This is a special fallback layer that not stopping wayland event loop."
-        },
-        {
-            "name": "FarHomeScreen",
-            "role": "homescreen",
-            "id_range_begin": 100,
-            "id_range_end": 199,
-            "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen"
-        },
-        {
-            "name": "Apps",
-            "role": "receiver|fallback",
-            "id_range_begin": 1000,
-            "id_range_end": 2999,
-            "comment": "Application layer"
-        },
-        {
-            "name": "Popup",
-            "role": "popup*",
-            "id_range_begin": 4000,
-            "id_range_end": 4999,
-            "comment": "This layer is for popup application layer"
-        },
-        {
-            "name": "Restriction",
-            "role": "restriction",
-            "id_range_begin": 5000,
-            "id_range_end": 5999,
-            "comment": "This layer is for restriction notification on driving. This is used by restriction role"
-        },
-        {
-            "name": "OnScreen",
-            "role": "^on_screen.*",
-            "id_range_begin": 6000,
-            "id_range_end": 6999,
-            "comment": "System notification layer. For example, on_screen_low_battery_alert to notify user"
-        }
-    ]
-}
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/roles.db b/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/roles.db
deleted file mode 100644
index 13702144a..000000000
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/roles.db
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "roles":[
-    {
-        "category": "homescreen",
-        "role": "homescreen",
-        "area": "fullscreen",
-        "layer": "homescreen",
-    },
-    {
-        "category": "debug",
-        "role": "receiver | fallback",
-        "area": "normal.full",
-        "layer": "apps",
-    },
-    {
-        "category": "restriction",
-        "role": "restriction",
-        "area": "restriction.normal",
-        "layer": "restriction",
-    },
-    {
-        "category": "pop_up",
-        "role": "on_screen | on_screen_phone",
-        "area": "on_screen",
-        "layer": "on_screen",
-    },
-    {
-        "category": "system_alert",
-        "role": "system_alert",
-        "area": "on_screen",
-        "layer": "on_screen",
-    }
-    ]
-}
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb b/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
deleted file mode 100644
index f8cf9b928..000000000
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Cluster demo windowmanager configuration"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "file://layers.json \
-           file://areas.json \
-           file://roles.db \
-"
-
-do_compile[noexec] = "1"
-
-do_install() {
-    install -d ${D}${sysconfdir}/xdg/windowmanager
-    install -m 0644 ${WORKDIR}/layers.json ${D}${sysconfdir}/xdg/windowmanager/layers.json
-    install -m 0644 ${WORKDIR}/areas.json ${D}${sysconfdir}/xdg/windowmanager/areas.json
-    install -m 0644 ${WORKDIR}/roles.db ${D}${sysconfdir}/xdg/windowmanager/roles.db
-}
-
-#FILES:${PN} += "${sysconfdir}/*"
diff --git a/recipes-demo/dashboard/dashboard_git.bb b/recipes-demo/dashboard/dashboard_git.bb
deleted file mode 100644
index 22f5b73ec..000000000
--- a/recipes-demo/dashboard/dashboard_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY     = "Dashboard application"
-DESCRIPTION = "AGL demonstration Dashboard application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/dashboard"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "qtquickcontrols2 qttools-native libqtappfw"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
-
-RDEPENDS:${PN} += " \
-    libqtappfw \
-    agl-service-signal-composer \
-"
diff --git a/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb b/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb
deleted file mode 100644
index d33356999..000000000
--- a/recipes-demo/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/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb
index bf8034b91..b53519e9a 100644
--- a/recipes-demo/homescreen/homescreen_git.bb
+++ b/recipes-demo/homescreen/homescreen_git.bb
@@ -4,40 +4,38 @@ HOMEPAGE    = "http://docs.automotivelinux.org"
 LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
+#LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 DEPENDS = " \
     qtbase \
     qtdeclarative \
     qtquickcontrols2 \
-    libqtappfw \
-    libhomescreen \
-    libafb-helpers-qt \
     wayland-native \
     wayland \
     qtwayland \
     qtwayland-native \
     agl-compositor \
+    json-c \
+    qtwebsockets \
 "
 
 PV      = "1.0+git${SRCPV}"
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;nobranch=1"
+SRCREV  = "09b5eb1b42910e84612a37a0fb44629c73eee3e7"
 
 S       = "${WORKDIR}/git"
 
-inherit qmake5 systemd pkgconfig aglwgt
+inherit qmake5 systemd pkgconfig
 
 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 \
-    agl-service-audiomixer \
-    agl-service-bluetooth \
-    agl-service-homescreen \
-    agl-service-network \
-    agl-service-weather \
-    agl-service-voice-high \
-"
+
+do_install:append() {
+
+    install -d ${D}/${bindir}
+    install -m 0644 ${B}/homescreen/HomeScreen ${D}/${bindir}/homescreen
+
+}
\ No newline at end of file
diff --git a/recipes-demo/html5-background/html5-background_git.bb b/recipes-demo/html5-background/html5-background_git.bb
deleted file mode 100644
index 4be560709..000000000
--- a/recipes-demo/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/html5-dashboard/html5-dashboard_git.bb b/recipes-demo/html5-dashboard/html5-dashboard_git.bb
deleted file mode 100644
index 7f375670b..000000000
--- a/recipes-demo/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/html5-homescreen/html5-homescreen_git.bb b/recipes-demo/html5-homescreen/html5-homescreen_git.bb
deleted file mode 100644
index f927cb70b..000000000
--- a/recipes-demo/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/html5-hvac/html5-hvac_git.bb b/recipes-demo/html5-hvac/html5-hvac_git.bb
deleted file mode 100644
index 91654b42b..000000000
--- a/recipes-demo/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/html5-launcher/html5-launcher_git.bb b/recipes-demo/html5-launcher/html5-launcher_git.bb
deleted file mode 100644
index ab99cf5f0..000000000
--- a/recipes-demo/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/html5-mediaplayer/html5-mediaplayer_git.bb b/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
deleted file mode 100644
index ddb2ee29f..000000000
--- a/recipes-demo/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/html5-mixer/html5-mixer_git.bb b/recipes-demo/html5-mixer/html5-mixer_git.bb
deleted file mode 100644
index e643c59c7..000000000
--- a/recipes-demo/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/html5-settings/html5-settings_git.bb b/recipes-demo/html5-settings/html5-settings_git.bb
deleted file mode 100644
index 010c69105..000000000
--- a/recipes-demo/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/hvac/hvac_git.bb b/recipes-demo/hvac/hvac_git.bb
deleted file mode 100644
index c7da0ef49..000000000
--- a/recipes-demo/hvac/hvac_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY     = "HVAC application"
-DESCRIPTION = "AGL demonstration HVAC application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/hvac"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = " \
-    qtquickcontrols2 \
-    libhomescreen \
-    qttools-native \
-    libqtappfw \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/hvac;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
-
-RDEPENDS:${PN} = "agl-service-hvac libqtappfw"
diff --git a/recipes-demo/inputeventmanager/inputeventmanager_git.bb b/recipes-demo/inputeventmanager/inputeventmanager_git.bb
deleted file mode 100644
index 8718f1844..000000000
--- a/recipes-demo/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/launcher/launcher_git.bb b/recipes-demo/launcher/launcher_git.bb
deleted file mode 100644
index d2de209a1..000000000
--- a/recipes-demo/launcher/launcher_git.bb
+++ /dev/null
@@ -1,32 +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 \
-        agl-compositor \
-"
-
-PV      = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/launcher;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S       = "${WORKDIR}/git"
-
-inherit qmake5 systemd pkgconfig aglwgt
-
-PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
-
-RDEPENDS:${PN} = "agl-service-homescreen"
diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb
deleted file mode 100644
index f6538fdcf..000000000
--- a/recipes-demo/mediaplayer/mediaplayer_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY     = "Media Player application"
-DESCRIPTION = "AGL demonstration Media Player application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mediaplayer"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "qtquickcontrols2 libqtappfw"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mediaplayer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
-
-RDEPENDS:${PN} += "agl-service-mediaplayer libqtappfw"
diff --git a/recipes-demo/messaging/messaging_git.bb b/recipes-demo/messaging/messaging_git.bb
deleted file mode 100644
index 586996c75..000000000
--- a/recipes-demo/messaging/messaging_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY     = "Messaging application"
-DESCRIPTION = "AGL demonstration Messaging application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/messaging"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "qtquickcontrols2 libqtappfw"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/messaging;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
-
-RDEPENDS:${PN} += "agl-service-bluetooth-map libqtappfw"
diff --git a/recipes-demo/mixer/mixer_git.bb b/recipes-demo/mixer/mixer_git.bb
deleted file mode 100644
index c99c04420..000000000
--- a/recipes-demo/mixer/mixer_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY     = "Mixer application"
-DESCRIPTION = "AGL demonstration Mixer 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"
-
-DEPENDS = " \
-    qtquickcontrols2 \
-    qtwebsockets \
-    libafb-helpers-qt \
-"
-
-PROVIDES += "virtual/mixer"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-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} = "agl-service-audiomixer"
-RPROVIDES:${PN} += "virtual/mixer"
diff --git a/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini b/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini
deleted file mode 100644
index f99c4483d..000000000
--- a/recipes-demo/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":"styles/v1/mapbox/streets-v11",
-	"enableOSM":true
-}
diff --git a/recipes-demo/navigation/ondemandnavi-config_1.0.bb b/recipes-demo/navigation/ondemandnavi-config_1.0.bb
deleted file mode 100644
index 212971f26..000000000
--- a/recipes-demo/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/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb
deleted file mode 100644
index 5264ba633..000000000
--- a/recipes-demo/navigation/ondemandnavi_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY     = "Navigation application."
-DESCRIPTION = "AGL demonstration 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 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 \
-    agl-service-navigation \
-"
-
-RPROVIDES:${PN} = "virtual/navigation"
-
diff --git a/recipes-demo/navigation/poiapp-api-key_1.0.bb b/recipes-demo/navigation/poiapp-api-key_1.0.bb
deleted file mode 100644
index d353d7dd5..000000000
--- a/recipes-demo/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/navigation/poiapp/0001-add-display-permission.patch b/recipes-demo/navigation/poiapp/0001-add-display-permission.patch
deleted file mode 100644
index 25a8fc313..000000000
--- a/recipes-demo/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/navigation/poiapp_git.bb b/recipes-demo/navigation/poiapp_git.bb
deleted file mode 100644
index 08e174f74..000000000
--- a/recipes-demo/navigation/poiapp_git.bb
+++ /dev/null
@@ -1,23 +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/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb
deleted file mode 100644
index a4f22545f..000000000
--- a/recipes-demo/navigation/tbtnavi_git.bb
+++ /dev/null
@@ -1,38 +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 \
-    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 \
-    agl-service-signal-composer \
-    libqtappfw \
-"
diff --git a/recipes-demo/onscreenapp/onscreenapp_git.bb b/recipes-demo/onscreenapp/onscreenapp_git.bb
deleted file mode 100644
index 32a7a2db3..000000000
--- a/recipes-demo/onscreenapp/onscreenapp_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY     = "onscreenapp for displaying popup windows"
-DESCRIPTION = "AGL demonstration HMI Application for displaying popup windows"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/onscreenapp"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "qtquickcontrols2 libhomescreen qlibhomescreen"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/onscreenapp;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
diff --git a/recipes-demo/phone/phone_git.bb b/recipes-demo/phone/phone_git.bb
deleted file mode 100644
index 71ef6ed7c..000000000
--- a/recipes-demo/phone/phone_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY     = "Phone application"
-DESCRIPTION = "AGL demonstration Phone application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/phone"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "qtquickcontrols2 libqtappfw gstreamer1.0"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
-
-RDEPENDS:${PN} += " \
-    agl-service-telephony \
-    agl-service-bluetooth-pbap \
-    libqtappfw \
-"
diff --git a/recipes-demo/radio/files/presets-ALS.conf b/recipes-demo/radio/files/presets-ALS.conf
deleted file mode 100644
index ff5592272..000000000
--- a/recipes-demo/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/radio/files/presets-CES.conf b/recipes-demo/radio/files/presets-CES.conf
deleted file mode 100644
index 83caeffe1..000000000
--- a/recipes-demo/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/radio/files/presets-FOSDEM.conf b/recipes-demo/radio/files/presets-FOSDEM.conf
deleted file mode 100644
index b88364f72..000000000
--- a/recipes-demo/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/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb
deleted file mode 100644
index c635f2c35..000000000
--- a/recipes-demo/radio/radio_git.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY     = "Radio application"
-DESCRIPTION = "AGL demonstration Radio application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/radio"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & GPLv2+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "qtquickcontrols2 libqtappfw rtl-sdr"
-
-PV = "1.0+git${SRCPV}"
-
-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}"
-
-S  = "${WORKDIR}/git"
-
-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/settings/settings_git.bb b/recipes-demo/settings/settings_git.bb
deleted file mode 100644
index 60cbdf595..000000000
--- a/recipes-demo/settings/settings_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY     = "Settings application"
-DESCRIPTION = "AGL demonstration Settings application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/settings"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = " \
-    libqtappfw \
-    qtquickcontrols2 \
-    qt-qrcode \
-    qtvirtualkeyboard \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/settings;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
-
-RDEPENDS:${PN} += " \
-    qt-qrcode \
-    agl-service-bluetooth \
-    agl-service-network \
-    agl-service-voice-high \
-    libqtappfw \
-"
diff --git a/recipes-demo/taskmanager/taskmanager_git.bb b/recipes-demo/taskmanager/taskmanager_git.bb
deleted file mode 100644
index 96b6d270f..000000000
--- a/recipes-demo/taskmanager/taskmanager_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY     = "Task Manager application"
-DESCRIPTION = "AGL demonstration task visualization and management application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/taskmanager"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = " \
-    qtquickcontrols2 \
-    qtwebsockets \
-    qtcharts \
-    libqtappfw \
-    libhomescreen \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/taskmanager;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit qmake5 aglwgt
-
-RDEPENDS:${PN} += "agl-service-taskmanager libqtappfw"
diff --git a/recipes-demo/telematics-recorder/telematics-recorder_git.bb b/recipes-demo/telematics-recorder/telematics-recorder_git.bb
deleted file mode 100644
index 322acc5c3..000000000
--- a/recipes-demo/telematics-recorder/telematics-recorder_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY     = "Telematics Recorder application"
-DESCRIPTION = "AGL demonstration telematics recorder application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-telematics-demo-recorder"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-DEPENDS = "glib-2.0 mosquitto"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-telematics-demo-recorder;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AUTOREV}"
-
-S  = "${WORKDIR}/git"
-
-inherit cmake aglwgt
-
-RDEPENDS:${PN} += " \
-    agl-service-can-low-level \
-    agl-service-gps \
-    agl-service-network \
-    libmosquitto1 \
-"
diff --git a/recipes-demo/waltham-receiver/waltham-receiver_git.bb b/recipes-demo/waltham-receiver/waltham-receiver_git.bb
deleted file mode 100644
index 75ada4dd1..000000000
--- a/recipes-demo/waltham-receiver/waltham-receiver_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY     = "Waltham Receiver application"
-DESCRIPTION = "AGL demonstration Waltham receiver interactive remote display application"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/apps/waltham-receiver.git"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=374fee6a7817f1e1a5a7bfb7b7989553"
-
-DEPENDS = " \
-    waltham wayland wayland-native \
-    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \
-"
-
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/waltham-receiver.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-S  = "${WORKDIR}/git"
-
-inherit cmake pkgconfig aglwgt
-
-RDEPENDS:${PN} += " \
-    gstreamer1.0-plugins-base \
-    gstreamer1.0-plugins-good \
-    gstreamer1.0-plugins-bad \
-    waltham \
-"