3 files changed, 22 insertions, 7 deletions
diff --git a/recipes-platform/images/agl-image-ivi-crosssdk.bb b/recipes-platform/images/agl-image-ivi-crosssdk.bb
index 93537feb4..72bf8f7b0 100644
--- a/recipes-platform/images/agl-image-ivi-crosssdk.bb
+++ b/recipes-platform/images/agl-image-ivi-crosssdk.bb
@@ -1,2 +1,9 @@
-# just for backward compatibility
-require recipes-platform/images/agl-image-minimal-crosssdk.bb
+require recipes-platform/images/agl-image-minimal-crosssdk.inc
+require agl-image-ivi.inc
+
+inherit populate_sdk
+
+# Task do_populate_sdk and do_rootfs can't be exec simultaneously.
+# Both exec "createrepo" on the same directory, and so one of them
+# can failed (randomly).
+addtask do_populate_sdk after do_rootfs
diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb
index 1e5870062..b3c72de0c 100644
--- a/recipes-platform/images/agl-image-ivi.bb
+++ b/recipes-platform/images/agl-image-ivi.bb
@@ -6,8 +6,3 @@ require agl-image-ivi.inc
 
 LICENSE = "MIT"
 
-IMAGE_INSTALL_append = "\
-    packagegroup-agl-image-ivi \
-    "
-
-DISTRO_FEATURES_append = " agl-core-image-profile"
diff --git a/recipes-platform/images/agl-image-ivi.inc b/recipes-platform/images/agl-image-ivi.inc
index 610d4e464..95b6ca688 100644
--- a/recipes-platform/images/agl-image-ivi.inc
+++ b/recipes-platform/images/agl-image-ivi.inc
@@ -1,3 +1,16 @@
 require recipes-platform/images/agl-image-minimal.inc
 
+IMAGE_INSTALL_append = "\
+    packagegroup-agl-image-ivi \
+    packagegroup-agl-ivi-services \
+    agl-service-homescreen \
+    agl-service-weather \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'pipewire', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-mediaplayer', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \
+    can-utils \
+    iproute2 \
+    "
+
 IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
+DISTRO_FEATURES_append = " agl-core-image-profile"