From: Scott Murray Date: Wed, 1 Mar 2017 16:05:33 +0000 (-0500) Subject: Switch to split out demo apps X-Git-Tag: 3.0.2~3 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=9d13096870330ac11d915893c113d9e25989153c;p=AGL%2Fmeta-agl-demo.git 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: I790eee4edf97ab9c32ddfe5fe277cb7f05012ffc Signed-off-by: Scott Murray --- diff --git a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb index 7d64f83ec..7f902ba80 100644 --- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb +++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb @@ -1,116 +1,27 @@ 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" +DEPENDS = "homescreen zip-native qtquickcontrols2" + +PV = "1.0+git${SRCPV}" +PN = "ces2017-demo" -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}" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http" +SRCREV = "${AUTOREV}" # Pinned branch/SRCREV for Charming Chinook -SRC_URI_chinook = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http;branch=chinook \ - file://presets-ALS.conf \ - file://presets-CES.conf \ - file://presets-FOSDEM.conf \ - " +SRC_URI_chinook = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http;branch=chinook" SRCREV_chinook = "354195c83841240ddd5f2c5daad97d66cc9e1d28" -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 +S = "${WORKDIR}/git/" - - 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 - - - - echo " \ - \ - Radio \ - \ - Radio app. \ - Qt \ - \ - Apache 2.0 \ - \ -" > ${B}/apps/Radio/config.xml - - cd ${B}/apps/Radio/ - zip ${B}/package/radio.wgt config.xml radio - -} +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/ @@ -133,15 +44,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 \ @@ -156,4 +60,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/controls/controls_git.bb b/recipes-demo-hmi/controls/controls_git.bb new file mode 100644 index 000000000..4c95ffc7e --- /dev/null +++ b/recipes-demo-hmi/controls/controls_git.bb @@ -0,0 +1,22 @@ +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}" + +# Pinned branch/SRCREV for Charming Chinook +SRC_URI_chinook = "git://gerrit.automotivelinux.org/gerrit/apps/controls;protocol=http;branch=chinook" +SRCREV_chinook = "f6e78f4b47f2bdc3e618c30deb4e4d11f71d30a0" + +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 000000000..ca5ac29fb --- /dev/null +++ b/recipes-demo-hmi/dashboard/dashboard_git.bb @@ -0,0 +1,22 @@ +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}" + +# Pinned branch/SRCREV for Charming Chinook +SRC_URI_chinook = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=http;branch=chinook" +SRCREV_chinook = "1d7a6c0175c20d06cf4315d994685e593e41b9a0" + +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 000000000..bff084349 --- /dev/null +++ b/recipes-demo-hmi/phone/phone_git.bb @@ -0,0 +1,22 @@ +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}" + +# Pinned branch/SRCREV for Charming Chinook +SRC_URI_chinook = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=http;branch=chinook" +SRCREV_chinook = "a87aaf9b9d8c3eeae0e9006e4c73d17d03a55b93" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +# build-time dependencies +DEPENDS += "qtquickcontrols2" + +inherit qmake5 aglwgt diff --git a/recipes-demo-hmi/CES2017-demo/files/presets-ALS.conf b/recipes-demo-hmi/radio/files/presets-ALS.conf similarity index 100% rename from recipes-demo-hmi/CES2017-demo/files/presets-ALS.conf rename to recipes-demo-hmi/radio/files/presets-ALS.conf diff --git a/recipes-demo-hmi/CES2017-demo/files/presets-CES.conf b/recipes-demo-hmi/radio/files/presets-CES.conf similarity index 100% rename from recipes-demo-hmi/CES2017-demo/files/presets-CES.conf rename to recipes-demo-hmi/radio/files/presets-CES.conf diff --git a/recipes-demo-hmi/CES2017-demo/files/presets-FOSDEM.conf b/recipes-demo-hmi/radio/files/presets-FOSDEM.conf similarity index 100% rename from recipes-demo-hmi/CES2017-demo/files/presets-FOSDEM.conf rename to recipes-demo-hmi/radio/files/presets-FOSDEM.conf diff --git a/recipes-demo-hmi/radio/radio_git.bb b/recipes-demo-hmi/radio/radio_git.bb new file mode 100644 index 000000000..d48ba6925 --- /dev/null +++ b/recipes-demo-hmi/radio/radio_git.bb @@ -0,0 +1,48 @@ +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_BRANCH = "master" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=http;branch=${SRC_URI_BRANCH} \ + file://presets-ALS.conf \ + file://presets-CES.conf \ + file://presets-FOSDEM.conf \ +" +SRCREV = "${AUTOREV}" + +# Pinned branch/SRCREV for Charming Chinook +SRC_URI_BRANCH_chinook = "chinook" +SRCREV_chinook = "4dd6163184a243f80d6324c61d674383e88e9ba5" + +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/images/agl-demo-platform.bb b/recipes-platform/images/agl-demo-platform.bb index ff64f1369..d1381218e 100644 --- a/recipes-platform/images/agl-demo-platform.bb +++ b/recipes-platform/images/agl-demo-platform.bb @@ -60,10 +60,15 @@ IMAGE_MAPVIEWER_append_porter = " \ " IMAGE_AGL_APPS = " \ + controls \ + dashboard \ hvac \ mediaplayer \ mixer \ navigation \ + poiapp \ + phone \ + radio \ settings \ " @@ -75,8 +80,6 @@ IMAGE_INSTALL_append = " \ iproute2 \ python-curses \ dhcp-client \ - navigation \ - poiapp \ ${IMAGE_MAPVIEWER} \ ${IMAGE_MOST_HVAC} \ ${IMAGE_AGL_APPS} \