diff options
Diffstat (limited to 'recipes-graphics/wayland')
-rw-r--r-- | recipes-graphics/wayland/wayland_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston-init.bbappend | 10 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston_%.bbappend | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/recipes-graphics/wayland/wayland_%.bbappend b/recipes-graphics/wayland/wayland_%.bbappend index e5bbf4a..ca2b296 100644 --- a/recipes-graphics/wayland/wayland_%.bbappend +++ b/recipes-graphics/wayland/wayland_%.bbappend @@ -1,5 +1,5 @@ # until fully tested, prefer `libwayland-egl` provided by `userland` instead of `wayland` when not using vc4graphics -do_install_append_rpi () { +do_install:append:rpi () { if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "0" ]; then rm -f ${D}${libdir}/libwayland-egl* rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 0000000..b6d6f2e --- /dev/null +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +do_install:append:rpi() { + if [ -e ${D}/${sysconfdir}/init.d/weston ]; then + sed -i 's#weston-start --#weston-start -- --continue-without-input#' ${D}/${sysconfdir}/init.d/weston + fi + if [ -e ${D}${systemd_system_unitdir}/weston.service ]; then + sed -i 's#ExecStart=/usr/bin/weston#ExecStart=/usr/bin/weston --continue-without-input#' ${D}${systemd_system_unitdir}/weston.service + fi +} diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend index 55cf700..f9ed06a 100644 --- a/recipes-graphics/wayland/weston_%.bbappend +++ b/recipes-graphics/wayland/weston_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" +PACKAGECONFIG:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', 'egl clients', d)}" -EXTRA_OECONF_append_rpi = " \ +EXTRA_OECONF:append:rpi = " \ --disable-xwayland-test \ --disable-simple-egl-clients \ ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \ |