From 9b20b1c48912b225e246a63ac84c2b6c6355654a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 24 Nov 2023 00:20:45 -0500 Subject: [PATCH] Explicitly add CA certificate package to cluster images Explicitly add kuksa-certificates-ca-agl to the cluster demo images so it will be included in both regular and agl-demo-preload builds. Also remove obsolete dependency on kuksa-val-certificates-client from the cluster-dashboard recipe. These changes fix the regular vs agl-demo-preload behavior for the agl-cluster-demo-platform build. Bug-AGL: SPEC-4986 Change-Id: I62b1d976c66824fde50a3effdcdd34b428e82d54 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29472 ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account (cherry picked from commit b5ca98fe204a7ec6f4a1cf84c19ffeb5f4deb128) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29365 Tested-by: Jan-Simon Moeller --- recipes-demo/cluster-dashboard/cluster-dashboard_git.bb | 1 - recipes-platform/images/agl-cluster-demo-platform-flutter.bb | 1 + recipes-platform/images/agl-cluster-demo-platform.bb | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb index 1404f6715..fc0b35cdb 100644 --- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb +++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb @@ -54,5 +54,4 @@ RDEPENDS:${PN} += " \ qtquickcontrols2-qmlplugins \ qtgraphicaleffects-qmlplugins \ qtsvg-plugins \ - kuksa-val-certificates-client \ " diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb index a6514c756..114e770e6 100644 --- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb +++ b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb @@ -29,6 +29,7 @@ IMAGE_INSTALL += "\ packagegroup-agl-networking \ cluster-receiver \ \ + kuksa-certificates-agl-ca \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "${IMAGE_KUKSA_PACKAGES}", d)} \ simple-can-simulator \ " diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb index f0b04a6b5..e7074c87e 100644 --- a/recipes-platform/images/agl-cluster-demo-platform.bb +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -13,6 +13,7 @@ REQUIRED_DISTRO_FEATURES = "wayland" # add packages for cluster demo platform (include demo apps) here IMAGE_INSTALL += " \ packagegroup-agl-cluster-demo-platform \ + kuksa-certificates-agl-ca \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-demo-config", "", d)} \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "weston-ini-conf-landscape-inverted", "weston-ini-conf-landscape", d)} \ ${@bb.utils.contains("AGL_FEATURES", "AGLCI", "qemu-set-display", "", d)} \ -- 2.16.6