From: Raquel Medina <raquel.medina@konsulko.com>
Date: Fri, 5 Jun 2020 17:56:50 +0000 (+0200)
Subject: remove libqtappfw package from QTAGLEXTRAS
X-Git-Tag: 9.99.1~6
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=bdee02ee6f4b54ee42c23a4afbc903c1e4527f90

remove libqtappfw package from QTAGLEXTRAS

Remove libqtappfw package from QTAGLSEXTRAS and
add to individual recipe RDEPENDS.

Bug-AGL: SPEC-3390
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: Idb5aaca35a8d797a4e758f82df6650ef3aeb6561
---

diff --git a/recipes-demo-hmi/homescreen/homescreen_git.bb b/recipes-demo-hmi/homescreen/homescreen_git.bb
index 984e51539..e6db70e11 100644
--- a/recipes-demo-hmi/homescreen/homescreen_git.bb
+++ b/recipes-demo-hmi/homescreen/homescreen_git.bb
@@ -15,7 +15,7 @@ DEPENDS = "\
         libqtappfw \
         qlibwindowmanager \
         libhomescreen \
-	libafb-helpers-qt \
+        libafb-helpers-qt \
 "
 
 inherit qmake5 systemd pkgconfig aglwgt
@@ -29,3 +29,7 @@ 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/hvac/hvac_git.bb b/recipes-demo-hmi/hvac/hvac_git.bb
index 93e85f458..6091e51e2 100644
--- a/recipes-demo-hmi/hvac/hvac_git.bb
+++ b/recipes-demo-hmi/hvac/hvac_git.bb
@@ -16,6 +16,6 @@ S  = "${WORKDIR}/git"
 DEPENDS += "qtquickcontrols2 libhomescreen \
             qlibwindowmanager qttools-native \
             qtaglextras libqtappfw"
-RDEPENDS_${PN} = "agl-service-hvac"
+RDEPENDS_${PN} = "agl-service-hvac libqtappfw"
 
 inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
index 9a3690f76..2e8468106 100644
--- a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
+++ b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
@@ -22,4 +22,4 @@ DEPENDS += "qtquickcontrols2 \
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-mediaplayer"
+RDEPENDS_${PN} += "agl-service-mediaplayer libqtappfw"
diff --git a/recipes-demo-hmi/messaging/messaging_git.bb b/recipes-demo-hmi/messaging/messaging_git.bb
index 5812cea7a..f6b545d62 100644
--- a/recipes-demo-hmi/messaging/messaging_git.bb
+++ b/recipes-demo-hmi/messaging/messaging_git.bb
@@ -21,4 +21,4 @@ DEPENDS += "qtquickcontrols2 \
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-bluetooth-map"
+RDEPENDS_${PN} += "agl-service-bluetooth-map libqtappfw"
diff --git a/recipes-demo-hmi/phone/phone_git.bb b/recipes-demo-hmi/phone/phone_git.bb
index 553cc8acf..cab30ea6b 100644
--- a/recipes-demo-hmi/phone/phone_git.bb
+++ b/recipes-demo-hmi/phone/phone_git.bb
@@ -22,4 +22,4 @@ DEPENDS += "qtquickcontrols2 \
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-telephony agl-service-bluetooth-pbap"
+RDEPENDS_${PN} += "agl-service-telephony agl-service-bluetooth-pbap libqtappfw"
diff --git a/recipes-demo-hmi/radio/radio_git.bb b/recipes-demo-hmi/radio/radio_git.bb
index 52a981f25..22d7ecbe6 100644
--- a/recipes-demo-hmi/radio/radio_git.bb
+++ b/recipes-demo-hmi/radio/radio_git.bb
@@ -35,4 +35,4 @@ do_install_append() {
 
 FILES_${PN} += "${sysconfdir}/xdg/AGL/*"
 
-RDEPENDS_${PN} += "agl-service-radio"
+RDEPENDS_${PN} += "agl-service-radio libqtappfw"
diff --git a/recipes-demo-hmi/settings/settings_git.bb b/recipes-demo-hmi/settings/settings_git.bb
index 72e0323ff..17b83dc9f 100644
--- a/recipes-demo-hmi/settings/settings_git.bb
+++ b/recipes-demo-hmi/settings/settings_git.bb
@@ -21,6 +21,7 @@ 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
index f616b4d74..13f16fca5 100644
--- a/recipes-demo-hmi/taskmanager/taskmanager_git.bb
+++ b/recipes-demo-hmi/taskmanager/taskmanager_git.bb
@@ -23,4 +23,4 @@ DEPENDS += "qtquickcontrols2 \
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-taskmanager"
+RDEPENDS_${PN} += "agl-service-taskmanager libqtappfw"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 45e0dd1e6..fc0bbfa6e 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -38,7 +38,8 @@ AGL_APPS = " \
     "
 
 QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}"
-QTAGLEXTRAS_append = " libqtappfw"
+#NOTE: removed libqtappfw from QTAGLEXTRAS as it is no longer
+#      necessary due to replacement by individual recipe RDEPENDS.
 
 # add support for websocket in Qt and QML
 QTAGLEXTRAS_append = " qtwebsockets qtwebsockets-qmlplugins"