From 1b72a0f90fa7d1b45eb1017629cc83dcd8971c48 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Wed, 3 Nov 2021 15:18:49 +0100
Subject: 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
---
 templates/feature/agl-cloudproxy/50_local.conf.inc    | 2 --
 templates/feature/agl-demo/50_bblayers.conf.inc       | 6 ++++--
 templates/feature/agl-demo/50_local.conf.inc          | 4 ----
 templates/feature/agl-demo/README_feature_agl-demo.md | 2 --
 templates/feature/agl-demo/included.dep               | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 templates/feature/agl-cloudproxy/50_local.conf.inc

(limited to 'templates')

diff --git a/templates/feature/agl-cloudproxy/50_local.conf.inc b/templates/feature/agl-cloudproxy/50_local.conf.inc
deleted file mode 100644
index 93b0cb40..00000000
--- a/templates/feature/agl-cloudproxy/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set cloud proxy flag
-AGL_CLOUDPROXY_WANTED = "1"
\ No newline at end of file
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index 5562e5e0..7dfba908 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -5,11 +5,13 @@ BBLAYERS =+ " \
 "
 
 AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
 
 # OpenEmbedded layer to add support for multiple cloud service provider solutions
 #---------------------------------------------------
 BBLAYERS =+ " \
-   ${METADIR}/external/meta-iot-cloud \
    ${METADIR}/external/meta-qt5 \
-   ${METADIR}/external/meta-python2 \
 "
+
+#   ${METADIR}/external/meta-python2 \
+#
\ No newline at end of file
diff --git a/templates/feature/agl-demo/50_local.conf.inc b/templates/feature/agl-demo/50_local.conf.inc
index 3b866e6f..76626243 100644
--- a/templates/feature/agl-demo/50_local.conf.inc
+++ b/templates/feature/agl-demo/50_local.conf.inc
@@ -1,6 +1,2 @@
 #see meta-agl-demo/conf/include/agl-demo.inc
 require conf/include/agl-demo.inc
-
-#see meta-agl-demo/conf/include/agl-cloudproxy.inc
-#SPEC-3826
-require conf/include/agl-cloudproxy.inc
diff --git a/templates/feature/agl-demo/README_feature_agl-demo.md b/templates/feature/agl-demo/README_feature_agl-demo.md
index 76b587ed..31883cd6 100644
--- a/templates/feature/agl-demo/README_feature_agl-demo.md
+++ b/templates/feature/agl-demo/README_feature_agl-demo.md
@@ -11,8 +11,6 @@ authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly
 
 The following features are pulled:
 
-* agl-appfw-smack
-* agl-hmi-framework
 * agl-profile-graphical-qt5
 * agl-pipewire
 
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
index 14507678..d0b20417 100644
--- a/templates/feature/agl-demo/included.dep
+++ b/templates/feature/agl-demo/included.dep
@@ -1 +1 @@
-agl-appfw-smack agl-hmi-framework agl-pipewire
+agl-pipewire
-- 
cgit 1.2.3-korg