From 69d40194167df655116115f8864251594dbc8744 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 30 Apr 2020 16:04:22 +0200 Subject: Cleanup post next merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove recipes no longer used by any image. - als-meter-demo - controls - settings-log-utils - vod-server - windowmanager (old version) - web-runtime (replaced with chromium) Packagegroup updates. Signed-off-by: Jan-Simon Möller Change-Id: I2824a1a645a6f31e2f2ee9023548aefd7710aa07 --- .../packagegroups/packagegroup-agl-demo-platform.bb | 10 +++------- recipes-platform/packagegroups/packagegroup-agl-demo.bb | 6 ------ .../packagegroups/packagegroup-agl-ivi-graphics.bb | 1 - .../packagegroups/packagegroup-agl-ivi-services.bb | 1 - 4 files changed, 3 insertions(+), 15 deletions(-) (limited to 'recipes-platform') 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 \ -- cgit 1.2.3-korg