weston-init: Do not use fbdev backend
PATCH v2 1/4 weston-init: Do not use fbdev backend
This works ok with latest weston/kernel to use drm backend
---
v2: No change
meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini deleted +0 -2
@@ -1,2 +0,0 @@ -[core] -backend=fbdev-backend.so
Signature · 1 line
2.28.0
PATCH v2 2/4 weston-init: Select drm/fbdev backends for qemu machines
qemux86/x86_64/aarch64 supports drm backend well, therefore enable it on these qemu machines, other qemu machines should be defaulting to fbdev, if its not qemu then leave it empty
---
v2: No change
meta/recipes-graphics/wayland/weston-init.bb | 9 +++++++++ .../wayland/weston-init/qemux86-64/weston.ini | 0 .../wayland/weston-init/qemux86/weston.ini | 0 3 files changed, 9 insertions(+) delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini
meta/recipes-graphics/wayland/weston-init.bb +9 -0
@@ -15,6 +15,12 @@ SRC_URI = "file://init \ S = "${WORKDIR}" +DEFAULTBACKEND ??= "" +DEFAULTBACKEND_qemuall ?= "fbdev" +DEFAULTBACKEND_qemuarm64 = "drm" +DEFAULTBACKEND_qemux86 = "drm" +DEFAULTBACKEND_qemux86-64 = "drm" + do_install() { install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini
@@ -36,6 +42,9 @@ do_install() { install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start + if [ -n "${DEFAULTBACKEND}" ]; then + sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini + fi } inherit update-rc.d features_check systemd
meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini deleted +0 -0
meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini deleted +0 -0
Signature · 1 line
2.28.0
PATCH v2 3/4 oeqa/weston: Fix tests to run with systemd
In reply to Khem RajCurrently, weston tests fail when using systemd, fix it by providing transient unit file and inject it via systemd-run, which generates a service file automatically and launches another weston instance to test if it can launch a nested instance. Use systemctl stop to end the service and cleanup, instead of brutal kill
---
v2: Fix non-systemd run of weston with drm backend
meta/lib/oeqa/runtime/cases/weston.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
meta/lib/oeqa/runtime/cases/weston.py +9 -3
@@ -34,7 +34,10 @@ class WestonTest(OERuntimeTestCase): return 'export XDG_RUNTIME_DIR=/run/user/0; export WAYLAND_DISPLAY=wayland-0; %s' % cmd def run_weston_init(self): - self.target.run(self.get_weston_command('weston --log=%s' % self.weston_log_file)) + if 'systemd' in self.tc.td['DISTRO_FEATURES']: + self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file) + else: + self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-1 --log=%s' % self.weston_log_file)) def get_new_wayland_processes(self, existing_wl_processes): try_cnt = 0
@@ -63,7 +66,10 @@ class WestonTest(OERuntimeTestCase): new_wl_processes, try_cnt = self.get_new_wayland_processes(existing_wl_processes) existing_and_new_weston_processes = self.get_processes_of('weston', 'existing and new') new_weston_processes = [x for x in existing_and_new_weston_processes if x not in existing_weston_processes] - for w in new_weston_processes: - self.target.run('kill -9 %s' % w) + if 'systemd' in self.tc.td['DISTRO_FEATURES']: + self.target.run('systemctl stop weston-ptest.service') + else: + for w in new_weston_processes: + self.target.run('kill -9 %s' % w) __, weston_log = self.target.run('cat %s' % self.weston_log_file) self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))
Signature · 1 line
2.28.0
PATCH v2 4/4 core-image-weston: Bump qemu memory to 512M
In reply to Khem RajIt needs openGL and launching two weston instances during weston ptest needs > 256M ram to work
---
v2: No change
meta/recipes-graphics/images/core-image-weston.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-graphics/images/core-image-weston.bb +2 -0
@@ -10,3 +10,5 @@ REQUIRED_DISTRO_FEATURES = "wayland" CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples" CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" + +QB_MEM = "-m 512"
Signature · 1 line
2.28.0