Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dey-image-graphical: add 'weston' image feature 

For 'wayland' enabled distro features, 'weston' is added as image
feature. This is later used in poky to change the SYSTEMD_DEFAULT_TARGET
to 'graphical.target' which is the correct systemd default target for
graphical images.

This allows to delete the workaround we have in 'weston-init'
recipe to start weston automatically on boot.

Also delete some packages from CORE_IMAGE_EXTRA_INSTALL:

- weston-init and weston-examples are included as part of the 'weston'
  image feature.
- gtk+3-demo: removed from the default images, as it is a graphic framework
  we are not promoting.
- xterm: removed as weston does already provide a terminal (weston-terminal).

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-01-31 19:28:33 +01:00
parent 21ab3b1a8b
commit 9f7ed3e2b1
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
View File

@ -34,9 +34,6 @@ do_install:append() {
do_install:append() { do_install:append() {
install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
install -Dm0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/digi_background.png install -Dm0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/digi_background.png
update_file "Before=graphical.target" "Before=multi-user.target" ${D}${systemd_system_unitdir}/weston.service
update_file "WantedBy=graphical.target" "WantedBy=multi-user.target" ${D}${systemd_system_unitdir}/weston.service
} }
FILES:${PN} += "${datadir}/weston/digi_background.png" FILES:${PN} += "${datadir}/weston/digi_background.png"

5
meta-digi-dey/recipes-core/images/dey-image-graphical.inc
View File

@ -21,7 +21,7 @@ IMAGE_FEATURES += " \
eclipse-debug \ eclipse-debug \
package-management \ package-management \
ssh-server-dropbear \ ssh-server-dropbear \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', \
'', d), d)} \ '', d), d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \
@ -60,7 +60,6 @@ BAD_RECOMMENDATIONS += "eudev-hwdb"
export IMAGE_BASENAME = "dey-image-${GRAPHICAL_CORE}-${GRAPHICAL_BACKEND}" export IMAGE_BASENAME = "dey-image-${GRAPHICAL_CORE}-${GRAPHICAL_BACKEND}"
CORE_IMAGE_EXTRA_INSTALL += " \ CORE_IMAGE_EXTRA_INSTALL += " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init weston-examples gtk+3-demo', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland xterm', '', d)} \
dey-examples-digiapix \ dey-examples-digiapix \
" "