diff options
4 files changed, 7 insertions, 6 deletions
diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb index 1404f671..fc0b35cd 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-demo/libqtappfw/libqtappfw_git.bb b/recipes-demo/libqtappfw/libqtappfw_git.bb index 461889fa..6c908084 100644 --- a/recipes-demo/libqtappfw/libqtappfw_git.bb +++ b/recipes-demo/libqtappfw/libqtappfw_git.bb @@ -32,6 +32,6 @@ inherit meson pkgconfig EXTRA_OEMESON += "-Dprotos=${STAGING_INCDIR}" -RRECOMMENDS:${PN} += "bluez5 connman mpd kuksa-databroker" +RRECOMMENDS:${PN} += "bluez5 connman mpd" BBCLASSEXTEND = "nativesdk" diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb index a4620fc9..ff3816d9 100644 --- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb +++ b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb @@ -9,7 +9,7 @@ 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 in full demo # builds with the "agl-demo-preload" feature enabled. -IMAGE_KUKSA_PACKAGES = " \ +KUKSA_DATABROKER_PACKAGES = " \ packagegroup-agl-kuksa-val-databroker \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ " @@ -23,7 +23,8 @@ IMAGE_INSTALL += "\ packagegroup-agl-networking \ cluster-receiver \ \ - ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "${IMAGE_KUKSA_PACKAGES}", d)} \ + kuksa-certificates-agl-ca \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "${KUKSA_DATABROKER_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 385d7809..a4992467 100644 --- a/recipes-platform/images/agl-cluster-demo-platform.bb +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -13,7 +13,7 @@ REQUIRED_DISTRO_FEATURES = "wayland" # Break out KUKSA.val packages, as demo unit configuration # points at KUKSA.val server on the IVI board in full demo # builds with the "agl-demo-preload" feature enabled. -IMAGE_KUKSA_PACKAGES = " \ +KUKSA_DATABROKER_PACKAGES = " \ packagegroup-agl-kuksa-val-databroker \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ " @@ -21,8 +21,9 @@ IMAGE_KUKSA_PACKAGES = " \ # 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", "agl-demo-preload", "", "${IMAGE_KUKSA_PACKAGES}", d)} \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "${KUKSA_DATABROKER_PACKAGES}", d)} \ ${@bb.utils.contains("AGL_FEATURES", "AGLCI", "qemu-set-display", "", d)} \ " |