Code Review
/
AGL
/
meta-agl-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
packagegroups: move noto-emoji to TTF_FONTS define
[AGL/meta-agl-demo.git]
/
recipes-platform
/
packagegroups
/
packagegroup-agl-demo.bb
diff --git
a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index
5cf826b
..
5975781
100644
(file)
--- a/
recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/
recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@
-14,25
+14,19
@@
ALLOW_EMPTY_${PN} = "1"
SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \
'packagegroup-agl-smartdevicelink', '', d)}"
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
# packages from hmi-framework aka homescreen-2017
-HOMESCREEN
-NEW = "packagegroup-hmi-framework packagegroup-hmi-framework-dev
"
+HOMESCREEN
= "packagegroup-hmi-framework
"
+# removed: now all enablers are in meta-agl-devel/meta-audio-soundmanager-framework
# old audio package
# old audio package
-AUDIO-OLD = "audiomanager"
-# packages from new 4A framework
-AUDIO-NEW = "packagegroup-agl-audio"
+# AUDIO-OLD = "audiomanager"
RDEPENDS_${PN} += "\
libqtappfw \
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)} \
+ ${HOMESCREEN} \
udisks \
${SMARTDEVICELINK} \
"
udisks \
${SMARTDEVICELINK} \
"
-# packagegroup-agl-appfw \
-#
# fonts
TTF_FONTS = " \
# fonts
TTF_FONTS = " \
@@
-43,10
+37,10
@@
TTF_FONTS = " \
source-han-sans-cn-fonts \
source-han-sans-jp-fonts \
source-han-sans-tw-fonts \
source-han-sans-cn-fonts \
source-han-sans-jp-fonts \
source-han-sans-tw-fonts \
+ noto-emoji \
"
"
-EXTRA_APPS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'qtwebengine', '', d)}"
-
+#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"
#EXTRA_APPS_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles"
#IMAGE_INSTALL_append = " qtwebengine-examples"