From 888f57114cc7913c56334a1a4a2bcb7af37babba Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 25 Sep 2023 10:46:54 -0400 Subject: [PATCH] Remove KUKSA.val server from Flutter images Remove KUKSA.val server packagegroup from Flutter demo images now that all the applications have been converted to using the databroker. Bug-AGL: SPEC-4762 Change-Id: I50237b668bd7b6aac61bf6d893b14e7f5591760f Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29245 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 --- .../images/agl-cluster-demo-platform-flutter.bb | 14 ++++---------- .../packagegroup-agl-demo-platform-flutter.bb | 1 - 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb index fc3cc51fc..6cdafb642 100644 --- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb +++ b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb @@ -7,17 +7,11 @@ require recipes-platform/images/agl-image-compositor.bb IMAGE_FEATURES += "splash package-management ssh-server-openssh" # Break out KUKSA.val packages, as demo unit configuration -# points at KUKSA.val server on the IVI board instead of -# running the full stack locally. +# points at KUKSA.val server on the IVI board in full demo +# builds with the "agl-demo-preload" feature enabled. IMAGE_KUKSA_PACKAGES = " \ - kuksa-val \ - kuksa-databroker \ - kuksa-val-agl \ - kuksa-databroker-agl \ - kuksa-certificates-agl \ - kuksa-dbc-feeder \ - kuksa-vss-init \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'kuksa-databroker-cli' , '', d)} \ + packagegroup-agl-kuksa-val-databroker \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ " # generic diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb index d66202958..8e645445a 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb @@ -12,7 +12,6 @@ PACKAGES = "\ RDEPENDS:${PN} += "\ packagegroup-agl-image-ivi \ - packagegroup-agl-kuksa-val-server \ packagegroup-agl-kuksa-val-databroker \ packagegroup-agl-demo \ " -- 2.16.6