From 7783a290e85c35e8e152dee8099f8defe2ca710d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 1 Mar 2017 11:05:33 -0500 Subject: Switch to split out demo apps Add recipes for the split out controls, dashboard, phone, and radio app repositories, remove the related packaging of same from the CES2017-demo recipe, and add the split out apps to IMAGE_AGL_APPS in the agl-demo-platform image definition. Bug-AGL: SPEC-400, SPEC-401, SPEC-402, SPEC-403, SPEC-404 Change-Id: Ic3c7d134c90dd3fe989cb1ef7a510b1c5bf1fee8 Signed-off-by: Scott Murray --- recipes-demo-hmi/CES2017-demo/CES2017-demo.bb | 120 +++------------------ .../CES2017-demo/files/presets-ALS.conf | 12 --- .../CES2017-demo/files/presets-CES.conf | 14 --- .../CES2017-demo/files/presets-FOSDEM.conf | 14 --- recipes-demo-hmi/controls/controls_git.bb | 18 ++++ recipes-demo-hmi/dashboard/dashboard_git.bb | 18 ++++ recipes-demo-hmi/phone/phone_git.bb | 18 ++++ recipes-demo-hmi/radio/files/presets-ALS.conf | 12 +++ recipes-demo-hmi/radio/files/presets-CES.conf | 14 +++ recipes-demo-hmi/radio/files/presets-FOSDEM.conf | 14 +++ recipes-demo-hmi/radio/radio_git.bb | 43 ++++++++ .../packagegroup-agl-demo-platform.bb | 7 +- 12 files changed, 159 insertions(+), 145 deletions(-) delete mode 100644 recipes-demo-hmi/CES2017-demo/files/presets-ALS.conf delete mode 100644 recipes-demo-hmi/CES2017-demo/files/presets-CES.conf delete mode 100644 recipes-demo-hmi/CES2017-demo/files/presets-FOSDEM.conf create mode 100644 recipes-demo-hmi/controls/controls_git.bb create mode 100644 recipes-demo-hmi/dashboard/dashboard_git.bb create mode 100644 recipes-demo-hmi/phone/phone_git.bb create mode 100644 recipes-demo-hmi/radio/files/presets-ALS.conf create mode 100644 recipes-demo-hmi/radio/files/presets-CES.conf create mode 100644 recipes-demo-hmi/radio/files/presets-FOSDEM.conf create mode 100644 recipes-demo-hmi/radio/radio_git.bb diff --git a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb index 681e246f..281944d9 100644 --- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb +++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb @@ -1,108 +1,23 @@ SUMMARY = "App Launcher for the AGL Demonstrator @ CES2017" DESCRIPTION = "App Lanucher app in QML format for the AGL Demonstrator @ CESS2017" HOMEPAGE = "https://git.automotivelinux.org/gerrit/#/admin/projects/AGL/DemoApps/CES2017" -LICENSE = "MPL-2.0" SECTION = "apps" -PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" -PN = "ces2017-demo" - -inherit qmake5 -DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2" - -inherit aglwgt - +LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad" -# ALS, CES, FOSDEM available -AGL_RADIO_PRESETS_LOCALE ?= "CES" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http \ - file://presets-ALS.conf \ - file://presets-CES.conf \ - file://presets-FOSDEM.conf \ -" -SRCREV = "${AUTOREV}" - -RDEPENDS_${PN} += " \ - qtmultimedia-qmlplugins \ - qtmultimedia-rtlfm-radio-plugin \ - qtquickcontrols-qmlplugins \ - qtquickcontrols2-qmlplugins \ - qtsvg-plugins \ - " - -do_install_prepend() { - mkdir -p ${B}/package - - echo " \ - \ - Controls \ - \ - Controls app. \ - Qt \ - \ - Apache 2.0 \ - \ -" > ${B}/apps/Controls/config.xml - - cd ${B}/apps/Controls/ - zip ${B}/package/controls.wgt config.xml controls - - echo " \ - \ - Dashboard \ - \ - Dashboard app. \ - Qt \ - \ - Apache 2.0 \ - \ -" > ${B}/apps/Dashboard/config.xml - - cd ${B}/apps/Dashboard/ - zip ${B}/package/dashboard.wgt config.xml dashboard - - - echo " \ - \ - Phone \ - \ - Phone app. \ - Qt \ - \ - Apache 2.0 \ - \ -" > ${B}/apps/Phone/config.xml - - cd ${B}/apps/Phone/ - zip ${B}/package/phone.wgt config.xml phone - +DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2" +PV = "1.0+git${SRCPV}" +PN = "ces2017-demo" - echo " \ - \ - Radio \ - \ - Radio app. \ - Qt \ - \ - Apache 2.0 \ - \ -" > ${B}/apps/Radio/config.xml +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http" +SRCREV = "${AUTOREV}" - cd ${B}/apps/Radio/ - zip ${B}/package/radio.wgt config.xml radio +S = "${WORKDIR}/git/" -} +inherit qmake5 do_install() { - install -d ${D}/home/root/app-data/radio - install -m 0644 ${WORKDIR}/presets-CES.conf ${D}/home/root/app-data/radio/ - install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}/home/root/app-data/radio/ - install -m 0644 ${WORKDIR}/presets-FOSDEM.conf ${D}/home/root/app-data/radio/ - install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}/home/root/app-data/radio/presets.conf - install -d ${D}${libdir}/qt5/qml/AGL/Demo/Controls/ install -m 0644 ${S}/imports/AGL/Demo/Controls/qmldir ${D}${libdir}/qt5/qml/AGL/Demo/Controls/ install -m 0644 ${S}/imports/AGL/Demo/Controls/ImageButton.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/ @@ -125,15 +40,8 @@ do_install() { install -m 0644 ${S}/imports/qtquickcontrols2aglstyle/images/* ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL/images/ } -# plain copy in own folder for now -#do_install() { -# mkdir -p ${D}/usr/AGL/CES2017/ -# cp -rf ./* ${D}/usr/AGL/CES2017/ -#} - -FILES_${PN} += "/usr/AGL/ \ - /home/root/app-data/radio/presets-*.conf \ - /home/root/app-data/radio/presets.conf \ +FILES_${PN} += " \ + /usr/AGL/ \ /usr/lib/qt5/qml/AGL/Demo/Controls/qmldir \ /usr/lib/qt5/qml/AGL/Demo/Controls/ImageButton.qml \ /usr/lib/qt5/qml/AGL/Demo/Controls/ToggleButton.qml \ @@ -148,4 +56,10 @@ FILES_${PN} += "/usr/AGL/ \ /usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Arrow.svg \ /usr/lib/qt5/qml/QtQuick/Controls.2/AGL \ /usr/lib/qt5/qml/QtQuick/Controls.2/AGL/images \ - " +" + +RDEPENDS_${PN} += " \ + qtquickcontrols-qmlplugins \ + qtquickcontrols2-qmlplugins \ + qtsvg-plugins \ +" diff --git a/recipes-demo-hmi/CES2017-demo/files/presets-ALS.conf b/recipes-demo-hmi/CES2017-demo/files/presets-ALS.conf deleted file mode 100644 index ff559227..00000000 --- a/recipes-demo-hmi/CES2017-demo/files/presets-ALS.conf +++ /dev/null @@ -1,12 +0,0 @@ -[fmPresets] -1\frequency=76100000 -1\title=Inter FM -2\frequency=77100000 -2\title=The Open University of Japan -3\frequency=80000000 -3\title=TOKYO FM -4\frequency=81300000 -4\title=J-WAVE -5\frequency=82500000 -5\title=NHK FM Tokyo -size=5 diff --git a/recipes-demo-hmi/CES2017-demo/files/presets-CES.conf b/recipes-demo-hmi/CES2017-demo/files/presets-CES.conf deleted file mode 100644 index 83caeffe..00000000 --- a/recipes-demo-hmi/CES2017-demo/files/presets-CES.conf +++ /dev/null @@ -1,14 +0,0 @@ -[fmPresets] -1\frequency=93100000 -1\title=93.1 The Mountain -2\frequency=94100000 -2\title=Mix 94.1 -3\frequency=96300000 -3\title=96.3 KKLZ -4\frequency=102700000 -4\title=102.7 THE COYOTE -5\frequency=88900000 -5\title=News 88.9 -6\frequency=91500000 -6\title=KUNV -size=6 diff --git a/recipes-demo-hmi/CES2017-demo/files/presets-FOSDEM.conf b/recipes-demo-hmi/CES2017-demo/files/presets-FOSDEM.conf deleted file mode 100644 index b88364f7..00000000 --- a/recipes-demo-hmi/CES2017-demo/files/presets-FOSDEM.conf +++ /dev/null @@ -1,14 +0,0 @@ -[fmPresets] -1\frequency=92100000 -1\title=92.1 Radio Campus -2\frequency=92500000 -2\title=92.5 RTBF La Première -3\frequency=93200000 -3\title=93.2 RTBF Classic 21 -4\frequency=98800000 -4\title=98.8 FM Brussel -5\frequency=103700000 -5\title=103.7 NRJ -6\frequency=104000000 -6\title=104.0 Bel RTL -size=6 diff --git a/recipes-demo-hmi/controls/controls_git.bb b/recipes-demo-hmi/controls/controls_git.bb new file mode 100644 index 00000000..7be699f3 --- /dev/null +++ b/recipes-demo-hmi/controls/controls_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Controls for CES2017 AGL Demonstration" +DESCRIPTION = "AGL HMI Application for demonstrating UI components on AGL Distribution" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/controls" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/controls;protocol=http" +SRCREV = "${AUTOREV}" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +# build-time dependencies +DEPENDS += "qtquickcontrols2" + +inherit qmake5 aglwgt diff --git a/recipes-demo-hmi/dashboard/dashboard_git.bb b/recipes-demo-hmi/dashboard/dashboard_git.bb new file mode 100644 index 00000000..2e025eb8 --- /dev/null +++ b/recipes-demo-hmi/dashboard/dashboard_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Dashboard for CES2017 AGL Demonstration" +DESCRIPTION = "AGL HMI Application for demonstrating dashboard on AGL Distribution" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/dashboard" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=http" +SRCREV = "${AUTOREV}" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +# build-time dependencies +DEPENDS += "qtquickcontrols2" + +inherit qmake5 aglwgt diff --git a/recipes-demo-hmi/phone/phone_git.bb b/recipes-demo-hmi/phone/phone_git.bb new file mode 100644 index 00000000..6d17bbed --- /dev/null +++ b/recipes-demo-hmi/phone/phone_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Phone for CES2017 AGL Demonstration" +DESCRIPTION = "AGL HMI Application for demonstrating phone on AGL Distribution" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/phone" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=http" +SRCREV = "${AUTOREV}" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +# build-time dependencies +DEPENDS += "qtquickcontrols2" + +inherit qmake5 aglwgt diff --git a/recipes-demo-hmi/radio/files/presets-ALS.conf b/recipes-demo-hmi/radio/files/presets-ALS.conf new file mode 100644 index 00000000..ff559227 --- /dev/null +++ b/recipes-demo-hmi/radio/files/presets-ALS.conf @@ -0,0 +1,12 @@ +[fmPresets] +1\frequency=76100000 +1\title=Inter FM +2\frequency=77100000 +2\title=The Open University of Japan +3\frequency=80000000 +3\title=TOKYO FM +4\frequency=81300000 +4\title=J-WAVE +5\frequency=82500000 +5\title=NHK FM Tokyo +size=5 diff --git a/recipes-demo-hmi/radio/files/presets-CES.conf b/recipes-demo-hmi/radio/files/presets-CES.conf new file mode 100644 index 00000000..83caeffe --- /dev/null +++ b/recipes-demo-hmi/radio/files/presets-CES.conf @@ -0,0 +1,14 @@ +[fmPresets] +1\frequency=93100000 +1\title=93.1 The Mountain +2\frequency=94100000 +2\title=Mix 94.1 +3\frequency=96300000 +3\title=96.3 KKLZ +4\frequency=102700000 +4\title=102.7 THE COYOTE +5\frequency=88900000 +5\title=News 88.9 +6\frequency=91500000 +6\title=KUNV +size=6 diff --git a/recipes-demo-hmi/radio/files/presets-FOSDEM.conf b/recipes-demo-hmi/radio/files/presets-FOSDEM.conf new file mode 100644 index 00000000..b88364f7 --- /dev/null +++ b/recipes-demo-hmi/radio/files/presets-FOSDEM.conf @@ -0,0 +1,14 @@ +[fmPresets] +1\frequency=92100000 +1\title=92.1 Radio Campus +2\frequency=92500000 +2\title=92.5 RTBF La Première +3\frequency=93200000 +3\title=93.2 RTBF Classic 21 +4\frequency=98800000 +4\title=98.8 FM Brussel +5\frequency=103700000 +5\title=103.7 NRJ +6\frequency=104000000 +6\title=104.0 Bel RTL +size=6 diff --git a/recipes-demo-hmi/radio/radio_git.bb b/recipes-demo-hmi/radio/radio_git.bb new file mode 100644 index 00000000..86ffe8c5 --- /dev/null +++ b/recipes-demo-hmi/radio/radio_git.bb @@ -0,0 +1,43 @@ +SUMMARY = "Radio for CES2017 AGL Demonstration" +DESCRIPTION = "AGL HMI Application for demonstrating Radio on AGL Distribution" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/radio" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=http \ + file://presets-ALS.conf \ + file://presets-CES.conf \ + file://presets-FOSDEM.conf \ +" +SRCREV = "${AUTOREV}" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +# build-time dependencies +DEPENDS += "qtquickcontrols2 qtmultimedia" + +inherit qmake5 aglwgt + +# ALS, CES, FOSDEM available +AGL_RADIO_PRESETS_LOCALE ?= "CES" + +do_install_append() { + install -d ${D}/home/root/app-data/radio + install -m 0644 ${WORKDIR}/presets-CES.conf ${D}/home/root/app-data/radio/ + install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}/home/root/app-data/radio/ + install -m 0644 ${WORKDIR}/presets-FOSDEM.conf ${D}/home/root/app-data/radio/ + install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}/home/root/app-data/radio/presets.conf +} + +FILES_${PN} += " \ + /home/root/app-data/radio/presets-*.conf \ + /home/root/app-data/radio/presets.conf \ +" + +RDEPENDS_${PN} += " \ + qtmultimedia-qmlplugins \ + qtmultimedia-rtlfm-radio-plugin \ +" diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index d3c3a436..3e548108 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -56,18 +56,21 @@ MAPVIEWER_append_porter = " \ " AGL_APPS = " \ + controls \ + dashboard \ hvac \ mediaplayer \ mixer \ navigation \ + phone \ + poiapp \ + radio \ settings \ " RDEPENDS_${PN}_append = " \ ces2017-demo \ linux-firmware-ralink \ - navigation \ - poiapp \ ${MAPVIEWER} \ ${MOST_HVAC} \ ${AGL_APPS} \ -- cgit 1.2.3-korg