From 2d38bf45515463dbe56a67029577834c1d941051 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 6 Jun 2022 18:06:42 -0400 Subject: Rework demo packagegroup and images Rework the agl-ivi-demo-platform* images to reduce duplication, and move the additions for the agl-demo-cluster-support and agl-demo-preload features. Changes: - Pull in agl-image-ivi.bb in the crosssdk image rather than duplicating its contents. This means the package additions from the demo features will be reflected in the SDK, which seems more in line with general expectations of how Yocto SDKs work. - New packagegroups are created for the agl-demo-cluster-support and agl-demo-preload features, and they are pulled into the agl-ivi-demo-platform / agl-demo-platform image using features in IMAGE_FEATURES. This avoids changing the contents of various packagegroups based on AGL_FEATURES and seems more futureproof with respect to binary packaging. - ALLOW_EMPTY has been removed in a few packagegroup recipes, as it does not seem to make sense if the packagegroup will never be empty. - The cluster-dashboard-demo-config recipe pulled into the agl-demo-cluster-support packagegroup has been added back, it was accidentally removed in the application framework cleanup. Bug-AGL: SPEC-4424 Signed-off-by: Scott Murray Change-Id: I114b77ded6c47414270acfc3cd06e998dbcc4cef --- .../packagegroup-agl-demo-cluster-support.bb | 16 ++++++++++++ .../packagegroup-agl-demo-platform-html5.bb | 25 +------------------ .../packagegroup-agl-demo-platform.bb | 24 ------------------ .../packagegroups/packagegroup-agl-demo-preload.bb | 29 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 48 deletions(-) create mode 100644 recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb create mode 100644 recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb (limited to 'recipes-platform/packagegroups') diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb new file mode 100644 index 000000000..8c3fe3b9d --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb @@ -0,0 +1,16 @@ +SUMMARY = "Extra software and configuration for cluster demo with AGL IVI profile demo platform" + +LICENSE = "MIT" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = "\ + packagegroup-agl-demo-cluster-support \ +" + +RDEPENDS:${PN} += "\ + packagegroup-agl-demo-platform \ + tbtnavi \ + cluster-demo-network-config \ +" diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb index b00883b0a..22cf712fd 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb @@ -8,26 +8,14 @@ inherit packagegroup PROVIDES = "${PACKAGES}" PACKAGES = "\ packagegroup-agl-demo-platform-html5 \ - packagegroup-agl-demo-platform-html5-devel \ " -ALLOW_EMPTY:${PN} = "1" - RDEPENDS:${PN} += "\ packagegroup-agl-image-ivi \ - " - -RDEPENDS:${PN} += "\ packagegroup-agl-profile-graphical-html5 \ packagegroup-agl-demo \ " - -RDEPENDS:${PN}:append = " \ - weston-ini-conf-landscape \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \ - " - # TODO(jdapena): replace this with HTML5 apps. AGL_APPS = " \ dashboard \ @@ -38,21 +26,10 @@ AGL_APPS = " \ settings \ " -# TODO(jdapena): review if we still need the demo-i2c stuff. - -# Hook for demo platform configuration -# ATM used for: -# 1) Adding udev configuration and scripts for supporting USB attached -# I2C devices for RTC and HVAC LED support. -DEMO_UNIT_CONF ?= "demo-i2c-udev-conf" - -# Preload only if agl-demo-preload is set -DEMO_PRELOAD = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "${DEMO_UNIT_CONF}", "",d)}" - RDEPENDS:${PN}:append = " \ + weston-ini-conf-landscape \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ ${AGL_APPS} \ - ${DEMO_PRELOAD} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index fdebd24a6..c7db0355f 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -8,16 +8,10 @@ inherit packagegroup PROVIDES = "${PACKAGES}" PACKAGES = "\ packagegroup-agl-demo-platform \ - packagegroup-agl-demo-platform-devel \ " -ALLOW_EMPTY:${PN} = "1" - RDEPENDS:${PN} += "\ packagegroup-agl-image-ivi \ - " - -RDEPENDS:${PN} += "\ packagegroup-agl-profile-graphical-qt5 \ packagegroup-hmi-framework \ packagegroup-agl-demo \ @@ -34,28 +28,10 @@ AGL_APPS = " \ radio \ " -# Cluster demo support. -CLUSTER_SUPPORT_PACKAGES = " \ - tbtnavi \ - cluster-demo-network-config \ -" -CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-cluster-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}" - -# Hook for demo platform configuration -# ATM used for: -# 1) Adding udev configuration and scripts for supporting USB attached -# I2C devices for RTC and HVAC LED support. -DEMO_UNIT_CONF ?= "demo-i2c-udev-conf" - -# Preload only if agl-demo-preload is set -DEMO_PRELOAD = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "${DEMO_UNIT_CONF}", "",d)}" - RDEPENDS:${PN}:append = " \ launcher \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip mpc' , '', d)} \ ${AGL_APPS} \ - ${CLUSTER_SUPPORT} \ - ${DEMO_PRELOAD} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb new file mode 100644 index 000000000..5a9178afd --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb @@ -0,0 +1,29 @@ +SUMMARY = "Extra software and configuration for tradeshow demo with AGL IVI profile demo platform" +LICENSE = "MIT" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + packagegroup-agl-demo-preload \ +" + +# NOTES: +# - demo-i2x-udev-conf: +# Adds udev configuration and scripts for supporting USB attached +# I2C devices for RTC and HVAC LED support. +# - sllin-demo: +# Adds systemd unit and scripting to drive configuring sllin +# driver with lin-config utility, enabling HVAC fan control and +# steering wheel controls in the demo. +# - simple-can-simulator: +# CAN message simulator for vehicle and engine speed message +# generation, with some support for the cruise control events from +# the steering wheel used in the demo setup. +# +RDEPENDS:${PN} = "\ + packagegroup-agl-demo-platform \ + demo-i2c-udev-conf \ + sllin-demo \ + simple-can-simulator \ +" -- cgit 1.2.3-korg