diff options
Diffstat (limited to 'recipes-platform/images')
6 files changed, 39 insertions, 26 deletions
diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb index ff3816d98..5cf3daf9f 100644 --- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb +++ b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb @@ -3,19 +3,19 @@ SUMMARY = "Baseline Flutter Image for Release" LICENSE = "MIT" require recipes-platform/images/agl-image-compositor.bb +require agl-demo-features.inc 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. -KUKSA_DATABROKER_PACKAGES = " \ - packagegroup-agl-kuksa-val-databroker \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ +# KUKSA.val databroker is not installed with "agl-demo-preload" +# feature enabled, since demo unit configuration points at the +# databroker on the IVI board in that setup. +IMAGE_FEATURES += " \ + kuksa-val-databroker-client \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "kuksa-val-databroker", d)} \ " - -# generic +# Generic IMAGE_INSTALL += "\ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "psplash-inverted-config", "", d)} \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "weston-ini-conf-landscape-inverted", "weston-ini-conf-landscape", d)} \ @@ -23,8 +23,6 @@ IMAGE_INSTALL += "\ packagegroup-agl-networking \ cluster-receiver \ \ - 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 a49924678..c427af66b 100644 --- a/recipes-platform/images/agl-cluster-demo-platform.bb +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -3,6 +3,7 @@ DESCRIPTION = "AGL Cluster Demo Platform image currently contains a simple clust LICENSE = "MIT" require recipes-platform/images/agl-image-compositor.bb +require agl-demo-features.inc IMAGE_FEATURES += "splash package-management ssh-server-openssh" @@ -10,12 +11,12 @@ inherit features_check 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. -KUKSA_DATABROKER_PACKAGES = " \ - packagegroup-agl-kuksa-val-databroker \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ +# KUKSA.val databroker is not installed with "agl-demo-preload" +# feature enabled, since demo unit configuration points at the +# databroker on the IVI board in that setup. +IMAGE_FEATURES += " \ + kuksa-val-databroker-client \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "kuksa-val-databroker", d)} \ " # add packages for cluster demo platform (include demo apps) here @@ -24,6 +25,5 @@ IMAGE_INSTALL += " \ 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", "", "${KUKSA_DATABROKER_PACKAGES}", d)} \ ${@bb.utils.contains("AGL_FEATURES", "AGLCI", "qemu-set-display", "", d)} \ " diff --git a/recipes-platform/images/agl-demo-features.inc b/recipes-platform/images/agl-demo-features.inc index beaad0bb4..b33749761 100644 --- a/recipes-platform/images/agl-demo-features.inc +++ b/recipes-platform/images/agl-demo-features.inc @@ -1,4 +1,5 @@ -FEATURE_PACKAGES_agl-demo-preload = "packagegroup-agl-demo-preload" -FEATURE_PACKAGES_agl-demo-cluster-support = "packagegroup-agl-demo-cluster-support" - -IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-demo-preload agl-demo-cluster-support", d)}" +FEATURE_PACKAGES_kuksa-val-databroker-client = " \ + kuksa-certificates-agl-ca \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ +" +FEATURE_PACKAGES_kuksa-val-databroker = "packagegroup-agl-kuksa-val-databroker" diff --git a/recipes-platform/images/agl-ivi-demo-base.bb b/recipes-platform/images/agl-ivi-demo-base.bb index da8d2eece..da4d26840 100644 --- a/recipes-platform/images/agl-ivi-demo-base.bb +++ b/recipes-platform/images/agl-ivi-demo-base.bb @@ -2,11 +2,10 @@ require agl-image-ivi.bb DESCRIPTION = "AGL demo base image" -require agl-demo-features.inc +require agl-ivi-demo-features.inc require agl-demo-container-guest-integration.inc AGL_DEVEL_INSTALL += "\ - packagegroup-agl-kuksa-val-databroker-devel \ simple-can-simulator \ unzip \ mpc \ @@ -18,6 +17,3 @@ IMAGE_INSTALL += " \ ${AGL_APPS_INSTALL} \ ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \ " - - - diff --git a/recipes-platform/images/agl-ivi-demo-features.inc b/recipes-platform/images/agl-ivi-demo-features.inc new file mode 100644 index 000000000..19a7792eb --- /dev/null +++ b/recipes-platform/images/agl-ivi-demo-features.inc @@ -0,0 +1,11 @@ +require agl-demo-features.inc + +FEATURE_PACKAGES_agl-demo-preload = "packagegroup-agl-demo-preload" +FEATURE_PACKAGES_agl-demo-cluster-support = "packagegroup-agl-demo-cluster-support" + +IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-demo-preload agl-demo-cluster-support", d)}" + +IMAGE_FEATURES += " \ + kuksa-val-databroker-client \ + ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "", "kuksa-val-databroker", d)} \ +" diff --git a/recipes-platform/images/agl-kvm-demo-platform.bb b/recipes-platform/images/agl-kvm-demo-platform.bb index 4337ec025..338b3e6c5 100644 --- a/recipes-platform/images/agl-kvm-demo-platform.bb +++ b/recipes-platform/images/agl-kvm-demo-platform.bb @@ -3,9 +3,16 @@ DESCRIPTION = "AGL KVM+QEMU Demo Platform image." LICENSE = "MIT" require recipes-platform/images/agl-image-compositor.bb +require agl-demo-features.inc IMAGE_FEATURES += "splash package-management ssh-server-openssh" +# If building with "agl-kvm-host-kuksa", the databroker and likely +# some clients run on the host +IMAGE_FEATURES += " \ + ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "kuksa-val-databroker kuksa-val-databroker-client", "", d)} \ +" + # Add packages for KVM+QEMU demo platform here IMAGE_INSTALL += " \ packagegroup-agl-core-connectivity \ |