3 files changed, 8 insertions, 1 deletions
diff --git a/recipes-platform/images/agl-ivi-demo-flutter.bb b/recipes-platform/images/agl-ivi-demo-flutter.bb
index 5753d58af..3a280e6f3 100644
--- a/recipes-platform/images/agl-ivi-demo-flutter.bb
+++ b/recipes-platform/images/agl-ivi-demo-flutter.bb
@@ -5,10 +5,14 @@ SUMMARY = "AGL IVI demo Flutter image"
 FLUTTER_ICS_HOMESCREEN_CONF = "flutter-ics-homescreen-conf"
 ONDEMANDNAVI_CONF = "ondemandnavi-conf"
 
+# import default music data package if PREINSTALL_MUSIC is set to "1"
+MUSICDATA ?= "${@oe.utils.conditional("PREINSTALL_MUSIC", "1", "pre-install-music-data", "", d)}"
+
 AGL_APPS_INSTALL += " \
     flutter-ics-homescreen \
     ${FLUTTER_ICS_HOMESCREEN_CONF} \
     camera-gstreamer \
     ondemandnavi \
     ${ONDEMANDNAVI_CONF} \
+    ${MUSICDATA} \
 "
diff --git a/recipes-platform/images/agl-ivi-demo-qt.bb b/recipes-platform/images/agl-ivi-demo-qt.bb
index 8fe988d06..58bab4792 100644
--- a/recipes-platform/images/agl-ivi-demo-qt.bb
+++ b/recipes-platform/images/agl-ivi-demo-qt.bb
@@ -4,6 +4,9 @@ SUMMARY = "AGL IVI demo Qt image"
 
 ONDEMANDNAVI_CONF = "ondemandnavi-conf"
 
+# import default music data package if PREINSTALL_MUSIC is set to "1"
+MUSICDATA ?= "${@oe.utils.conditional("PREINSTALL_MUSIC", "1", "pre-install-music-data", "", d)}"
+
 AGL_APPS_INSTALL += " \
     dashboard \
     hvac \
@@ -21,5 +24,6 @@ AGL_APPS_INSTALL += " \
 IMAGE_INSTALL += " \
     packagegroup-agl-demo-platform \
     weston-terminal-conf \
+    ${MUSICDATA} \
 "
 
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 78ed85782..8fdd2ea9f 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -27,6 +27,5 @@ RDEPENDS:${PN} += " \
     linux-firmware-ath9k \
     linux-firmware-ralink \
     iproute2 \
-    pre-install-music-data \
     ${TTF_FONTS} \
     "