aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb2
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb22
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster/kuksa-databroker.env1
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini6
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.token1
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service4
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb4
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-val-agl-demo-cluster.bb2
-rw-r--r--recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf2
-rw-r--r--recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.json10
-rw-r--r--recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.token2
-rw-r--r--recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb22
-rw-r--r--recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf2
-rw-r--r--recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.json10
-rw-r--r--recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.token2
-rw-r--r--recipes-demo/agl-service-hvac/agl-service-hvac_git.bb18
-rw-r--r--recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf3
-rw-r--r--recipes-demo/dashboard/dashboard/dashboard.conf2
-rw-r--r--recipes-demo/dashboard/dashboard/dashboard.token2
-rw-r--r--recipes-demo/homescreen/files/homescreen.conf2
-rw-r--r--recipes-demo/homescreen/files/homescreen.token2
-rw-r--r--recipes-demo/homescreen/homescreen_git.bb2
-rw-r--r--recipes-demo/hvac/hvac/hvac.conf2
-rw-r--r--recipes-demo/hvac/hvac/hvac.json10
-rw-r--r--recipes-demo/hvac/hvac/hvac.token2
-rw-r--r--recipes-demo/libqtappfw/libqtappfw_git.bb8
-rw-r--r--recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf2
-rw-r--r--recipes-demo/mediaplayer/mediaplayer/mediaplayer.json10
-rw-r--r--recipes-demo/mediaplayer/mediaplayer/mediaplayer.token2
-rw-r--r--recipes-demo/navigation/ondemandnavi/navigation.conf2
-rw-r--r--recipes-demo/navigation/ondemandnavi/navigation.json10
-rw-r--r--recipes-demo/navigation/ondemandnavi/navigation.token2
-rw-r--r--recipes-demo/navigation/ondemandnavi_git.bb2
-rw-r--r--recipes-demo/navigation/tbtnavi/tbtnavi.conf2
-rw-r--r--recipes-demo/navigation/tbtnavi/tbtnavi.json10
-rw-r--r--recipes-demo/navigation/tbtnavi/tbtnavi.token2
-rw-r--r--recipes-demo/navigation/tbtnavi_git.bb2
-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
46 files changed, 208 insertions, 55 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb b/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb
index 7caa2ebf2..870d2e398 100644
--- a/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb
+++ b/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb
@@ -55,4 +55,4 @@ RDEPENDS:${PN}-client += "${PN}-ca"
ALLOW_EMPTY:${PN} = "1"
-RDEPENDS:${PN} += "kuksa-val ${PN}-ca ${PN}-server ${PN}-client"
+RDEPENDS:${PN} += "${PN}-ca ${PN}-server ${PN}-client"
diff --git a/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb b/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb
new file mode 100644
index 000000000..36b77dbcc
--- /dev/null
+++ b/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb
@@ -0,0 +1,22 @@
+SUMMARY = "AGL cluster demo configuration for KUKSA.val databroker"
+HOMEPAGE = "https://github.com/eclipse/kuksa.val"
+BUGTRACKER = "https://github.com/eclipse/kuksa.val/issues"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = "file://kuksa-databroker.env"
+
+inherit allarch update-alternatives
+
+do_install() {
+ install -d ${D}${sysconfdir}/default
+ install -m 0644 ${WORKDIR}/kuksa-databroker.env ${D}${sysconfdir}/default/kuksa-databroker.agl-demo-cluster-support
+}
+
+ALTERNATIVE:${PN} = "kuksa-databroker-env"
+ALTERNATIVE_LINK_NAME[kuksa-databroker-env] = "${sysconfdir}/default/kuksa-databroker"
+ALTERNATIVE_TARGET[kuksa-databroker-env] = "${sysconfdir}/default/kuksa-databroker.agl-demo-cluster-support"
+ALTERNATIVE_PRIORITY[kuksa-databroker-env] = "20"
+
+RDEPENDS:${PN} += "kuksa-certificates-agl-ca"
diff --git a/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster/kuksa-databroker.env b/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster/kuksa-databroker.env
new file mode 100644
index 000000000..47788338d
--- /dev/null
+++ b/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster/kuksa-databroker.env
@@ -0,0 +1 @@
+EXTRA_ARGS="--vss /usr/share/vss/vss.json --tls-cert /etc/kuksa-val/Server.pem --tls-private-key /etc/kuksa-val/Server.key --jwt-public-key /etc/kuksa-val/jwt.key.pub --address 0.0.0.0"
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini
index 580d02d67..378a3437e 100644
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini
+++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini
@@ -1,7 +1,7 @@
[general]
# server type:
# switch between kuksa_databroker and kuksa_val_server
-server_type = kuksa_val_server
+server_type = kuksa_databroker
# VSS mapping file
mapping = /usr/share/vss/vss.json
@@ -9,7 +9,7 @@ mapping = /usr/share/vss/vss.json
ip = localhost
# Port for server (KUKSA.val Server or Databroker)
-port = 8090
+port = 55555
# Shall TLS be used (default False for Databroker, True for KUKSA.val Server)
tls = True
@@ -19,7 +19,7 @@ tls = True
root_ca_path=/etc/kuksa-val/CA.pem
# Token file for authorization.
-token = /etc/kuksa-dbc-feeder/dbc_feeder.json.token
+token = /etc/kuksa-dbc-feeder/dbc_feeder.token
[can]
# CAN port
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.token b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.token
new file mode 100644
index 000000000..8ce854f34
--- /dev/null
+++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.token
@@ -0,0 +1 @@
+eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicHJvdmlkZSJ9.OJWzTvDjcmeWyg3vmBR5TEtqYaHq8HrpFLlTKZAfDBAQBUHpyUEboJ97jfWuWgBnTpnfboyfAbwvLqo6bEVZ6tXzF8n9LtW6HmPbIWoDqXuobM2grUCVaGKuOcnCpMCQYChziqHbYwRJYP9nkYgbQU1kE4dN7880Io4xzq0GEbWksB2CVpOoExQUmCZpCohPs-XEkdmXhcUKnWnOeiSsRGKusx987vpY_WOXh6WE7DfJgzAgpPDo33qI7zQuTzUILORQsiHmsrQO0-zcvokNjaQUzlt5ETZ7MQLCtiUQaN0NMbDMCWkmSfNvZ5hKCNbfr2FaiMzrGBOQdvQiFo-DqZKGNweaGpufYXuaKfn3SXKoDr8u1xDE5oKgWMjxDR9pQYGzIF5bDXITSywCm4kN5DIn7e2_Ga28h3rBl0t0ZT0cwlszftQRueDTFcMns1u9PEDOqf7fRrhjq3zqpxuMAoRANVd2z237eBsS0AvdSIxL52N4xO8P_h93NN8Vaum28fTPxzm8p9WlQh4mgUelggtT415hLcxizx15ARIRG0RiW91Pglzt4WRtXHnsg93Ixd3yXXzZ2i4Y0hqhj_L12SsXunK2VxKup2sFCQz6wM-t_7ADmNYcs80idzsadY8rYKDV8N1WqOOd4ANG_nzWa86Tyu6wAwhDVag5nbFmLZQ \ No newline at end of file
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service
index dfcbb4df8..a30018c6f 100644
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service
+++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service
@@ -1,7 +1,7 @@
[Unit]
Description=Eclipse KUKSA.val DBC feeder
-Requires=kuksa-val.service can-dev-helper.service
-After=kuksa-val.service can-dev-helper.service
+Requires=kuksa-databroker.service can-dev-helper.service
+After=kuksa-databroker.service can-dev-helper.service
[Service]
ExecStart=/usr/bin/dbcfeeder.py
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb
index e1e853f4e..809152bb0 100644
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb
+++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/eclipse/kuksa.val.feeders.git;protocol=https;branch=
file://0002-dbc2val-usability-improvements.patch \
file://0003-dbc2val-fix-token-file-configuration-option.patch \
file://config.ini \
- file://dbc_feeder.json.token \
+ file://dbc_feeder.token \
file://agl-vcar.dbc \
file://kuksa-dbc-feeder.service \
"
@@ -34,7 +34,7 @@ do_install:append() {
# Token should ideally not be readable by other users.
# The potential for running the feeder as non-root will take some
# investigation.
- install -m 0600 ${WORKDIR}/dbc_feeder.json.token ${D}${sysconfdir}/kuksa-dbc-feeder/
+ install -m 0600 ${WORKDIR}/dbc_feeder.token ${D}${sysconfdir}/kuksa-dbc-feeder/
install -m 0644 ${WORKDIR}/agl-vcar.dbc ${D}${sysconfdir}/kuksa-dbc-feeder/
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${systemd_system_unitdir}
diff --git a/recipes-connectivity/kuksa-val/kuksa-val-agl-demo-cluster.bb b/recipes-connectivity/kuksa-val/kuksa-val-agl-demo-cluster.bb
index 1f1a6411f..17e9e3c9c 100644
--- a/recipes-connectivity/kuksa-val/kuksa-val-agl-demo-cluster.bb
+++ b/recipes-connectivity/kuksa-val/kuksa-val-agl-demo-cluster.bb
@@ -19,4 +19,4 @@ ALTERNATIVE_LINK_NAME[kuksa-val-env] = "${sysconfdir}/default/kuksa-val"
ALTERNATIVE_TARGET[kuksa-val-env] = "${sysconfdir}/default/kuksa-val.agl-demo-cluster-support"
ALTERNATIVE_PRIORITY[kuksa-val-env] = "20"
-RDEPENDS:${PN} += "kuksa-val"
+RDEPENDS:${PN} += "kuksa-certificates-agl-client"
diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf
index 6bf92de55..e0d84f8f8 100644
--- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf
@@ -1,2 +1,2 @@
-[vis-client]
+[kuksa-client]
authorization = "/etc/xdg/AGL/agl-service-audiomixer/agl-service-audiomixer.token"
diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.json b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.json
new file mode 100644
index 000000000..674d943f1
--- /dev/null
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.json
@@ -0,0 +1,10 @@
+{
+ "sub": "local dev",
+ "iss": "createToken.py",
+ "aud": [
+ "kuksa.val"
+ ],
+ "iat": 1516239022,
+ "exp": 1767225599,
+ "scope": "provide:Vehicle.Cabin.Infotainment.Media.Volume read:Vehicle.Cabin.SteeringWheel.Switches"
+}
diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.token b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.token
index 770aadcff..5cec909ce 100644
--- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.token
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.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.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicHJvdmlkZTpWZWhpY2xlLkNhYmluLkluZm90YWlubWVudC5NZWRpYS5Wb2x1bWUgcmVhZDpWZWhpY2xlLkNhYmluLlN0ZWVyaW5nV2hlZWwuU3dpdGNoZXMifQ.DEibWThztGFR4Y7uvaDUAfcBywKP_r4b20zX2r_SH8BkERbW4j-KAY8WnV1F1mk8u4rY2xuGhLV9wiccLLRdXP2i1eBVgvH2sGFAtHcTR4-ilp-szrV9N5cUnTnsHgSQeWZqIY0q4LC9KOBln2yxo54J1s8Ys8mGAwZGdJqb1rTIsuXQueWlDbCX6VWD1Votq9B3KjliS9Yx78WnnGKjldv3nkC9jqavDkTttt_oghnRYIRUqKBDPFrhOToBkKa7-r84Q19c62wWRcj1TwfYYHX2kwg-n3Ny6o-TqHMSFxyLVeyTTYkNaMPIBfc3XRvA5ZU0MglvA5y3Hm2ZhXI7wlk4og0eCylNcmhQkLXS0nqo-2CwPp_wReQTQEf3kZf7JA3kZ8kmIY7RoWbmCaaJwdWFyLW6SE-t8xghChAaFU8tmXhUs0kG-2VAEfyXyNQvTZKyziVXcEYvtSQUh-YUjubRo3BVH8iv1yPAlm8hX1EcyfPgYD9T6l6o9JSb0OJh4a-jY1Le5v03VKR3VLiZBw7eSbgbhzRqiooduCjgow9e4yZStyE7myKuTPG1CZDbG-_ZDwrrzdstZ4u4pZYRQDJzPGiRIsC2fQ2IQ2_0zeZhA-KGgFHc0lVuPggkck--uIe2EI_HXtEWWcWz68OHY1pMllW5sNCc8HlS5jDHcOk \ No newline at end of file
diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
index e241e79a6..5bf1e2c35 100644
--- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
@@ -2,22 +2,36 @@ SUMMARY = "Audio Mixer Service Daemon"
DESCRIPTION = "AGL Audio Mixer Service Daemon"
HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-service-audiomixer"
SECTION = "apps"
-LICENSE = "MIT"
+LICENSE = "MIT & Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;beginline=3;md5=e8ad01a5182f2c1b3a2640e9ea268264"
-DEPENDS = "boost openssl nlohmann-json systemd pipewire wireplumber"
+DEPENDS = " \
+ glib-2.0 \
+ boost \
+ openssl \
+ systemd \
+ pipewire \
+ wireplumber \
+ protobuf-native \
+ grpc-native \
+ protobuf \
+ grpc \
+ kuksa-databroker \
+"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-audiomixer.git;protocol=https;branch=${AGL_BRANCH} \
file://agl-service-audiomixer.conf \
file://agl-service-audiomixer.token \
"
-SRCREV = "fdd9d0964a0fe7aadfcef33c9e9c1f183ca10820"
+SRCREV = "82c1c0ab04219f9453f1b3a14a9754068e360583"
PV = "2.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit meson pkgconfig systemd
+EXTRA_OEMESON += "-Dprotos=${STAGING_INCDIR}"
+
SYSTEMD_SERVICE:${PN} = "agl-service-audiomixer.service"
do_install:append() {
@@ -35,4 +49,4 @@ do_install:append() {
FILES:${PN} += "${systemd_system_unitdir}"
-RDEPENDS:${PN} += "kuksa-val"
+RDEPENDS:${PN} += "kuksa-databroker"
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"
diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf
index 922ab0a66..87fc79a85 100644
--- a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf
+++ b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf
@@ -1,3 +1,4 @@
-[vis-client]
+[kuksa-client]
server = "192.168.10.2"
+tls-server-name = "localhost"
authorization = "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token"
diff --git a/recipes-demo/dashboard/dashboard/dashboard.conf b/recipes-demo/dashboard/dashboard/dashboard.conf
index 23695db39..87467ef02 100644
--- a/recipes-demo/dashboard/dashboard/dashboard.conf
+++ b/recipes-demo/dashboard/dashboard/dashboard.conf
@@ -1,2 +1,2 @@
-[vis-client]
+[kuksa-client]
authorization = "/etc/xdg/AGL/dashboard/dashboard.token"
diff --git a/recipes-demo/dashboard/dashboard/dashboard.token b/recipes-demo/dashboard/dashboard/dashboard.token
index 770aadcff..10fafb537 100644
--- a/recipes-demo/dashboard/dashboard/dashboard.token
+++ b/recipes-demo/dashboard/dashboard/dashboard.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
+eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicmVhZCJ9.P6tJPRSJWB51UOFDFs8qQ-lGqb1NoWgCekHUKyMiYcs8sR3FGVKSRjSkcqv1tXOlILvqhUwyuTKui25_kFKkTPv47GI0xAqcXtaTmDwHAWZHFC6HWGWGXohu7XvURrim5kMRVHy_VGlzasGgVap0JFk3wmaY-nyFYL_PLDjvGjIQuOwFiUtKK1PfiKviZKyc5EzPUEAoHxFL_BSOsTdDDcaydFe9rSKJzpYrj7qXY0hMJCje2BUGlSUIttR95aSjOZflSxiGystWHME8fKMmDERAx749Jpt37M3taCxBsUzER5olPz65MGzFSikfC-jH_KGmJ4zNYS65_OM1a-CPfW7Ts__pyAXxFULNMHRMIfh8Wiig4UcooMy_ZJO_DN2rq95XdaBbzRua5mxvO2wM6iu5kv4lhNxhjVNGuWFRLLJ_icBUZlvAuC3eqp66B-Y3jJNI0cSnIvsVX8YFVS3ebW8tf40OdeVou8fWZPcQsFAAafBhIxNOW8FbLZ9sRvQ-FGwZy-GyF52IJ5ZKeGfAkeEh9ZLIcyJ2YlGp4q0EOKIdwIBsWfCFtZbAvi2ornO3XvJm94NBqprpvQYN_IB7yyRxDduLjNKqqcFqnrlWYI-ZhvghWH2rEblplgHZdyVD1G9Mbv0_zdNTKFs6J7IP96aV6-4hBOt3kROlS1G7ObA \ No newline at end of file
diff --git a/recipes-demo/homescreen/files/homescreen.conf b/recipes-demo/homescreen/files/homescreen.conf
index 3ad29f516..d3998d9af 100644
--- a/recipes-demo/homescreen/files/homescreen.conf
+++ b/recipes-demo/homescreen/files/homescreen.conf
@@ -1,2 +1,2 @@
-[vis-client]
+[kuksa-client]
authorization = "/etc/xdg/AGL/homescreen/homescreen.token"
diff --git a/recipes-demo/homescreen/files/homescreen.token b/recipes-demo/homescreen/files/homescreen.token
index 770aadcff..110d3c413 100644
--- a/recipes-demo/homescreen/files/homescreen.token
+++ b/recipes-demo/homescreen/files/homescreen.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
+eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoiYWN0dWF0ZSBwcm92aWRlIn0.x-bUZwDCC663wGYrWCYjQZwQWhN1CMuKgxuIN5dUF_izwMutiqF6Xc-tnXgZa93BbT3I74WOMk4awKHBUSTWekGs3-qF6gajorbat6n5180TOqvNu4CXuIPZN5zpngf4id3smMkKOT699tPnSEbmlkj4vk-mIjeOAU-FcYA-VbkKBTsjvfFgKa2OdB5h9uZARBg5Rx7uBN3JsH1I6j9zoLid184Ewa6bhU2qniFt5iPsGJniNsKsRrrndN1KzthO13My44s56yvwSHIOrgDGbXdja_eLuOVOq9pHCjCtorPScgEuUUE4aldIuML-_j397taNP9Y3VZYVvofEK7AuiePTbzwxrZ1RAjK74h1-4ued3A2gUTjr5BsRlc9b7eLZzxLJkrqdfGAzBh_rtrB7p32TbvpjeFP30NW6bB9JS43XACUUm_S_RcyI7BLuUdnFyQDQr6l6sRz9XayYXceilHdCxbAVN0HVnBeui5Bb0mUZYIRZeY8k6zcssmokANTD8ZviDMpKlOU3t5AlXJ0nLkgyMhV9IUTwPUv6F8BTPc-CquJCUNbTyo4ywTSoODWbm3PmQ3Y46gWF06xqnB4wehLscBdVk3iAihQp3tckGhMnx5PI_Oy7utIncr4pRCMos63TnBkfrl7d43cHQTuK0kO76EWtv4ODEHgLvEAv4HA \ No newline at end of file
diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb
index 96bb75513..3d1ffb590 100644
--- a/recipes-demo/homescreen/homescreen_git.bb
+++ b/recipes-demo/homescreen/homescreen_git.bb
@@ -25,7 +25,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=http
file://homescreen.conf \
file://homescreen.token \
"
-SRCREV = "2de7cadddde53bc87328df3b1cabeff4a00932ba"
+SRCREV = "f32f949b3bd39eaebba71812b6bb2cb80d6ff90a"
S = "${WORKDIR}/git"
diff --git a/recipes-demo/hvac/hvac/hvac.conf b/recipes-demo/hvac/hvac/hvac.conf
index 4a4bb7174..dfecdc50e 100644
--- a/recipes-demo/hvac/hvac/hvac.conf
+++ b/recipes-demo/hvac/hvac/hvac.conf
@@ -1,2 +1,2 @@
-[vis-client]
+[kuksa-client]
authorization = "/etc/xdg/AGL/hvac/hvac.token"
diff --git a/recipes-demo/hvac/hvac/hvac.json b/recipes-demo/hvac/hvac/hvac.json
new file mode 100644
index 000000000..20d842a60
--- /dev/null
+++ b/recipes-demo/hvac/hvac/hvac.json
@@ -0,0 +1,10 @@
+{
+ "sub": "local dev",
+ "iss": "createToken.py",
+ "aud": [
+ "kuksa.val"
+ ],
+ "iat": 1516239022,
+ "exp": 1767225599,
+ "scope": "actuate:Vehicle.Cabin.HVAC"
+}
diff --git a/recipes-demo/hvac/hvac/hvac.token b/recipes-demo/hvac/hvac/hvac.token
index 770aadcff..76a554f8a 100644
--- a/recipes-demo/hvac/hvac/hvac.token
+++ b/recipes-demo/hvac/hvac/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.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoiYWN0dWF0ZTpWZWhpY2xlLkNhYmluLkhWQUMifQ.mDJd7Xn2C6xH9BRTURC2LtN_wlUgq3hJxBWNq8Dpelq43-4qDrNtfOEg2VV5wBcXimg64TwnopCHauqKyilgDt1q0VFIH9vcpp2m8QMV9Z06tR8A3zAJJ9DX4qU3WluY_STR5lnzRwvIW9fuZmyJ_msdnUB3vLp7bS47uekE6rX0OwoBzrw2Z38D5dnLilR4uknwMdWCVciBIg00xyj6hkufHyIyvgVI2Yfl8XMLgdklmgGIYRb3ljPxHsZ8MQkULbjOWsdRKJNqHP-lU17e9avzvBBXecakB0-Q-QSkuZr5H8gWLJG1a6jfcgbah1JfLJVkKWjX9knGT5csvXMGt7Mf9bGg43xb2bPkolKnmEXIlRxWyXGr_DSLmrVMukY2G_cmpj4E1v2cyyu6AtzhGyli3BD1O7ZTywZlLdGvrhxlQ1FU22OPLV8yyUoppGZLyAF_4tUaftcXXoE1HbqgzpvlPp7leB-pwmNTr9-wT8D5YAt5E5YrWGZOH6OYg-oV9Hl7JU-2zfFdm0stK_6P5D1xt0kHEjbML16SGJVO49aoeP8Fj_cNG5tc7GqHOkHBWlH7YUx2Ty4PLd91DGGHkhA-69vGs2Fg3ljpej-IHbsY269HTQd7v_wyQk_rEDMNqsOssjuFVHEd8vzdmQ-hG5BB5d_oWtCww6AAWqIlIOo \ No newline at end of file
diff --git a/recipes-demo/libqtappfw/libqtappfw_git.bb b/recipes-demo/libqtappfw/libqtappfw_git.bb
index 509ccc4ab..ebc99b376 100644
--- a/recipes-demo/libqtappfw/libqtappfw_git.bb
+++ b/recipes-demo/libqtappfw/libqtappfw_git.bb
@@ -2,7 +2,6 @@ SUMMARY = "AGL Qt AppFW Library"
DESCRIPTION = "libqtappfw"
HOMEPAGE = "http://docs.automotivelinux.org"
SECTION = "libs"
-
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
@@ -19,10 +18,11 @@ DEPENDS = " \
grpc-native \
protobuf \
grpc \
+ kuksa-databroker \
"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libqtappfw;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "1234b2771bc45a885df54a779dfb8a125f315f93"
+SRCREV = "e6e998428529bb788e2412e84757ad9a0b71fb32"
S = "${WORKDIR}/git"
# PV needs to be modified with SRCPV to work AUTOREV correctly
@@ -30,6 +30,8 @@ PV = "2.0.1+git${SRCPV}"
inherit meson pkgconfig
-RRECOMMENDS:${PN} += "bluez5 connman mpd"
+EXTRA_OEMESON += "-Dprotos=${STAGING_INCDIR}"
+
+RRECOMMENDS:${PN} += "bluez5 connman mpd kuksa-databroker"
BBCLASSEXTEND = "nativesdk"
diff --git a/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf
index bc9e0d833..ef4021ff0 100644
--- a/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf
+++ b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf
@@ -1,2 +1,2 @@
-[vis-client]
+[kuksa-client]
authorization = "/etc/xdg/AGL/mediaplayer/mediaplayer.token"
diff --git a/recipes-demo/mediaplayer/mediaplayer/mediaplayer.json b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.json
new file mode 100644
index 000000000..913aed082
--- /dev/null
+++ b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.json
@@ -0,0 +1,10 @@
+{
+ "sub": "local dev",
+ "iss": "createToken.py",
+ "aud": [
+ "kuksa.val"
+ ],
+ "iat": 1516239022,
+ "exp": 1767225599,
+ "scope": "read:Vehicle.Cabin.SteeringWheel.Switches"
+}
diff --git a/recipes-demo/mediaplayer/mediaplayer/mediaplayer.token b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.token
index 770aadcff..41b53374d 100644
--- a/recipes-demo/mediaplayer/mediaplayer/mediaplayer.token
+++ b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.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.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicmVhZDpWZWhpY2xlLkNhYmluLlN0ZWVyaW5nV2hlZWwuU3dpdGNoZXMifQ.Wqc1IMUcYlw9wrE4esdshe3rbUKOXcg-Jk6st2qX6POZ_27zg-AXse3Z3VQOjZX0mDpmAn_NMd5Fm8enUPy9Gvda0ZzyKkA_4zuKLw7kk3NVqUpY6g0kYVWsvNuG5qb4gM26zyUI1k2fmfAHRBJCLaxWCF2yHQd5MPomuDl271tj9IrA3jFpUxdl63jgKGb8KHRE29JWu2Gy_1C0zDqeaUaj4htcap3TfS9yPh95qlrvQRcETc9bUgeBOzaeHklIt_kqtZobGaAEH21RzAYYDed3UgbefVs_VyWBMxKbb3tOeFABwpPUqCYjL5kPnPeCODqSD3BI5OzbJIEwZGgAmJvXWPkF8ayDMZmMwp0ud4GvXnUugxhlPzmt1ysPb6zb6yUjNvXeH4my57fZg8uFjCmyA3OHME3VTvfhwycBK44I-_gYwdBK48pm2ak1X4FaPYjGYM4tqbI1tsAh6D3KSXAkEWAUAa2FR8efoh5ERsL-9Jef2_lui_4B1vIJCNA3-z9cG6Gg1HCJgGh4NHtcb4bBAyXA_3AIAOsDlA2FmMqCTjaL2s7CFLaxa2QdJoYymqPGMmWq4Qz0mmVf11i9e3lsFlpInrYSZyVSenRjNb9kFCp9MyOeVLHZhRDG90EkQZl4ONuGON7WhoornioFq5ybA35hTBHiD0TStShry7E \ No newline at end of file
diff --git a/recipes-demo/navigation/ondemandnavi/navigation.conf b/recipes-demo/navigation/ondemandnavi/navigation.conf
index fca29cdf8..00905f751 100644
--- a/recipes-demo/navigation/ondemandnavi/navigation.conf
+++ b/recipes-demo/navigation/ondemandnavi/navigation.conf
@@ -1,2 +1,2 @@
-[vis-client]
+[kuksa-client]
authorization = "/etc/xdg/AGL/navigation/navigation.token"
diff --git a/recipes-demo/navigation/ondemandnavi/navigation.json b/recipes-demo/navigation/ondemandnavi/navigation.json
new file mode 100644
index 000000000..5fe183080
--- /dev/null
+++ b/recipes-demo/navigation/ondemandnavi/navigation.json
@@ -0,0 +1,10 @@
+{
+ "sub": "local dev",
+ "iss": "createToken.py",
+ "aud": [
+ "kuksa.val"
+ ],
+ "iat": 1516239022,
+ "exp": 1767225599,
+ "scope": "provide:Vehicle.Cabin.Infotainment.Navigation provide:Vehicle.CurrentLocation"
+}
diff --git a/recipes-demo/navigation/ondemandnavi/navigation.token b/recipes-demo/navigation/ondemandnavi/navigation.token
index 770aadcff..f6edfdf25 100644
--- a/recipes-demo/navigation/ondemandnavi/navigation.token
+++ b/recipes-demo/navigation/ondemandnavi/navigation.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.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoiYWN0dWF0ZTpWZWhpY2xlLkNhYmluLkluZm90YWlubWVudC5OYXZpZ2F0aW9uLkRlc3RpbmF0aW9uU2V0IHByb3ZpZGU6VmVoaWNsZS5DYWJpbi5JbmZvdGFpbm1lbnQuTmF2aWdhdGlvbiBwcm92aWRlOlZlaGljbGUuQ3VycmVudExvY2F0aW9uIn0.hvIPaWSJBwwDEaWKxX6MAzrmZ23PRT3bWvmhujDoT43tHv2i2fSRv4U_Mlv5wenqwcn0J4XA_mdqQdtw5xtyw6ZnNSgKiSVi3QxNkm-VTuvHv4uL6-X58ot8rI6PeiJu92TQHkMUKuaXUKoyYWIlNLEZNQKD5aRhbrF0psSJNml7NbXh8T8-7BepEOb3yb6xWWFRrp0cw6v6LgNTLnxmKcyROo-syrmrV7s3x6WK-u0E-c0lqf1FzMox23elpwKPpf5KxSvc0CDeZ9IVy2iNhi-s1ubkKNEJ9RS-eyw3bbvQ_Ny7hrPbaAgce11ci4FV5cR-MPt2IAOZlQVk0zAhqENDEl25q1ME_AntodJjxy2QNBqBFTawRV6KzZvesiBrTXYPpzUuU39Wog7AuwUvhYDPyJfld8a9kqBuwbA0MUmGMd0HXbAmtIJq3fjFQstFye-m3If1BgOos202YGUV6HLtVI9vleT3Vot6Ztp70rkmZ53R447-0Wh_YQeu0ljEbyARCnsXXFbMFzKwm7K59ouK_8_hCcZhvhZ20KCjgG382PBc7cM8HcUz3sOukGWZlh5BIm6huZtoQXUKhG2wI1q678L6kZDrNOZmxl7AUucaYb_uzotAi4U-jKvEO2qKtGiV-DGzHKulwSBZIg86yprkMXn99bnMxNgXav5bYYk \ No newline at end of file
diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb
index 63b4ae78d..3baac2a0d 100644
--- a/recipes-demo/navigation/ondemandnavi_git.bb
+++ b/recipes-demo/navigation/ondemandnavi_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=ht
file://navigation.conf \
file://navigation.token \
"
-SRCREV = "f10d5dcb08d2b0c816f73b1e9b63e3da0109ac34"
+SRCREV = "d6b883ef6bdb63fb501b03d64c9a32bc29b7b2c7"
S = "${WORKDIR}/git"
diff --git a/recipes-demo/navigation/tbtnavi/tbtnavi.conf b/recipes-demo/navigation/tbtnavi/tbtnavi.conf
index c962f305c..a6e971343 100644
--- a/recipes-demo/navigation/tbtnavi/tbtnavi.conf
+++ b/recipes-demo/navigation/tbtnavi/tbtnavi.conf
@@ -1,2 +1,2 @@
-[vis-client]
+[kuksa-client]
authorization = "/etc/xdg/AGL/tbtnavi/tbtnavi.token"
diff --git a/recipes-demo/navigation/tbtnavi/tbtnavi.json b/recipes-demo/navigation/tbtnavi/tbtnavi.json
new file mode 100644
index 000000000..09084cefe
--- /dev/null
+++ b/recipes-demo/navigation/tbtnavi/tbtnavi.json
@@ -0,0 +1,10 @@
+{
+ "sub": "local dev",
+ "iss": "createToken.py",
+ "aud": [
+ "kuksa.val"
+ ],
+ "iat": 1516239022,
+ "exp": 1767225599,
+ "scope": "read:Vehicle.Cabin read:Vehicle.CurrentLocation read:Vehicle.Speed read:Vehicle.Powertrain.CombustionEngine.Speed"
+}
diff --git a/recipes-demo/navigation/tbtnavi/tbtnavi.token b/recipes-demo/navigation/tbtnavi/tbtnavi.token
index 770aadcff..fe39a4f7b 100644
--- a/recipes-demo/navigation/tbtnavi/tbtnavi.token
+++ b/recipes-demo/navigation/tbtnavi/tbtnavi.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.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicmVhZDpWZWhpY2xlLkNhYmluIHJlYWQ6VmVoaWNsZS5DdXJyZW50TG9jYXRpb24gcmVhZDpWZWhpY2xlLlNwZWVkIHJlYWQ6VmVoaWNsZS5Qb3dlcnRyYWluLkNvbWJ1c3Rpb25FbmdpbmUuU3BlZWQifQ.hIOyxqwWAshNMRo_5CIWs_hBdlcroocC_ytcdKujBoB-Xx8ntOW1Kxzxy2-WIC5n0sYDKibayIe4jxMjohe9JrM6KcZqhDbuAEhANFtlact-rTX-GJ4sjSsEsOOosIO60HAEmC27F4tPYgcVHumLC5diMyXK_2L9YYbXxWNxBnjWAVYScsd0iD7EodM_c-0ayVBEMRh6izJVGHm1pPAfgQQMFVtO3OPST2-RK55yumkeH3QswmaMyUDf8veNN8s-pxpwlsDqjcw4hHZ9okOCstq162gUIYmsh00bYyGtYPTcsWSpacXWcLupqeP1MIZwqADhGLRqrzo9pD9hCBxMmHPE3IADhGtIo_Hbh9h5NB6O9MjK4afi9omBtxqvlo6Yhz8v-kQDe1BjHaTWIifnvFPUXpy-eEKZq7PB4KLpn6EOiCHDDuB85qS_gg3lH6GJ3GKoOaZ6oMziM7zFWf7PHkJJk1C7jy8m3HFt-YQm0St9SOAKReRr3V_7nWUDd6lCrBLJrTGFz2dySGCSHH2YQst85aocaAQquqo4LnCPs_lyOQ929e3Hm3nGhcd-ksVK6wdkXAFN7Clsek6V8wb_GjbzhFPZ79sk9yyLWXwU19_XhX0bs31a8OhVYQt3ACySWzinpyLFrp7lbLb_JSa43zD5P1XNUJxNcp58Anzzv28 \ No newline at end of file
diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb
index 22a87734c..c3bacb368 100644
--- a/recipes-demo/navigation/tbtnavi_git.bb
+++ b/recipes-demo/navigation/tbtnavi_git.bb
@@ -27,7 +27,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/tbtnavi;protocol=https;b
file://tbtnavi.conf \
file://tbtnavi.token \
"
-SRCREV = "e32620e4d8fce3fb8baa606458ad7dc1bb3ed561"
+SRCREV = "7627784a867bd21e76d2889a3c99bbcfc12d3c3f"
S = "${WORKDIR}/git"
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 \
+"