aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-platform
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-08-25 16:13:48 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-08-28 15:32:16 +0000
commit8d3e2e1610ddd72c83631bc1afdb3c2a08a01612 (patch)
treef2fd0d279686d58e73f3add9f7d8e95a48463660 /recipes-platform
parenta620f3a712bab0dd80c8ecaa49e1ebb062fabbb6 (diff)
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 <scott.murray@konsulko.com> 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 <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-platform')
-rw-r--r--recipes-platform/images/agl-image-ivi.bb1
-rw-r--r--recipes-platform/images/agl-ivi-demo-platform-flutter.bb9
-rw-r--r--recipes-platform/images/agl-ivi-demo-platform.bb9
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb2
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb2
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb12
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb21
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-kuksa-val-server.bb15
9 files changed, 56 insertions, 16 deletions
diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb
index 417665144..4fa95061a 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 85f892fc0..9d67ee31e 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 a07fa2faa..d860cd518 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 f64ea4721..10e26dc9d 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 6ae16d423..d66202958 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 f0e3a22e7..643b9d082 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 e010adad0..b76942642 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 000000000..001e3244f
--- /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 000000000..82a5b0205
--- /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 \
+"