From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 7 Jun 2019 10:46:12 +0000 (+0200)
Subject: Remove switch between very old and current homescreen
X-Git-Tag: 7.99.2~19
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=e8a2ae59f2d67fb8e64e1c54ab6b2774529a090b

Remove switch between very old and current homescreen

We are evolving the new homescreen. No need to keep the old variant.

Bug-AGL: SPEC-2496

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

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 0a6485920..fc4f8ef9d 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -14,10 +14,8 @@ ALLOW_EMPTY_${PN} = "1"
 SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \
     'packagegroup-agl-smartdevicelink', '', d)}"
 
-# old homescreen package
-HOMESCREEN-OLD = "homescreen"
 # packages from hmi-framework aka homescreen-2017
-HOMESCREEN-NEW = "packagegroup-hmi-framework packagegroup-hmi-framework-dev"
+HOMESCREEN = "packagegroup-hmi-framework"
 
 # old audio package
 AUDIO-OLD = "audiomanager"
@@ -26,7 +24,7 @@ AUDIO-NEW = "packagegroup-agl-audio"
 
 RDEPENDS_${PN} += "\
     libqtappfw \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', '${HOMESCREEN-NEW}', '${HOMESCREEN-OLD}', d)} \
+    ${HOMESCREEN} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \
     udisks \
     ${SMARTDEVICELINK} \