11 files changed, 97 insertions, 11 deletions
diff --git a/recipes-platform/images/agl-demo-features.inc b/recipes-platform/images/agl-demo-features.inc
index a8112c83d..9f03fd2f6 100644
--- a/recipes-platform/images/agl-demo-features.inc
+++ b/recipes-platform/images/agl-demo-features.inc
@@ -8,3 +8,6 @@ FEATURE_PACKAGES_kuksa-val-databroker-client = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \
 "
 FEATURE_PACKAGES_kuksa-val-databroker = "packagegroup-agl-kuksa-val-databroker"
+
+DEMO_CONF_SUFFIX_GW = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-gateway-preload", "-gateway-demo", "", d)}"
+DEMO_CONF_SUFFIX = "${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "-kvm-demo", "${DEMO_CONF_SUFFIX_GW}", d)}"
diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb
index 70daba005..c9ed07a0a 120000..100644
--- a/recipes-platform/images/agl-demo-platform-crosssdk.bb
+++ b/recipes-platform/images/agl-demo-platform-crosssdk.bb
@@ -1 +1,16 @@
-agl-ivi-demo-platform-crosssdk.bb
-\ No newline at end of file
+require agl-ivi-demo-platform.bb
+
+SUMMARY = "Cross SDK of demo AGL Distribution for IVI profile"
+
+DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \
+It includes the full toolchain, plus development headers and libraries \
+for everything in the demo platform to form a standalone cross SDK."
+
+inherit agl-crosssdk
+
+require agl-ivi-crosssdk.inc
+
+inherit populate_sdk_qt5
+
+# Add qtwaylandscanner to the SDK
+TOOLCHAIN_HOST_TASK += "nativesdk-qtwayland-tools"
diff --git a/recipes-platform/images/agl-demo-platform-html5.bb b/recipes-platform/images/agl-demo-platform-html5.bb
index fabf5e35f..520b443e9 120000..100644
--- a/recipes-platform/images/agl-demo-platform-html5.bb
+++ b/recipes-platform/images/agl-demo-platform-html5.bb
@@ -1 +1,13 @@
-agl-ivi-demo-platform-html5.bb
-\ No newline at end of file
+require agl-image-ivi.bb
+
+SUMMARY = "DEMO platform of AGL HTML5 profile"
+DESCRIPTION = "Contains the web runtime and sample web apps"
+
+require agl-demo-container-guest-integration.inc
+
+CLANGSDK = "1"
+
+# add packages for demo platform (include demo apps) here
+IMAGE_INSTALL += " \
+    packagegroup-agl-demo-platform-html5 \
+"
diff --git a/recipes-platform/images/agl-demo-platform.bb b/recipes-platform/images/agl-demo-platform.bb
index ff29cf3e8..36f99a70a 120000..100644
--- a/recipes-platform/images/agl-demo-platform.bb
+++ b/recipes-platform/images/agl-demo-platform.bb
@@ -1 +1,23 @@
-agl-ivi-demo-platform.bb
-\ No newline at end of file
+require agl-ivi-demo-base.bb
+
+DESCRIPTION = "AGL Qt Demo Platform image"
+
+AGL_APPS_INSTALL += " \
+    dashboard \
+    hvac \
+    ondemandnavi \
+    ondemandnavi-conf${DEMO_CONF_SUFFIX} \
+    settings \
+    mediaplayer \
+    messaging \
+    phone \
+    radio \
+    window-management-client-grpc \
+    camera-gstreamer \
+"
+
+IMAGE_INSTALL += " \
+    packagegroup-agl-demo-platform \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \
+"
+
diff --git a/recipes-platform/images/agl-gateway-demo-platform.bb b/recipes-platform/images/agl-gateway-demo-platform.bb
new file mode 100644
index 000000000..abf563530
--- /dev/null
+++ b/recipes-platform/images/agl-gateway-demo-platform.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "AGL Gateway Demo Platform image."
+
+LICENSE = "MIT"
+
+require recipes-platform/images/agl-image-minimal.bb
+require agl-demo-features.inc
+
+IMAGE_FEATURES += " \
+    kuksa-val-databroker \
+    ssh-server-openssh \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'can-test-tools' , '', d)} \
+"
+
+IMAGE_INSTALL += " \
+    agl-vss-proxy \
+    vss-agl-gw-control-panel \
+    vss-agl-gw-hardware \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \
+    tcpdump \
+"
diff --git a/recipes-platform/images/agl-ivi-demo-control-panel.bb b/recipes-platform/images/agl-ivi-demo-control-panel.bb
index 21785caea..c9bd890d4 100644
--- a/recipes-platform/images/agl-ivi-demo-control-panel.bb
+++ b/recipes-platform/images/agl-ivi-demo-control-panel.bb
@@ -1,9 +1,19 @@
 require recipes-platform/images/agl-image-weston.bb
+require agl-demo-features.inc
 
 SUMMARY = "AGL demo control panel image"
 
 IMAGE_FEATURES += "splash package-management ssh-server-openssh"
 
