17 files changed, 39 insertions, 51 deletions
diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-flutter.bb
index 5cf3daf9..5cf3daf9 100644
--- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-cluster-demo-flutter.bb
diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-qt.bb
index c427af66..c427af66 100644
--- a/recipes-platform/images/agl-cluster-demo-platform.bb
+++ b/recipes-platform/images/agl-cluster-demo-qt.bb
diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb
deleted file mode 120000
index 70daba00..00000000
--- a/recipes-platform/images/agl-demo-platform-crosssdk.bb
+++ /dev/null
@@ -1 +0,0 @@
-agl-ivi-demo-platform-crosssdk.bb
-\ No newline at end of file
diff --git a/recipes-platform/images/agl-demo-platform-html5.bb b/recipes-platform/images/agl-demo-platform-html5.bb
deleted file mode 120000
index fabf5e35..00000000
--- a/recipes-platform/images/agl-demo-platform-html5.bb
+++ /dev/null
@@ -1 +0,0 @@
-agl-ivi-demo-platform-html5.bb
-\ No newline at end of file
diff --git a/recipes-platform/images/agl-demo-platform.bb b/recipes-platform/images/agl-demo-platform.bb
deleted file mode 120000
index ff29cf3e..00000000
--- a/recipes-platform/images/agl-demo-platform.bb
+++ /dev/null
@@ -1 +0,0 @@
-agl-ivi-demo-platform.bb
-\ No newline at end of file
diff --git a/recipes-platform/images/agl-ivi-crosssdk.inc b/recipes-platform/images/agl-ivi-crosssdk.inc
index 551c0343..f9f99d8d 100644
--- a/recipes-platform/images/agl-ivi-crosssdk.inc
+++ b/recipes-platform/images/agl-ivi-crosssdk.inc
@@ -18,4 +18,7 @@ TOOLCHAIN_HOST_TASK += "nativesdk-grpc nativesdk-grpc-dev"
 # Add gcc-sanitizers to support building applications using the SDK with
 # AddressSanitizer support to detect use-after-frees along with other
 # memory issue.
-TOOLCHAIN_TARGET_TASK += "gcc-sanitizers"
+TOOLCHAIN_SANITIZERS_TASKS = "gcc-sanitizers"
+# gcc-sanitizers is currently (scarthgap) not supported on RISC-V
+TOOLCHAIN_SANITIZERS_TASKS:riscv64 = ""
+TOOLCHAIN_TARGET_TASK += "${TOOLCHAIN_SANITIZERS_TASKS}"
diff --git a/recipes-platform/images/agl-ivi-demo-base.bb b/recipes-platform/images/agl-ivi-demo-base.bb
deleted file mode 100644
index da4d2684..00000000
--- a/recipes-platform/images/agl-ivi-demo-base.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require agl-image-ivi.bb
-
-DESCRIPTION = "AGL demo base image"
-
-require agl-ivi-demo-features.inc
-require agl-demo-container-guest-integration.inc
-
-AGL_DEVEL_INSTALL += "\
-    simple-can-simulator \
-    unzip \
-    mpc \
-"
-
-AGL_APPS_INSTALL = ""
-
-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-platform-flutter-simple.bb b/recipes-platform/images/agl-ivi-demo-flutter-simple.bb
index f1932df5..2e33f47b 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-flutter-simple.bb
+++ b/recipes-platform/images/agl-ivi-demo-flutter-simple.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base-flutter.bb
+require agl-ivi-image-flutter.bb
 
-DESCRIPTION = "AGL Flutter Demo Platform image"
+SUMMARY = "AGL IVI demo simple Flutter image"
 
 AGL_APPS_INSTALL += " \
     flutter-homescreen \
diff --git a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb b/recipes-platform/images/agl-ivi-demo-flutter.bb
index 81a1c804..75fd57c6 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-ivi-demo-flutter.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base-flutter.bb
+require agl-ivi-image-flutter.bb
 
-DESCRIPTION = "AGL Flutter Demo Platform image"
+SUMMARY = "AGL IVI demo Flutter image"
 
 AGL_APPS_INSTALL += " \
     flutter-ics-homescreen \
diff --git a/recipes-platform/images/agl-ivi-demo-platform-html5.bb b/recipes-platform/images/agl-ivi-demo-html5.bb
index 520b443e..34de64bd 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-html5.bb
+++ b/recipes-platform/images/agl-ivi-demo-html5.bb
@@ -1,6 +1,6 @@
-require agl-image-ivi.bb
+require agl-ivi-image.bb
 
-SUMMARY = "DEMO platform of AGL HTML5 profile"
+SUMMARY = "AGL IVI demo HTML5 image"
 DESCRIPTION = "Contains the web runtime and sample web apps"
 
 require agl-demo-container-guest-integration.inc
diff --git a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb b/recipes-platform/images/agl-ivi-demo-qt-crosssdk.bb
index c9ed07a0..d5a98b36 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
+++ b/recipes-platform/images/agl-ivi-demo-qt-crosssdk.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-platform.bb
+require agl-ivi-demo-qt.bb
 
