From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 3 Dec 2018 19:29:19 +0000 (-0500)
Subject: Add agl-cluster-demo-support feature
X-Git-Tag: guppy_6.99.3~12
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=c7710ecc186df8b211373524244a05187406b490

Add agl-cluster-demo-support feature

Add new feature to enable support for the cluster demo.  At the moment,
it pulls in the agl-gstrecorder feature and enables building the required
mapviewer application.

Bug-AGL: SPEC-1730

Change-Id: I18c0312eefca9bb8c591e8b8a2b8113b4e94c7fc
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
(cherry picked from commit af3ecc175fdb3cfbb7501ec5f1aad7718c08472a)
---

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index f3191ca18..9deaea2a1 100755
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -37,9 +37,6 @@ MOST_HVAC_append = " \
 MOST_HVAC_dra7xx-evm = ""
 MOST_HVAC_dragonboard-410c = ""
 
-# mapviewer and mapviewer-demo requires AGL CES2017 demo mock-up
-MAPVIEWER = "${@bb.utils.contains("DISTRO_FEATURES", "agl-mapviewer-demo", " mapviewer mapviewer-demo", "",d)}"
-
 AGL_APPS = " \
     dashboard \
     hvac \
@@ -61,15 +58,18 @@ AGL_APIS = " \
 
 QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}"
 
+# mapviewer and mapviewer-demo are required for AGL cluster demo
+MAPVIEWER = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-support", " mapviewer mapviewer-demo", "",d)}"
+
 RDEPENDS_${PN}_append = " \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
     linux-firmware-ralink \
-    ${QTAGLEXTRAS} \
-    ${MAPVIEWER} \
     ${MOST_HVAC} \
     ${AGL_APPS} \
     ${AGL_APIS} \
+    ${QTAGLEXTRAS} \
+    ${MAPVIEWER} \
     "
 
 
diff --git a/templates/feature/agl-cluster-demo-support/50_local.conf.inc b/templates/feature/agl-cluster-demo-support/50_local.conf.inc
new file mode 100644
index 000000000..f4724b586
--- /dev/null
+++ b/templates/feature/agl-cluster-demo-support/50_local.conf.inc
@@ -0,0 +1 @@
+DISTRO_FEATURES_append = " agl-cluster-demo-support"
diff --git a/templates/feature/agl-cluster-demo-support/included.dep b/templates/feature/agl-cluster-demo-support/included.dep
new file mode 100644
index 000000000..17ef3ba98
--- /dev/null
+++ b/templates/feature/agl-cluster-demo-support/included.dep
@@ -0,0 +1 @@
+agl-gstrecorder