+# KUKSA.val databroker is only installed with
+# "agl-demo-gateway-preload" feature, as it used as
+# a bridge to CAN output via kuksa-dbc-feeder in that
+# configuration.
+IMAGE_FEATURES += " \
+    kuksa-val-databroker-client \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-gateway-preload", "kuksa-val-databroker", "", d)} \
+"
+
 # NOTE: The client key and certificate in kuksa-certificates-agl-client
 #       seem required by kuksa-client at the moment even though client
 #       certification has been deprecated upstream, this needs further
@@ -24,4 +34,5 @@ IMAGE_INSTALL += "\
     qtwayland \
     qtwayland-plugins \
     qtwayland-qmlplugins \
+    ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "can-test-tools" , "", d)} \
 "
diff --git a/recipes-platform/images/agl-ivi-demo-features.inc b/recipes-platform/images/agl-ivi-demo-features.inc
index 9aabaafee..cc5da3efe 100644
--- a/recipes-platform/images/agl-ivi-demo-features.inc
+++ b/recipes-platform/images/agl-ivi-demo-features.inc
@@ -4,7 +4,7 @@ FEATURE_PACKAGES_agl-demo-preload = "packagegroup-agl-demo-preload"
 
 FEATURE_PACKAGES_agl-demo-cluster-support = " \
     tbtnavi \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "tbtnavi-conf-kvm-demo", "tbtnavi-conf", d)} \
+    tbtnavi-conf${DEMO_CONF_SUFFIX} \
     ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "", "kuksa-databroker-agl-demo-cluster", d)} \
 "
 
@@ -15,5 +15,5 @@ IMAGE_FEATURES += " \
 
 IMAGE_FEATURES += " \
     kuksa-val-databroker-client \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "", "kuksa-val-databroker", d)} \
+    ${@bb.utils.contains_any("AGL_FEATURES", "agl-kvm-host-kuksa agl-demo-gateway-preload", "", "kuksa-val-databroker", d)} \
 "
diff --git a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
index 81a1c8046..7cdf2c42a 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "AGL Flutter Demo Platform image"
 
 AGL_APPS_INSTALL += " \
     flutter-ics-homescreen \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "flutter-ics-homescreen-conf-kvm-demo", "flutter-ics-homescreen-conf", d)} \
+    flutter-ics-homescreen-conf${DEMO_CONF_SUFFIX} \
     camera-gstreamer \
     ondemandnavi \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "ondemandnavi-conf-kvm-demo", "ondemandnavi-conf", d)} \
+    ondemandnavi-conf${DEMO_CONF_SUFFIX} \
 "
diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb
index 2854462cf..36f99a70a 100644
--- a/recipes-platform/images/agl-ivi-demo-platform.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform.bb
@@ -6,7 +6,7 @@ AGL_APPS_INSTALL += " \
     dashboard \
     hvac \
     ondemandnavi \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "ondemandnavi-conf-kvm-demo", "ondemandnavi-conf", d)} \
+    ondemandnavi-conf${DEMO_CONF_SUFFIX} \
     settings \
     mediaplayer \
     messaging \
diff --git a/recipes-platform/images/agl-kvm-demo-platform.bb b/recipes-platform/images/agl-kvm-demo-platform.bb
index ddb2ddb45..6e3ad6f15 100644
--- a/recipes-platform/images/agl-kvm-demo-platform.bb
+++ b/recipes-platform/images/agl-kvm-demo-platform.bb
@@ -8,9 +8,11 @@ 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
+# some clients run on the host, except when building for the
+# gateway demo, where the databroker runs on the gateway.
 IMAGE_FEATURES += " \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "kuksa-val-databroker kuksa-val-databroker-client", "", d)} \
+    ${@bb.utils.contains_any("AGL_FEATURES", "agl-kvm-host-kuksa agl-demo-gateway-preload", "kuksa-val-databroker-client", "", d)} \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "kuksa-val-databroker", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "can-test-tools" , "", d)} \
 "
 
@@ -39,12 +41,12 @@ IMAGE_INSTALL += " \
 # become feasible to use.
 HOST_AUDIO_INSTALL = " \
     packagegroup-agl-ivi-services-platform \
-    agl-service-radio-conf-kvm-demo \
     packagegroup-pipewire \
     wireplumber-config-agl \
     wireplumber-policy-config-agl \
     mpd \
     udisks2 \
+    agl-service-radio-conf-kvm-demo \
     ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "packagegroup-pipewire-tools mpc" , "", d)} \
 "
 
diff --git a/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb b/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb
index a9382e5b7..9c87d1244 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-kuksa-val-databroker.bb
@@ -18,4 +18,5 @@ RDEPENDS:packagegroup-agl-kuksa-val-databroker = "\
 
 RDEPENDS:packagegroup-agl-kuksa-val-databroker-devel = "\
     kuksa-databroker-cli \
+    kuksa-client \
 "