From 8d04a52f483e5c8d8b56c59aedfcecffe2e2c943 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 13 Sep 2020 14:52:42 -0700 Subject: 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 (From OE-Core rev: cfda3e10d5eb1563d10318c1d8ff6287b539ee04) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init.bb | 9 +++++++++ meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/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 (limited to 'meta') diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 113f0ff599..07cec75fb3 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -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 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3-54-g00ecf