diff options
author | Scott Murray <scott.murray@konsulko.com> | 2023-08-25 16:13:48 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-08-28 15:32:16 +0000 |
commit | 8d3e2e1610ddd72c83631bc1afdb3c2a08a01612 (patch) | |
tree | f2fd0d279686d58e73f3add9f7d8e95a48463660 /recipes-demo/agl-service-hvac | |
parent | a620f3a712bab0dd80c8ecaa49e1ebb062fabbb6 (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-demo/agl-service-hvac')
4 files changed, 27 insertions, 5 deletions
diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf index 31f22ff72..ca2f4f69d 100644 --- a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf +++ b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf @@ -1,2 +1,2 @@ -[vis-client] +[kuksa-client] authorization = "/etc/xdg/AGL/agl-service-hvac/agl-service-hvac.token" diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.json b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.json new file mode 100644 index 000000000..3b348b4ad --- /dev/null +++ b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.json @@ -0,0 +1,10 @@ +{ + "sub": "local dev", + "iss": "createToken.py", + "aud": [ + "kuksa.val" + ], + "iat": 1516239022, + "exp": 1767225599, + "scope": "provide:Vehicle.Cabin.HVAC" +}
\ No newline at end of file diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.token b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.token index 770aadcff..6bbfc59dc 100644 --- a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.token +++ b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.token @@ -1 +1 @@ -eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJrdWtzYS52YWwiLCJpc3MiOiJFY2xpcHNlIEtVS1NBIERldiIsImFkbWluIjp0cnVlLCJpYXQiOjE1MTYyMzkwMjIsImV4cCI6MTc2NzIyNTU5OSwia3Vrc2EtdnNzIjp7IioiOiJydyJ9fQ.QQcVR0RuRJIoasPXYsMGZhdvhLjUalk4GcRaxhh3-0_j3CtVSZ0lTbv_Z3As5BfIYzaMlwUzFGvCVOq2MXVjRK81XOAZ6wIsyKOxva16zjbZryr2V_m3yZ4twI3CPEzJch11_qnhInirHltej-tGg6ySfLaTYeAkw4xYGwENMBBhN5t9odANpScZP_xx5bNfwdW1so6FkV1WhpKlCywoxk_vYZxo187d89bbiu-xOZUa5D-ycFkd1-1rjPXLGE_g5bc4jcQBvNBc-5FDbvt4aJlTQqjpdeppxhxn_gjkPGIAacYDI7szOLC-WYajTStbksUju1iQCyli11kPx0E66me_ZVwOX07f1lRF6D2brWm1LcMAHM3bQUK0LuyVwWPxld64uSAEsvSKsRyJERc7nZUgLf7COnUrrkxgIUNjukbdT2JVN_I-3l3b4YXg6JVD7Y5g0QYBKgXEFpZrDbBVhzo7PXPAhJD6-c3DcUQyRZExbrnFV56RwWuExphw8lYnbMvxPWImiVmB9nRVgFKD0TYaw1sidPSSlZt8Uw34VZzHWIZQAQY0BMjR33fefg42XQ1YzIwPmDx4GYXLl7HNIIVbsRsibKaJnf49mz2qnLC1K272zXSPljO11Ke1MNnsnKyUH7mcwEs9nhTsnMgEOx_TyMLRYo-VEHBDLuEOiBo
\ No newline at end of file +eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicHJvdmlkZTpWZWhpY2xlLkNhYmluLkhWQUMifQ.c-Z-DFLu0XmPR0w5Xwx33fUQzd04m-u0kBOyu0Q1ai4Vgh5oHBsMH4NI59X-wz96iX5acI2WDFhpbkjNZ9rQ7piXDmfGuvec_QZ2MAMyYjeP6F26XkapLAkq71cq0ddblQOb7gyqtUFPLssDh-j5kENZev_zAYWEvynym7FHlFdMnBdwsndnMkCAyNJiKhbYKM5glcChJ3zsQWB5BttxDpZS96C4WgvAFAoJejXzvdPxj3LEgDzCyrInrTLZjhvJNyo5aP9iR3wCe1DCYsf4nkrkvjnpr47mH2XfeXxI2RAxNFwxfUs_ylLkZfpyL6nXLLffFhl7Zm_NX2aI5qaebLBUa1imE69Ap84vplJOVkK5nBRa41HA12Y52C83mqZ1Q2jEUEit5eY1r1B-WJ0ldc3CmlQOdhICIe0vyb1cOPCLuinKHw6cP4UxybDHnMVhH7IdO-IOXqAn_EdBVdLFsa5Kz-ujoGnDZWLEKXEZI7zLzrSH8zQdONycr7BV3RU_H1jesvEgfLW-kqkELV26eallbnL2st6R0vsX4Svc7RMOzeU4NUVP6xD020G3YeIci7LDC5V2YY2k4YfwUR3DI4b0nSMFOJlRaZu0OOPZCLB5OmPynKlUDohUn37FK1HXIxKLlx2x6BQIAypAxBkiHQfX-CwCGKnWPFM9dXhrUgo
\ No newline at end of file diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb index 1ff63a9cf..ef2f74f76 100644 --- a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb +++ b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb @@ -5,19 +5,31 @@ HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/a LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -DEPENDS = "boost openssl nlohmann-json systemd" +DEPENDS = " \ + glib-2.0 \ + boost \ + openssl \ + systemd \ + protobuf-native \ + grpc-native \ + protobuf \ + grpc \ + kuksa-databroker \ +" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-hvac;protocol=https;branch=${AGL_BRANCH} \ file://agl-service-hvac.conf \ file://agl-service-hvac.token \ " -SRCREV = "f0ac80936b73a44131564c4f65ecc0c9a9db7d39" +SRCREV = "0a1426d097688912188bcb59ff59d9c596e82b4d" PV = "2.0+git${SRCPV}" S = "${WORKDIR}/git" inherit meson pkgconfig systemd +EXTRA_OEMESON += "-Dprotos=${STAGING_INCDIR}" + SYSTEMD_SERVICE:${PN} = "agl-service-hvac.service" do_install:append() { @@ -35,4 +47,4 @@ do_install:append() { FILES:${PN} += "${systemd_system_unitdir}" -RDEPENDS:${PN} += "kuksa-val" +RDEPENDS:${PN} += "kuksa-databroker kuksa-databroker-agl" |