diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-09-13 14:52:42 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-14 22:42:30 +0100 |
| commit | 8d04a52f483e5c8d8b56c59aedfcecffe2e2c943 (patch) | |
| tree | b7eee699a4ab6ef945334cbf3903d61d7787a9e9 | |
| parent | fa4c4049d770ee4a3d9995fa1a024fdbe801bf50 (diff) | |
| download | poky-8d04a52f483e5c8d8b56c59aedfcecffe2e2c943.tar.gz | |
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 <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 9 insertions, 0 deletions
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 \ | |||
| 15 | 15 | ||
| 16 | S = "${WORKDIR}" | 16 | S = "${WORKDIR}" |
| 17 | 17 | ||
| 18 | DEFAULTBACKEND ??= "" | ||
| 19 | DEFAULTBACKEND_qemuall ?= "fbdev" | ||
| 20 | DEFAULTBACKEND_qemuarm64 = "drm" | ||
| 21 | DEFAULTBACKEND_qemux86 = "drm" | ||
| 22 | DEFAULTBACKEND_qemux86-64 = "drm" | ||
| 23 | |||
| 18 | do_install() { | 24 | do_install() { |
| 19 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston | 25 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston |
| 20 | install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini | 26 | install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini |
| @@ -36,6 +42,9 @@ do_install() { | |||
| 36 | install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start | 42 | install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start |
| 37 | sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start | 43 | sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start |
| 38 | sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start | 44 | sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start |
| 45 | if [ -n "${DEFAULTBACKEND}" ]; then | ||
| 46 | sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini | ||
| 47 | fi | ||
| 39 | } | 48 | } |
| 40 | 49 | ||
| 41 | inherit update-rc.d features_check systemd | 50 | 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 --- a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini +++ /dev/null | |||
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 --- a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini +++ /dev/null | |||
