Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
af-main: Use xdg-shell-v6 for agl-compositor
[AGL/meta-agl.git]
/
meta-app-framework
/
recipes-core
/
af-main
/
af-main_git.bb
diff --git
a/meta-app-framework/recipes-core/af-main/af-main_git.bb
b/meta-app-framework/recipes-core/af-main/af-main_git.bb
index
6e44c49
..
66b93db
100644
(file)
--- a/
meta-app-framework/recipes-core/af-main/af-main_git.bb
+++ b/
meta-app-framework/recipes-core/af-main/af-main_git.bb
@@
-85,7
+85,9
@@
do_install_append_class-target() {
ln -sf ../afm-system-daemon.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-system-daemon.service
ln -sf ../afm-system-daemon.socket ${D}${systemd_system_unitdir}/sockets.target.wants/afm-system-daemon.socket
fi
ln -sf ../afm-system-daemon.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-system-daemon.service
ln -sf ../afm-system-daemon.socket ${D}${systemd_system_unitdir}/sockets.target.wants/afm-system-daemon.socket
fi
- echo "QT_WAYLAND_SHELL_INTEGRATION=ivi-shell" > ${D}${afm_confdir}/unit.env.d/qt-for-ivi-shell
+
+ DEFAULT_WM_SHELL="${@bb.utils.contains('DISTRO_FEATURES', 'agl-compositor', 'xdg-shell-v6', 'ivi-shell', d)}"
+ echo "QT_WAYLAND_SHELL_INTEGRATION=${DEFAULT_WM_SHELL}" > ${D}${afm_confdir}/unit.env.d/qt-shell
}
pkg_postinst_ontarget_${PN}() {
}
pkg_postinst_ontarget_${PN}() {