From 8d3e2e1610ddd72c83631bc1afdb3c2a08a01612 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 25 Aug 2023 16:13:48 -0400 Subject: Switch Qt demo to KUKSA.val databroker Changes to switch the Qt-based agl-demo-platform demo from using the older KUKSA.val server to the new gRPC based databroker. The Flutter demo's vehicle signalling behavior ends up a bit broken by these, but the image still boots and basic things still work. A follow on set of changes will convert the Flutter apps to the new gRPC API and remove the KUKSA.val server completely. Notable changes: - Updated libqtappfw, homescreen, ondemandnavi, and tbtnavi recipes to pick up changes to switch to using the databroker. - Updated agl-service-audiomixer and agl-service-hvac recipes to pick up their rework for using the databroker. - All the Qt demo applications that use the VehicleSignals class from libqtappfw have had their .conf and .token files updated to work with the databroker. As well, the JSON files used to create the new app-specific authorization tokens have been checked in to provide a reference of how things are configured. - The DBC feeder configuration has been changed to push into the databroker. Having a duplicate instance to also push into the older server has not been set up, as hopefully the Flutter demo conversion will follow on quickly enough to not require it. - Packagegroups for the KUKSA.val server and databroker have been factored out and are used instead of using the agl-ivi-services packagegroup. - kuksa-databroker-cli and the simple CAN simulator script are now included into the demo images when building with agl-devel. Bug-AGL: SPEC-4762 Change-Id: I416bcfbf961535062043ef54acdea6c353f84af1 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29171 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- recipes-platform/images/agl-image-ivi.bb | 1 - .../images/agl-ivi-demo-platform-flutter.bb | 9 ++++++++- recipes-platform/images/agl-ivi-demo-platform.bb | 9 ++++++++- .../packagegroup-agl-demo-cluster-support.bb | 2 +- .../packagegroup-agl-demo-platform-flutter.bb | 2 ++ .../packagegroups/packagegroup-agl-demo-platform.bb | 1 + .../packagegroups/packagegroup-agl-ivi-services.bb | 12 ------------ .../packagegroup-agl-kuksa-val-databroker.bb | 21 +++++++++++++++++++++ .../packagegroup-agl-kuksa-val-server.bb | 15 +++++++++++++++ 9 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb create mode 100644 recipes-platform/packagegroups/packagegroup-agl-kuksa-val-server.bb (limited to 'recipes-platform') diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb index 41766514..4fa95061 100644 --- a/recipes-platform/images/agl-image-ivi.bb +++ b/recipes-platform/images/agl-image-ivi.bb @@ -9,7 +9,6 @@ require recipes-platform/images/agl-image-compositor.bb IMAGE_INSTALL += " \ packagegroup-agl-image-ivi \ packagegroup-agl-ivi-services \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-ivi-services-devel' , '', d)} \ can-utils \ iproute2 \ " diff --git a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb index 85f892fc..9d67ee31 100644 --- a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb +++ b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb @@ -5,10 +5,17 @@ DESCRIPTION = "AGL Flutter based Demo Platform image" require agl-demo-features.inc require agl-demo-container-guest-integration.inc -# add packages for demo platform (include demo apps) here +# Add packages for demo platform (include demo apps) here + +AGL_DEVEL_INSTALL += "\ + packagegroup-agl-kuksa-val-databroker-devel \ + simple-can-simulator \ +" + IMAGE_INSTALL += " \ packagegroup-agl-demo-platform-flutter \ weston-ini-conf-flutter \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \ " diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb index a07fa2fa..d860cd51 100644 --- a/recipes-platform/images/agl-ivi-demo-platform.bb +++ b/recipes-platform/images/agl-ivi-demo-platform.bb @@ -5,9 +5,16 @@ DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and demos require agl-demo-features.inc require agl-demo-container-guest-integration.inc -# add packages for demo platform (include demo apps) here +# Add packages for demo platform (include demo apps) here + +AGL_DEVEL_INSTALL += "\ + packagegroup-agl-kuksa-val-databroker-devel \ + simple-can-simulator \ +" + IMAGE_INSTALL += " \ packagegroup-agl-demo-platform \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb index f64ea472..10e26dc9 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb @@ -11,5 +11,5 @@ PACKAGES = "\ RDEPENDS:${PN} += "\ tbtnavi \ - kuksa-val-agl-demo-cluster \ + kuksa-databroker-agl-demo-cluster \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb index 6ae16d42..d6620295 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb @@ -12,6 +12,8 @@ PACKAGES = "\ RDEPENDS:${PN} += "\ packagegroup-agl-image-ivi \ + packagegroup-agl-kuksa-val-server \ + packagegroup-agl-kuksa-val-databroker \ packagegroup-agl-demo \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index f0e3a22e..643b9d08 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -12,6 +12,7 @@ PACKAGES = "\ RDEPENDS:${PN} += "\ packagegroup-agl-image-ivi \ + packagegroup-agl-kuksa-val-databroker \ packagegroup-agl-demo \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb index e010adad..b7694264 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb @@ -5,22 +5,10 @@ inherit packagegroup PACKAGES = "\ packagegroup-agl-ivi-services \ - packagegroup-agl-ivi-services-devel \ " RDEPENDS:${PN} += "\ - kuksa-val \ - kuksa-databroker \ - kuksa-val-agl \ - kuksa-databroker-agl \ - kuksa-certificates-agl \ - kuksa-dbc-feeder \ - kuksa-vss-init \ agl-service-hvac \ agl-service-audiomixer \ agl-service-radio \ " - -RDEPENDS:${PN}-devel += "\ - kuksa-databroker-cli \ - " diff --git a/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb b/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb new file mode 100644 index 00000000..001e3244 --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb @@ -0,0 +1,21 @@ +SUMMARY = "KUKSA.val databroker packages" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-kuksa-val-databroker \ + packagegroup-agl-kuksa-val-databroker-devel \ +" + +RDEPENDS:packagegroup-agl-kuksa-val-databroker = "\ + kuksa-databroker \ + kuksa-databroker-agl \ + kuksa-certificates-agl \ + kuksa-dbc-feeder \ + kuksa-vss-init \ +" + +RDEPENDS:packagegroup-agl-kuksa-val-databroker-devel = "\ + kuksa-databroker-cli \ +" diff --git a/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-server.bb b/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-server.bb new file mode 100644 index 00000000..82a5b020 --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-server.bb @@ -0,0 +1,15 @@ +SUMMARY = "KUKSA.val server packages" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-kuksa-val-server \ +" + +RDEPENDS:packagegroup-agl-kuksa-val-server = "\ + kuksa-val \ + kuksa-val-agl \ + kuksa-certificates-agl \ + kuksa-dbc-feeder \ +" -- cgit 1.2.3-korg