-SUMMARY = "Cross SDK of demo AGL Distribution for IVI profile"
+SUMMARY = "Cross SDK of AGL IVI demo"
 
 DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \
 It includes the full toolchain, plus development headers and libraries \
diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-qt.bb
index 2854462c..2f0e9427 100644
--- a/recipes-platform/images/agl-ivi-demo-platform.bb
+++ b/recipes-platform/images/agl-ivi-demo-qt.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base.bb
+require agl-ivi-image.bb
 
-DESCRIPTION = "AGL Qt Demo Platform image"
+SUMMARY = "AGL IVI demo Qt image"
 
 AGL_APPS_INSTALL += " \
     dashboard \
diff --git a/recipes-platform/images/agl-image-ivi-crosssdk.bb b/recipes-platform/images/agl-ivi-image-crosssdk.bb
index be008832..74b00602 100644
--- a/recipes-platform/images/agl-image-ivi-crosssdk.bb
+++ b/recipes-platform/images/agl-ivi-image-crosssdk.bb
@@ -1,4 +1,4 @@
-require agl-image-ivi.bb
+require agl-ivi-image.bb
 
 SUMMARY = "Cross SDK of minimal AGL Distribution for IVI profile"
 
diff --git a/recipes-platform/images/agl-ivi-demo-base-flutter.bb b/recipes-platform/images/agl-ivi-image-flutter.bb
index ce2ea6bb..56a8b2f8 100644
--- a/recipes-platform/images/agl-ivi-demo-base-flutter.bb
+++ b/recipes-platform/images/agl-ivi-image-flutter.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base.bb
+require agl-ivi-image.bb
 
-DESCRIPTION = "AGL Flutter demo base image"
+SUMMARY = "AGL IVI demo base Flutter image"
 
 IMAGE_INSTALL += " \
     packagegroup-agl-demo-platform-flutter \
diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-ivi-image.bb
index 69d0ed99..12122caf 100644
--- a/recipes-platform/images/agl-image-ivi.bb
+++ b/recipes-platform/images/agl-ivi-image.bb
@@ -1,11 +1,21 @@
-SUMMARY = "A basic system of AGL distribution of IVI profile"
-
-DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile."
-
+SUMMARY = "AGL IVI demo base image"
 LICENSE = "MIT"
 
 require recipes-platform/images/agl-image-compositor.bb
 
+require agl-ivi-demo-features.inc
+require agl-demo-container-guest-integration.inc
+
+IMAGE_FEATURES += "splash package-management ssh-server-openssh"
+
+AGL_DEVEL_INSTALL += "\
+    simple-can-simulator \
+    unzip \
+    mpc \
+"
+
+AGL_APPS_INSTALL = ""
+
 IMAGE_INSTALL += " \
     packagegroup-agl-ivi-connectivity \
     packagegroup-agl-ivi-graphics \
@@ -14,10 +24,9 @@ IMAGE_INSTALL += " \
     packagegroup-agl-ivi-navigation \
     packagegroup-agl-ivi-identity \
     packagegroup-agl-ivi-services-applaunchd \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-audio", "", "packagegroup-agl-ivi-services-platform", d)} \
     iproute2 \
-    "
-
-IMAGE_FEATURES += "splash package-management ssh-server-openssh"
-
+    ${AGL_APPS_INSTALL} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-audio", "", "packagegroup-agl-ivi-services-platform", d)} \
+"
 
diff --git a/recipes-platform/images/agl-kvm-demo-platform.bb b/recipes-platform/images/agl-kvm-demo.bb
index ddb2ddb4..c2775700 100644
--- a/recipes-platform/images/agl-kvm-demo-platform.bb
+++ b/recipes-platform/images/agl-kvm-demo.bb
@@ -1,5 +1,4 @@
-DESCRIPTION = "AGL KVM+QEMU Demo Platform image."
-
+SUMMARY = "AGL KVM+QEMU Demo Platform image."
 LICENSE = "MIT"
 
 require recipes-platform/images/agl-image-compositor.bb
@@ -59,8 +58,8 @@ IMAGE_INSTALL += "\
 
 GUEST_MACHINE ?= "virtio-${TUNE_ARCH}"
 
-GUEST_VM1_IMAGE ?= "agl-ivi-demo-platform-flutter"
-GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter"
+GUEST_VM1_IMAGE ?= "agl-ivi-demo-flutter"
+GUEST_VM2_IMAGE ?= "agl-cluster-demo-flutter"
 
 GUEST_IMAGES ?= "agl-kvm-guest:${GUEST_VM1_IMAGE} agl-kvm-guest:${GUEST_VM2_IMAGE}"
 
diff --git a/recipes-platform/images/agl-telematics-demo-platform.bb b/recipes-platform/images/agl-telematics-demo.bb
index 7a113b65..987bd387 100644
--- a/recipes-platform/images/agl-telematics-demo-platform.bb
+++ b/recipes-platform/images/agl-telematics-demo.bb
@@ -1,5 +1,4 @@
-DESCRIPTION = "AGL Telematics Demo Platform image."
-
+SUMMARY = "AGL Telematics Demo Platform image."
 LICENSE = "MIT"
 
 require recipes-platform/images/agl-image-minimal.bb