diff options
Diffstat (limited to 'meta-agl-demo/recipes-demo-hmi')
33 files changed, 56 insertions, 298 deletions
diff --git a/meta-agl-demo/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb b/meta-agl-demo/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb index f98704ee..f73a97ac 100644 --- a/meta-agl-demo/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb @@ -8,10 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" DEPENDS = " \ qtquickcontrols2 \ - qlibwindowmanager \ qlibhomescreen \ af-binder \ libqtappfw \ + wayland-native \ + wayland \ + qtwayland \ + qtwayland-native \ " SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/alexa-viewer;protocol=https;branch=${AGL_BRANCH}" @@ -27,7 +30,6 @@ OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel' RDEPENDS_${PN} = " \ libqtappfw \ libafbwsc \ - qlibwindowmanager \ qlibhomescreen \ agl-service-voice-high-capabilities \ " diff --git a/meta-agl-demo/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb b/meta-agl-demo/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb deleted file mode 100644 index 6b0e054a..00000000 --- a/meta-agl-demo/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Demo app for streeting-wheel" -DESCRIPTION = "AGL demo app for streeting-wheel" -HOMEPAGE = "http://192.168.160.148/shenhui/als-meter-demo-release" -SECTION = "apps" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/als-meter-demo;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "${AGL_APP_REVISION}" - -PV = "0.1+git${SRCPV}" -S = "${WORKDIR}/git" - -# build-time dependencies -DEPENDS += "qtquickcontrols2 opencv libhomescreen qlibwindowmanager" - -# runtime dependencies -RDEPENDS_${PN} += "agl-service-steering-wheel" - -inherit qmake5 aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/controls/controls_git.bb b/meta-agl-demo/recipes-demo-hmi/controls/controls_git.bb deleted file mode 100644 index 1b19759c..00000000 --- a/meta-agl-demo/recipes-demo-hmi/controls/controls_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -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=https;branch=${AGL_BRANCH}" -SRCREV = "${AGL_APP_REVISION}" - -PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git" - -# build-time dependencies -DEPENDS += "qtquickcontrols2" - -inherit qmake5 aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/dashboard/dashboard_git.bb b/meta-agl-demo/recipes-demo-hmi/dashboard/dashboard_git.bb index 822207b1..70a8793d 100644 --- a/meta-agl-demo/recipes-demo-hmi/dashboard/dashboard_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/dashboard/dashboard_git.bb @@ -13,7 +13,7 @@ PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" # build-time dependencies -DEPENDS += "qtquickcontrols2 qttools-native qtaglextras libqtappfw" +DEPENDS += "qtquickcontrols2 qttools-native libqtappfw" inherit qmake5 aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/homescreen/homescreen_git.bb b/meta-agl-demo/recipes-demo-hmi/homescreen/homescreen_git.bb index 984e5153..bfdf06e7 100644 --- a/meta-agl-demo/recipes-demo-hmi/homescreen/homescreen_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/homescreen/homescreen_git.bb @@ -3,19 +3,21 @@ DESCRIPTION = "AGL Home Screen Application build with recipe method" HOMEPAGE = "http://docs.automotivelinux.org" LICENSE = "Apache-2.0" SECTION = "apps" -LIC_FILES_CHKSUM = "file://homescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" DEPENDS = "\ qtbase \ qtdeclarative \ qtquickcontrols2 \ agl-service-homescreen \ - agl-service-windowmanager \ agl-service-weather \ libqtappfw \ - qlibwindowmanager \ libhomescreen \ - libafb-helpers-qt \ + libafb-helpers-qt \ + wayland-native \ + wayland \ + qtwayland \ + qtwayland-native \ " inherit qmake5 systemd pkgconfig aglwgt @@ -29,3 +31,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/meta-agl-demo/recipes-demo-hmi/html5-background/html5-background_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-background/html5-background_git.bb new file mode 100644 index 00000000..c0ac220f --- /dev/null +++ b/meta-agl-demo/recipes-demo-hmi/html5-background/html5-background_git.bb @@ -0,0 +1,13 @@ +SUMMARY = "AGL HTML5 Background Application" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git/" + +SRC_URI = "git://github.com/AGL-web-applications/background.git;protocol=https;branch=master" +SRCREV = "3b8dae349d428c0230b9885f86d421d43cda5638" + +DEPENDS = "nodejs-native" + +inherit aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb index 534bd2d3..ac874755 100644 --- a/meta-agl-demo/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-dashboard;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/meta-agl-demo/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb index 68956263..37ca7073 100644 --- a/meta-agl-demo/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-homescreen;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/meta-agl-demo/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb index d45dc80d..7fc89aed 100644 --- a/meta-agl-demo/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-hvac;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/meta-agl-demo/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb index ce8a1d11..47760f67 100644 --- a/meta-agl-demo/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-launcher;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/meta-agl-demo/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb index 2b143766..a87b9bcf 100644 --- a/meta-agl-demo/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mediaplayer;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/meta-agl-demo/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb index babef57c..97b1195c 100644 --- a/meta-agl-demo/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mixer;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/meta-agl-demo/recipes-demo-hmi/html5-settings/html5-settings_git.bb b/meta-agl-demo/recipes-demo-hmi/html5-settings/html5-settings_git.bb index dea1ec35..a167b142 100644 --- a/meta-agl-demo/recipes-demo-hmi/html5-settings/html5-settings_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/html5-settings/html5-settings_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-settings;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/meta-agl-demo/recipes-demo-hmi/hvac/hvac_git.bb b/meta-agl-demo/recipes-demo-hmi/hvac/hvac_git.bb index 93e85f45..5e36e2d4 100644 --- a/meta-agl-demo/recipes-demo-hmi/hvac/hvac_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/hvac/hvac_git.bb @@ -14,8 +14,9 @@ S = "${WORKDIR}/git" # build-time dependencies DEPENDS += "qtquickcontrols2 libhomescreen \ - qlibwindowmanager qttools-native \ - qtaglextras libqtappfw" -RDEPENDS_${PN} = "agl-service-hvac" + qttools-native \ + libqtappfw" + +RDEPENDS_${PN} = "agl-service-hvac libqtappfw" inherit qmake5 aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/launcher/launcher_git.bb b/meta-agl-demo/recipes-demo-hmi/launcher/launcher_git.bb index 8c3f72f6..5b1de013 100644 --- a/meta-agl-demo/recipes-demo-hmi/launcher/launcher_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/launcher/launcher_git.bb @@ -10,8 +10,11 @@ DEPENDS = "\ qtdeclarative \ qtquickcontrols2 \ qtwebsockets \ - qlibwindowmanager \ qlibhomescreen \ + wayland-native \ + wayland \ + qtwayland \ + qtwayland-native \ " inherit qmake5 systemd pkgconfig aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/low-can-demo/low-can-demo_git.bb b/meta-agl-demo/recipes-demo-hmi/low-can-demo/low-can-demo_git.bb deleted file mode 100644 index 4edcdd89..00000000 --- a/meta-agl-demo/recipes-demo-hmi/low-can-demo/low-can-demo_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Low CAN demo HTML5 UI" -DESCRIPTION = "AGL HTML5 UI to display car metric (speed, rpm, ...) on AGL Distribution" -HOMEPAGE = "https://github.com/iotbzh/low-can-demo" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI = "gitsm://github.com/iotbzh/low-can-demo.git;protocol=https" -SRCREV = "1ede0d61cf935a1739d3ba184896a71f4afdce1a" - -PV = "4.0+git${SRCPV}" -S = "${WORKDIR}/git" - -# Run-time dependencies -RDEPENDS_${PN} += " agl-service-can-low-level" - -inherit cmake aglwgt - -AGLWGT_AUTOINSTALL_${PN} := "0" diff --git a/meta-agl-demo/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb b/meta-agl-demo/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb index 9a3690f7..974b2027 100644 --- a/meta-agl-demo/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb @@ -17,9 +17,8 @@ DEPENDS += "qtquickcontrols2 \ qtwebsockets \ libqtappfw \ libhomescreen \ - qlibwindowmanager \ " inherit qmake5 aglwgt -RDEPENDS_${PN} += "agl-service-mediaplayer" +RDEPENDS_${PN} += "agl-service-mediaplayer libqtappfw" diff --git a/meta-agl-demo/recipes-demo-hmi/messaging/messaging_git.bb b/meta-agl-demo/recipes-demo-hmi/messaging/messaging_git.bb index 5812cea7..d2e3ff80 100644 --- a/meta-agl-demo/recipes-demo-hmi/messaging/messaging_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/messaging/messaging_git.bb @@ -16,9 +16,8 @@ S = "${WORKDIR}/git" DEPENDS += "qtquickcontrols2 \ libqtappfw \ libhomescreen \ - qlibwindowmanager \ " inherit qmake5 aglwgt -RDEPENDS_${PN} += "agl-service-bluetooth-map" +RDEPENDS_${PN} += "agl-service-bluetooth-map libqtappfw" diff --git a/meta-agl-demo/recipes-demo-hmi/mixer/mixer_git.bb b/meta-agl-demo/recipes-demo-hmi/mixer/mixer_git.bb index 9524bed6..1e4a2717 100644 --- a/meta-agl-demo/recipes-demo-hmi/mixer/mixer_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/mixer/mixer_git.bb @@ -15,7 +15,6 @@ S = "${WORKDIR}/git" # build-time dependencies DEPENDS += "qtquickcontrols2 \ qtwebsockets \ - qtaglextras \ libafb-helpers-qt \ " diff --git a/meta-agl-demo/recipes-demo-hmi/navigation/navigation-demo_git.bb b/meta-agl-demo/recipes-demo-hmi/navigation/navigation-demo_git.bb index b1d0407f..7f3fcdf1 100644 --- a/meta-agl-demo/recipes-demo-hmi/navigation/navigation-demo_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/navigation/navigation-demo_git.bb @@ -17,7 +17,6 @@ RPROVIDES_${PN} = "virtual/navigation" DEPENDS += "qtquickcontrols2 \ libhomescreen \ - qlibwindowmanager \ qtvirtualkeyboard \ qtlocation \ " diff --git a/meta-agl-demo/recipes-demo-hmi/navigation/ondemandnavi_git.bb b/meta-agl-demo/recipes-demo-hmi/navigation/ondemandnavi_git.bb index c52655ef..c06dcae2 100644 --- a/meta-agl-demo/recipes-demo-hmi/navigation/ondemandnavi_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/navigation/ondemandnavi_git.bb @@ -8,9 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" DEPENDS += "qtquickcontrols2 \ qlibhomescreen \ - qlibwindowmanager \ qtlocation \ - qtaglextras \ libqtappfw \ " diff --git a/meta-agl-demo/recipes-demo-hmi/navigation/poiapp_git.bb b/meta-agl-demo/recipes-demo-hmi/navigation/poiapp_git.bb index b8db9ac9..bd3fc64d 100644 --- a/meta-agl-demo/recipes-demo-hmi/navigation/poiapp_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/navigation/poiapp_git.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=947b2d60ca3872e172034438e9801200" DEPENDS += "qtbase json-c \ - qlibwindowmanager libhomescreen \ + libhomescreen \ libqtappfw \ " diff --git a/meta-agl-demo/recipes-demo-hmi/navigation/tbtnavi_git.bb b/meta-agl-demo/recipes-demo-hmi/navigation/tbtnavi_git.bb index a61f2c92..d2e8e633 100644 --- a/meta-agl-demo/recipes-demo-hmi/navigation/tbtnavi_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/navigation/tbtnavi_git.bb @@ -14,15 +14,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ DEPENDS += "qtbase \ qtquickcontrols2 \ qlibhomescreen \ - qlibwindowmanager \ qtlocation \ libqtappfw \ + wayland-native \ + qtwayland-native \ " PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/tbtnavi;protocol=https;branch=${AGL_BRANCH}" -#SRCREV = "4a8b7a6301e4b093c99329d0a16fbee6c535f312" SRCREV = "${AGL_APP_REVISION}" S = "${WORKDIR}/git" diff --git a/meta-agl-demo/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb b/meta-agl-demo/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb index ae905ea6..b0f63d16 100644 --- a/meta-agl-demo/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb @@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" # build-time dependencies -DEPENDS += "qtquickcontrols2 libhomescreen qlibhomescreen libwindowmanager qlibwindowmanager" +DEPENDS += "qtquickcontrols2 libhomescreen qlibhomescreen" inherit qmake5 aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/phone/phone_git.bb b/meta-agl-demo/recipes-demo-hmi/phone/phone_git.bb index 553cc8ac..a8781852 100644 --- a/meta-agl-demo/recipes-demo-hmi/phone/phone_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/phone/phone_git.bb @@ -16,10 +16,9 @@ S = "${WORKDIR}/git" DEPENDS += "qtquickcontrols2 \ libqtappfw \ libhomescreen \ - qlibwindowmanager \ gstreamer1.0 \ " 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/meta-agl-demo/recipes-demo-hmi/radio/radio_git.bb b/meta-agl-demo/recipes-demo-hmi/radio/radio_git.bb index 52a981f2..7b0934fa 100644 --- a/meta-agl-demo/recipes-demo-hmi/radio/radio_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/radio/radio_git.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/r SECTION = "apps" LICENSE = "Apache-2.0 & GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ - file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=https;branch=${AGL_BRANCH} \ file://presets-ALS.conf \ @@ -19,7 +18,7 @@ S = "${WORKDIR}/git" # build-time dependencies DEPENDS = "qtquickcontrols2 rtl-sdr" -DEPENDS += "libhomescreen qlibwindowmanager libqtappfw" +DEPENDS += "libhomescreen libqtappfw" inherit qmake5 aglwgt @@ -35,4 +34,4 @@ do_install_append() { FILES_${PN} += "${sysconfdir}/xdg/AGL/*" -RDEPENDS_${PN} += "agl-service-radio" +RDEPENDS_${PN} += "agl-service-radio libqtappfw" diff --git a/meta-agl-demo/recipes-demo-hmi/settings-log-utils/settings-log-utils_git.bb b/meta-agl-demo/recipes-demo-hmi/settings-log-utils/settings-log-utils_git.bb deleted file mode 100644 index 90dc0bee..00000000 --- a/meta-agl-demo/recipes-demo-hmi/settings-log-utils/settings-log-utils_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "App for log record" -DESCRIPTION = "AGL HMI Application for demonstrating Log Record on AGL Distribution" -HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/settings-log-utils" -SECTION = "apps" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/settings-log-utils;protocol=https;branch=master" -SRCREV = "${AUTOREV}" - -PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git" - -# build-time dependencies -DEPENDS += "libqtappfw qtquickcontrols2 qtwebsockets opencv boost" -DEPENDS += "libhomescreen qlibwindowmanager qtvirtualkeyboard" - -# runtime dependencies -RDEPENDS_${PN} += " \ - agl-service-bluetooth \ - agl-service-network" - -inherit qmake5 aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/settings/settings_git.bb b/meta-agl-demo/recipes-demo-hmi/settings/settings_git.bb index 72e0323f..776c764c 100644 --- a/meta-agl-demo/recipes-demo-hmi/settings/settings_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/settings/settings_git.bb @@ -14,13 +14,14 @@ S = "${WORKDIR}/git" # build-time dependencies DEPENDS += "libqtappfw qtquickcontrols2 qt-qrcode" -DEPENDS += "libhomescreen qlibwindowmanager qtvirtualkeyboard" +DEPENDS += "libhomescreen qtvirtualkeyboard" # runtime dependencies RDEPENDS_${PN} += " \ qt-qrcode \ agl-service-bluetooth \ agl-service-network \ + libqtappfw \ " inherit qmake5 aglwgt diff --git a/meta-agl-demo/recipes-demo-hmi/taskmanager/taskmanager_git.bb b/meta-agl-demo/recipes-demo-hmi/taskmanager/taskmanager_git.bb index f616b4d7..68965eb5 100644 --- a/meta-agl-demo/recipes-demo-hmi/taskmanager/taskmanager_git.bb +++ b/meta-agl-demo/recipes-demo-hmi/taskmanager/taskmanager_git.bb @@ -18,9 +18,8 @@ DEPENDS += "qtquickcontrols2 \ qtcharts \ libqtappfw \ libhomescreen \ - qlibwindowmanager \ " inherit qmake5 aglwgt -RDEPENDS_${PN} += "agl-service-taskmanager" +RDEPENDS_${PN} += "agl-service-taskmanager libqtappfw" diff --git a/meta-agl-demo/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch b/meta-agl-demo/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch deleted file mode 100644 index c034d4ee..00000000 --- a/meta-agl-demo/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/buildX86/Makefile-Release.mk 2016-12-09 15:48:37.000000000 +0100 -+++ b/buildX86/Makefile-Release.mk 2016-12-09 16:56:35.071740652 +0100 -@@ -11,14 +11,14 @@ - MKDIR=mkdir - CP=cp - GREP=grep --NM=nm --CCADMIN=CCadmin --RANLIB=ranlib --CC=${CROSS_COMPILE}gcc --CCC=${CROSS_COMPILE}g++ --CXX=${CROSS_COMPILE}g++ --FC=${CROSS_COMPILE}gfortran --AS=${CROSS_COMPILE}as -+#NM=nm -+#CCADMIN=CCadmin -+#RANLIB=ranlib -+#CC=${CROSS_COMPILE}gcc -+#CCC=${CROSS_COMPILE}g++ -+#CXX=${CROSS_COMPILE}g++ -+#FC=${CROSS_COMPILE}gfortran -+#AS=${CROSS_COMPILE}as - - # Macros - CND_PLATFORM=GNU-Linux-x86 diff --git a/meta-agl-demo/recipes-demo-hmi/vod-server/files/vod-demo.service b/meta-agl-demo/recipes-demo-hmi/vod-server/files/vod-demo.service deleted file mode 100644 index c783bd4a..00000000 --- a/meta-agl-demo/recipes-demo-hmi/vod-server/files/vod-demo.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Video On Demand AGL Demo -After=WindowManager.service most-network-manager.service - -[Service] -Type=simple -ExecStart=/usr/bin/VideoOnDemand -p /home/root/Video - -[Install] -WantedBy=default.target diff --git a/meta-agl-demo/recipes-demo-hmi/vod-server/vod-server_0.1.bb b/meta-agl-demo/recipes-demo-hmi/vod-server/vod-server_0.1.bb deleted file mode 100644 index d1cbb669..00000000 --- a/meta-agl-demo/recipes-demo-hmi/vod-server/vod-server_0.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Build VideoOnDemand server" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -#LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ -# " - -PV = "0.1" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/vod-server;protocol=https;branch=${AGL_BRANCH}" -SRC_URI += "file://0001-Fix-cross-compilation-with-yocto.patch \ - file://vod-demo.service" - -S = "${WORKDIR}/git" -SRCREV = "faafe61dd5f88859a005a59082d57339089ddca1" - -do_install() { - install -m 0755 -d ${D}${bindir} - install -m 0755 ${S}/VideoOnDemand ${D}${bindir}/VideoOnDemand - - # Install VOD server systemd service (user) - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -m 644 -p -D ${WORKDIR}/vod-demo.service ${D}${systemd_user_unitdir}/vod-demo.service - - # Execute install manually for root user on behalf of systemctl script - # because it doesn't support user mode of systemd. - install -m 0755 -d ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/ - ln -sf ${systemd_user_unitdir}/vod-demo.service ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/vod-demo.service - sed -i "s:/home/root:${ROOT_HOME}:" ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/vod-demo.service - fi -} - -FILES_${PN} += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/vod-demo.service', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ROOT_HOME}/.config/systemd/user/default.target.wants/vod-demo.service', '', d)} \ - " diff --git a/meta-agl-demo/recipes-demo-hmi/windowmanager/windowmanager_git.bb b/meta-agl-demo/recipes-demo-hmi/windowmanager/windowmanager_git.bb deleted file mode 100644 index 84a43a86..00000000 --- a/meta-agl-demo/recipes-demo-hmi/windowmanager/windowmanager_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "AGL WindowManager Application" -DESCRIPTION = "WindowManager" -HOMEPAGE = "http://docs.automotivelinux.org" -LICENSE = "Apache-2.0" -SECTION = "apps" -S = "${WORKDIR}/git/" - -inherit qmake5 systemd -DEPENDS = " qtbase " - -# for WindowManager: -DEPENDS += " wayland-ivi-extension " - -LIC_FILES_CHKSUM = "file://windowmanager/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -SRCREV = "eeedc5e9e67917bd3346dbe5332e667757a3b28d" -# PV needs to be modified with SRCPV to work AUTOREV correctly -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/windowmanager.git;protocol=https;branch=${AGL_BRANCH}" - -PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" - -do_install() { - install -d ${D}/usr/AGL/${PN} - install -m 0755 ${B}/windowmanager/WindowManager ${D}/usr/AGL/${PN}/ - - install -d ${D}${systemd_user_unitdir} - install -m 0644 ${S}/windowmanager/conf/WindowManager.service ${D}${systemd_user_unitdir} - install -m 0644 ${S}/windowmanager/conf/WindowManager.path ${D}${systemd_user_unitdir} - - install -d ${D}${sysconfdir}/systemd/user/default.target.wants - ln -sf ${systemd_user_unitdir}/WindowManager.path ${D}${sysconfdir}/systemd/user/default.target.wants -} - -FILES_${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}" -FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug" - |