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
Remove switch between very old and current homescreen
[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
cc93dda
..
fc4f8ef
100644
(file)
--- a/
recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/
recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@
-14,17
+14,23
@@
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"
+
+# old audio package
+AUDIO-OLD = "audiomanager"
+# packages from new 4A framework
+AUDIO-NEW = "packagegroup-agl-audio"
RDEPENDS_${PN} += "\
RDEPENDS_${PN} += "\
- packagegroup-agl-appfw \
- ${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', '${HOMESCREEN-NEW}', '${HOMESCREEN-OLD}', d)} \
+ libqtappfw \
+ ${HOMESCREEN} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \
udisks \
${SMARTDEVICELINK} \
"
udisks \
${SMARTDEVICELINK} \
"
+# packagegroup-agl-appfw \
+#
# fonts
TTF_FONTS = " \
# fonts
TTF_FONTS = " \
@@
-32,10
+38,12
@@
TTF_FONTS = " \
ttf-dejavu-sans \
ttf-dejavu-sans-mono \
ttf-dejavu-serif \
ttf-dejavu-sans \
ttf-dejavu-sans-mono \
ttf-dejavu-serif \
+ source-han-sans-cn-fonts \
+ source-han-sans-jp-fonts \
+ source-han-sans-tw-fonts \
"
"
-# Add webkit as workaround as webengine is broken right now
-EXTRA_APPS_append = " qtwebkit qtwebkit-examples-examples"
+#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"
@@
-52,4
+60,7
@@
RDEPENDS_${PN} += " \
dhcp-client \
${TTF_FONTS} \
${EXTRA_APPS} \
dhcp-client \
${TTF_FONTS} \
${EXTRA_APPS} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \
"
"
+
+