X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo.bb;h=6b7e52394f9ab40ad13d3c66fd8c06a3bee0a5d9;hb=refs%2Fchanges%2F99%2F28499%2F1;hp=fc4f8ef9d973d31c1ff4fe8f57a40ea99d67e3aa;hpb=e8a2ae59f2d67fb8e64e1c54ab6b2774529a090b;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 fc4f8ef9d..6b7e52394 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -9,28 +9,12 @@ PACKAGES = "\ packagegroup-agl-demo \ " -ALLOW_EMPTY_${PN} = "1" - -SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \ - 'packagegroup-agl-smartdevicelink', '', d)}" - -# packages from hmi-framework aka homescreen-2017 -HOMESCREEN = "packagegroup-hmi-framework" - -# old audio package -AUDIO-OLD = "audiomanager" -# packages from new 4A framework -AUDIO-NEW = "packagegroup-agl-audio" - -RDEPENDS_${PN} += "\ - libqtappfw \ - ${HOMESCREEN} \ - ${@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 = " \ @@ -38,29 +22,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 \ " -#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)} \ " - -