From ee473ff99bb5ffda3cf2758d3bc693541ada47eb Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 14 Jan 2021 16:48:04 -0500 Subject: [PATCH] Remove unused demo app build dependencies Update demo app recipes as appropriate to remove now unused build dependencies such as libhomescreen, qlibhomescreen, and qtwebsockets. Bug-AGL: SPEC-3748 Signed-off-by: Scott Murray Change-Id: Ic3b17bf868dcd0ad633bd09f53311e11ec0a1a00 --- recipes-demo/cluster-dashboard/cluster-dashboard_git.bb | 2 +- recipes-demo/mediaplayer/mediaplayer_git.bb | 7 +------ recipes-demo/messaging/messaging_git.bb | 6 +----- recipes-demo/navigation/ondemandnavi_git.bb | 7 +------ recipes-demo/navigation/tbtnavi_git.bb | 1 - recipes-demo/phone/phone_git.bb | 7 +------ recipes-demo/radio/radio_git.bb | 2 +- recipes-demo/settings/settings_git.bb | 1 - 8 files changed, 6 insertions(+), 27 deletions(-) diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb index 7c7d4051c..f8dad08fa 100644 --- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb +++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ file://app/cluster-gauges.qml;beginline=9;endline=48;md5=54187d50b29429abee6095fe8b7c1a78" DEPENDS = " \ - qtquickcontrols2 qtwebsockets libqtappfw glib-2.0 \ + qtquickcontrols2 libqtappfw glib-2.0 \ wayland-native wayland qtwayland qtwayland-native \ " diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb index aa809360c..26d4e5978 100644 --- a/recipes-demo/mediaplayer/mediaplayer_git.bb +++ b/recipes-demo/mediaplayer/mediaplayer_git.bb @@ -6,12 +6,7 @@ SECTION = "apps" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -DEPENDS = " \ - qtquickcontrols2 \ - qtwebsockets \ - libqtappfw \ - libhomescreen \ -" +DEPENDS = "qtquickcontrols2 libqtappfw" PV = "1.0+git${SRCPV}" diff --git a/recipes-demo/messaging/messaging_git.bb b/recipes-demo/messaging/messaging_git.bb index f440ca89b..5d5e7a6dd 100644 --- a/recipes-demo/messaging/messaging_git.bb +++ b/recipes-demo/messaging/messaging_git.bb @@ -6,11 +6,7 @@ SECTION = "apps" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -DEPENDS = " \ - qtquickcontrols2 \ - libqtappfw \ - libhomescreen \ -" +DEPENDS = "qtquickcontrols2 libqtappfw" PV = "1.0+git${SRCPV}" diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb index 79d96a0e2..17def6f8e 100644 --- a/recipes-demo/navigation/ondemandnavi_git.bb +++ b/recipes-demo/navigation/ondemandnavi_git.bb @@ -6,12 +6,7 @@ SECTION = "apps" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -DEPENDS = " \ - qtquickcontrols2 \ - qlibhomescreen \ - qtlocation \ - libqtappfw \ -" +DEPENDS = "qtquickcontrols2 qtlocation libqtappfw" PV = "1.0+git${SRCPV}" diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb index 0965eb982..14e5eae3b 100644 --- a/recipes-demo/navigation/tbtnavi_git.bb +++ b/recipes-demo/navigation/tbtnavi_git.bb @@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ DEPENDS = " \ qtbase \ qtquickcontrols2 \ - qlibhomescreen \ qtlocation \ libqtappfw \ wayland-native \ diff --git a/recipes-demo/phone/phone_git.bb b/recipes-demo/phone/phone_git.bb index 41ca0e616..dbfb639f0 100644 --- a/recipes-demo/phone/phone_git.bb +++ b/recipes-demo/phone/phone_git.bb @@ -6,12 +6,7 @@ SECTION = "apps" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -DEPENDS = " \ - qtquickcontrols2 \ - libqtappfw \ - libhomescreen \ - gstreamer1.0 \ -" +DEPENDS = "qtquickcontrols2 libqtappfw gstreamer1.0" PV = "1.0+git${SRCPV}" diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb index 5d0b9fbe2..459bfc167 100644 --- a/recipes-demo/radio/radio_git.bb +++ b/recipes-demo/radio/radio_git.bb @@ -6,7 +6,7 @@ SECTION = "apps" LICENSE = "Apache-2.0 & GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -DEPENDS = "qtquickcontrols2 rtl-sdr libhomescreen libqtappfw" +DEPENDS = "qtquickcontrols2 libqtappfw rtl-sdr" PV = "1.0+git${SRCPV}" diff --git a/recipes-demo/settings/settings_git.bb b/recipes-demo/settings/settings_git.bb index 24ab47aed..491517b77 100644 --- a/recipes-demo/settings/settings_git.bb +++ b/recipes-demo/settings/settings_git.bb @@ -10,7 +10,6 @@ DEPENDS = " \ libqtappfw \ qtquickcontrols2 \ qt-qrcode \ - libhomescreen \ qtvirtualkeyboard \ " -- 2.16.6