X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo.bb;h=02926d34ea64db387735cae50a352d6a5987a579;hb=520b184f7209572bcce951a9afb68aa9360d517f;hp=0a648592071ffab334f9ac6daa45edd8292f4cd7;hpb=906c7f1c5234cf592cc86a9d844927ff00ac66f2;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 0a6485920..02926d34e 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -9,30 +9,12 @@ PACKAGES = "\
     packagegroup-agl-demo \
     "
 
-ALLOW_EMPTY_${PN} = "1"
-
-SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \
-    'packagegroup-agl-smartdevicelink', '', d)}"
-
-# old homescreen package
-HOMESCREEN-OLD = "homescreen"
-# packages from hmi-framework aka homescreen-2017
-HOMESCREEN-NEW = "packagegroup-hmi-framework packagegroup-hmi-framework-dev"
-
-# old audio package
-AUDIO-OLD = "audiomanager"
-# packages from new 4A framework
-AUDIO-NEW = "packagegroup-agl-audio"
-
-RDEPENDS_${PN} += "\
-    libqtappfw \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', '${HOMESCREEN-NEW}', '${HOMESCREEN-OLD}', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \
-    udisks \
-    ${SMARTDEVICELINK} \
-    "
-#    packagegroup-agl-appfw \
-#
+# Hook for demo platform configuration
+# ATM, only used to disable btwilink module on [MH]3ULCB + Kingfisher by default,
+# setting DEMO_ENABLE_BTWILINK to "true" in local.conf / site.conf re-enables.
+DEMO_ENABLE_BTWILINK ?= ""
+DEMO_PLATFORM_CONF = ""
+DEMO_PLATFORM_CONF:append:ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}"
 
 # fonts
 TTF_FONTS = " \
@@ -40,29 +22,20 @@ TTF_FONTS = " \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \
     ttf-dejavu-serif \
+    ttf-noto-emoji-color \
     source-han-sans-cn-fonts \
     source-han-sans-jp-fonts \
     source-han-sans-tw-fonts \
+    source-han-sans-kr-fonts \
     "
 
-#EXTRA_APPS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'qtwebengine', '', d)}"
-#EXTRA_APPS_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles"
-#IMAGE_INSTALL_append = " qtwebengine-examples"
-
-# add support for websocket in Qt and QML
-EXTRA_APPS_append = " qtwebsockets qtwebsockets-qmlplugins"
-PREFERRED_PROVIDER_virtual/webruntime = "web-runtime"
-
-
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
+    udisks2 \
     linux-firmware-ath9k \
+    linux-firmware-ralink \
     can-utils \
+    cannelloni \
     iproute2 \
-    python-curses \
-    dhcp-client \
+    ${DEMO_PLATFORM_CONF} \
     ${TTF_FONTS} \
-    ${EXTRA_APPS} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \
     "
-
-