Use inherit aglwgt in application recipes

This change converts the application recipes for
hvac, mediaplayer, mixer, settings
to use the  aglwgt bbclass.

This simplifies the application workflow and ensures
interoperability with the SDK.

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

diff --git a/recipes-demo-hmi/hvac/hvac_git.bb b/recipes-demo-hmi/hvac/hvac_git.bb
index 4b3e289..425052c 100644 (file)
--- a/recipes-demo-hmi/hvac/hvac_git.bb
+++ b/recipes-demo-hmi/hvac/hvac_git.bb
@@ -1,35 +1,18 @@
 SUMMARY     = "HVAC for CES2017 AGL Demonstration"
 DESCRIPTION = "AGL HMI Application for demonstrating HVAC on AGL Distribution"
 HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/hvac"
-LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-inherit qmake5
-
-DEPENDS += "qtquickcontrols2"
-# 'wgtpkg-pack' in af-main-native is required.
-DEPENDS += "af-main-native"
-# hvac has binding, so af-binder is required.
-DEPENDS += "af-binder"
-
+LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/hvac;protocol=http"
 SRCREV  = "${AUTOREV}"
 
-RDEPENDS_${PN} += " \
-    qtmultimedia-qmlplugins \
-    qtquickcontrols2-qmlplugins \
-    "
+PV = "1.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
 
-do_install() {
-    install -d ${D}/usr/AGL/apps
-    install -m 0644 ${B}/package/${PN}.wgt ${D}/usr/AGL/apps/
-}
+# build-time dependencies
+DEPENDS += "qtquickcontrols2"
 
-FILES_${PN} += "/usr/AGL/apps/ \
-    /usr/AGL/apps/${PN} \
-    "
+inherit qmake5 aglwgt

diff --git a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
index 9434926..000f976 100644 (file)
--- a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
+++ b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
@@ -1,33 +1,18 @@
 SUMMARY     = "Media Player for CES2017 AGL Demonstration"
 DESCRIPTION = "AGL HMI Application for demonstrating Media Player on AGL Distribution"
 HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mediaplayer"
-LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-inherit qmake5
-
-DEPENDS += "qtquickcontrols2 qtmultimedia"
-# 'wgtpkg-pack' in af-main-native is required.
-DEPENDS += "af-main-native"
-
+LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mediaplayer;protocol=http"
 SRCREV  = "${AUTOREV}"
 
-RDEPENDS_${PN} += " \
-    qtmultimedia-qmlplugins \
-    qtquickcontrols2-qmlplugins \
-    "
+PV = "1.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
 
-do_install() {
-    install -d ${D}/usr/AGL/apps
-    install -m 0644 ${B}/package/${PN}.wgt ${D}/usr/AGL/apps/
-}
+inherit qmake5 aglwgt
 
-FILES_${PN} += "/usr/AGL/apps/ \
-    /usr/AGL/apps/${PN} \
-    "
+# build-time dependencies
+DEPENDS += "qtquickcontrols2 qtmultimedia"

diff --git a/recipes-demo-hmi/mixer/mixer_git.bb b/recipes-demo-hmi/mixer/mixer_git.bb
index c7f30a1..f0ca5d9 100644 (file)
--- a/recipes-demo-hmi/mixer/mixer_git.bb
+++ b/recipes-demo-hmi/mixer/mixer_git.bb
@@ -1,34 +1,18 @@
 SUMMARY     = "Mixer for CES2017 AGL Demonstration"
 DESCRIPTION = "AGL HMI application for control of PulseAudio mixer elements"
 HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mixer"
-LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-inherit qmake5
-
-DEPENDS += "qtquickcontrols2"
-# 'wgtpkg-pack' in af-main-native is required.
-DEPENDS += "af-main-native"
-DEPENDS += "pulseaudio"
-
+LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=http"
 SRCREV  = "${AUTOREV}"
 
-RDEPENDS_${PN} += " \
-    qtmultimedia-qmlplugins \
-    qtquickcontrols2-qmlplugins \
-    "
+PV = "1.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
 
-do_install() {
-    install -d ${D}/usr/AGL/apps
-    install -m 0644 ${B}/package/${PN}.wgt ${D}/usr/AGL/apps/
-}
+inherit qmake5 aglwgt
 
-FILES_${PN} += "/usr/AGL/apps/ \
-    /usr/AGL/apps/${PN} \
-    "
+# build-time dependencies
+DEPENDS += "qtquickcontrols2 pulseaudio"

diff --git a/recipes-demo-hmi/settings/settings_git.bb b/recipes-demo-hmi/settings/settings_git.bb
index 427ea7c..a018c06 100644 (file)
--- a/recipes-demo-hmi/settings/settings_git.bb
+++ b/recipes-demo-hmi/settings/settings_git.bb
@@ -1,35 +1,18 @@
 SUMMARY     = "Settings for CES2017 AGL Demonstration"
 DESCRIPTION = "AGL HMI Application for demonstrating Settings on AGL Distribution"
 HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/settings"
-LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-inherit qmake5
-
-DEPENDS += "qtquickcontrols2"
-# 'wgtpkg-pack' in af-main-native is required.
-DEPENDS += "af-main-native"
-# setting has binding, so af-binder is required.
-DEPENDS += "af-binder"
-
+LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/settings;protocol=http"
 SRCREV  = "${AUTOREV}"
 
-RDEPENDS_${PN} += " \
-    qtmultimedia-qmlplugins \
-    qtquickcontrols2-qmlplugins \
-    "
+PV = "1.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
 
-do_install() {
-    install -d ${D}/usr/AGL/apps
-    install -m 0644 ${B}/package/${PN}.wgt ${D}/usr/AGL/apps/
-}
+# build-time dependencies
+DEPENDS += "qtquickcontrols2"
 
-FILES_${PN} += "/usr/AGL/apps/ \
-    /usr/AGL/apps/${PN} \
-    "
+inherit qmake5 aglwgt