X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo.bb;h=b0db220fc38273cd6f31646872f71c413535fad2;hb=54346ef22702aa41531aaa0e6f662cc91fce4905;hp=dd397fce1c03fbb1dbcbd0604ba16974e533813e;hpb=23237f85ab7553403b69a003c0e8f418e9df6a1d;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 dd397fce1..b0db220fc 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -9,16 +9,17 @@ PACKAGES = "\
     packagegroup-agl-demo \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \
-    'packagegroup-agl-smartdevicelink', '', d)}"
+# 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)}"
 
-RDEPENDS_${PN} += "\
-    packagegroup-agl-appfw \
-    homescreen \
-    udisks \
-    ${SMARTDEVICELINK} \
+RDEPENDS:${PN} += "\
+    udisks2 \
     "
 
 # fonts
@@ -27,24 +28,21 @@ 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 \
     "
 
-# Add webkit as workaround as webengine is broken right now
-EXTRA_APPS_append = " qtwebkit qtwebkit-examples-examples"
-#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} += " \
     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)} \
     "