diff options
15 files changed, 3 insertions, 267 deletions
diff --git a/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb b/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb deleted file mode 100644 index 6b0e054a7..000000000 --- a/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/recipes-demo-hmi/controls/controls_git.bb b/recipes-demo-hmi/controls/controls_git.bb deleted file mode 100644 index 1b19759c2..000000000 --- a/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/recipes-demo-hmi/settings-log-utils/settings-log-utils_git.bb b/recipes-demo-hmi/settings-log-utils/settings-log-utils_git.bb deleted file mode 100644 index 90dc0bee6..000000000 --- a/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/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch b/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch deleted file mode 100644 index c034d4eeb..000000000 --- a/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/recipes-demo-hmi/vod-server/files/vod-demo.service b/recipes-demo-hmi/vod-server/files/vod-demo.service deleted file mode 100644 index c783bd4aa..000000000 --- a/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/recipes-demo-hmi/vod-server/vod-server_0.1.bb b/recipes-demo-hmi/vod-server/vod-server_0.1.bb deleted file mode 100644 index d1cbb6692..000000000 --- a/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/recipes-demo-hmi/windowmanager/windowmanager_git.bb b/recipes-demo-hmi/windowmanager/windowmanager_git.bb deleted file mode 100644 index 84a43a86c..000000000 --- a/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" - diff --git a/recipes-graphics/web-runtime/web-runtime/web-runtime b/recipes-graphics/web-runtime/web-runtime/web-runtime deleted file mode 100755 index 39f3781bb..000000000 --- a/recipes-graphics/web-runtime/web-runtime/web-runtime +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -export -n QT_WAYLAND_SHELL_INTEGRATION -port=$(echo -n "$1" | sed 's,.*local.*:\([^/]*\)/.*,\1,') -token=$(echo -n "$1" | sed 's,.*token=,,') -export AFM_APP_INSTALL_DIR=$(mktemp -d) -cat << EOC > $AFM_APP_INSTALL_DIR/runxdg.toml -[application] -role = "WebBrowser" -method = "POSIX" -path = "/usr/bin/qt5/qmlscene" -params = [ - "$1", - "/usr/bin/web-runtime.qml" -] -EOC -export LD_PRELOAD=/usr/lib/libEGL.so -/usr/bin/runxdg "$port" "$token" -rm -rf $AFM_APP_INSTALL_DIR diff --git a/recipes-graphics/web-runtime/web-runtime/web-runtime-webkit.qml b/recipes-graphics/web-runtime/web-runtime/web-runtime-webkit.qml deleted file mode 100644 index 8025ab12e..000000000 --- a/recipes-graphics/web-runtime/web-runtime/web-runtime-webkit.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtWebKit 3.0 - -ApplicationWindow { - width: 1080 - height: 1488 - visible: true - WebView { - url: Qt.application.arguments[1] - anchors.fill: parent - } -} diff --git a/recipes-graphics/web-runtime/web-runtime/web-runtime.qml b/recipes-graphics/web-runtime/web-runtime/web-runtime.qml deleted file mode 100644 index 3efe51591..000000000 --- a/recipes-graphics/web-runtime/web-runtime/web-runtime.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtWebEngine 1.1 - -ApplicationWindow { - width: 1080 - height: 1488 - visible: true - flags: Qt.WindowFullScreen | Qt.FramelessWindowHint - WebEngineView { - url: Qt.application.arguments[1] - anchors.fill: parent - } -} diff --git a/recipes-graphics/web-runtime/web-runtime_0.1.bb b/recipes-graphics/web-runtime/web-runtime_0.1.bb deleted file mode 100644 index ea5acbbf7..000000000 --- a/recipes-graphics/web-runtime/web-runtime_0.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -inherit allarch - -SUMMARY = "Provides the 'web-runtime' command" -DESCRIPTION = "The command 'web-runtime' is an abstraction that allows to " - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "\ - file://web-runtime;md5sum=2245be1e6029b30966f0842e3fee75ea \ - file://web-runtime.qml;md5sum=922aeae6d596d7c83af01abca266f0df \ - file://web-runtime-webkit.qml;md5sum=4daf9df39078634c27a7923d37e82e3d \ -" - -RDEPENDS_${PN} = "\ - qtdeclarative-tools \ - qtwayland-qmlplugins \ - qtquickcontrols-qmlplugins \ - qtwebengine \ - runxdg \ - bash \ -" - -PROVIDES += "virtual/webruntime" -# add also RPROVIDES to satisfy the packagegroup -RPROVIDES_${PN} += "virtual/webruntime" - -do_configure() { - : -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/web-runtime ${D}${bindir}/web-runtime - install -m 0644 ${WORKDIR}/web-runtime.qml ${D}${bindir}/web-runtime.qml - install -m 0644 ${WORKDIR}/web-runtime-webkit.qml ${D}${bindir}/web-runtime-webkit.qml -} diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 28777e2b1..d72112b59 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -31,11 +31,11 @@ AGL_APPS = " \ radio \ settings \ messaging \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \ low-can-demo \ virtual/mixer \ ${@bb.utils.contains('IMAGE_FEATURES', 'agl-voiceagent-alexa', 'alexa-viewer' , '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \ " QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}" @@ -43,11 +43,7 @@ QTAGLEXTRAS_append = " libqtappfw" # add support for websocket in Qt and QML QTAGLEXTRAS_append = " qtwebsockets qtwebsockets-qmlplugins" -PREFERRED_PROVIDER_virtual/webruntime = "web-runtime" - -#QTAGLEXTRAS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'qtwebengine', '', d)}" -#QTAGLEXTRAS_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles" -#IMAGE_INSTALL_append = " qtwebengine-examples" +#PREFERRED_PROVIDER_virtual/webruntime = "web-runtime" # packages from hmi-framework aka homescreen-2017 HOMESCREEN = "packagegroup-hmi-framework" diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb index 5f82f096c..18787c546 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -45,10 +45,6 @@ DEMO_PLATFORM_CONF_append_ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", " SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \ 'packagegroup-agl-smartdevicelink', '', d)}" -# removed: now all enablers are in meta-agl-devel/meta-audio-soundmanager-framework -# old audio package -# AUDIO-OLD = "audiomanager" - RDEPENDS_${PN} += "\ udisks2 \ ${SMARTDEVICELINK} \ @@ -80,5 +76,3 @@ RDEPENDS_${PN} += " \ ${TTF_FONTS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \ " - - diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb index 8831e10a1..d7650564b 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb @@ -11,5 +11,4 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ - opencv \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb index 40359ed32..8d0d74b16 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb @@ -13,7 +13,6 @@ RDEPENDS_${PN} += "\ agl-service-bluetooth \ agl-service-bluetooth-map \ agl-service-bluetooth-pbap \ -agl-service-can-high-level-viwi \ agl-service-can-low-level \ agl-service-geoclue \ agl-service-geofence \ |