Skip to contentSkip to conversation

weston-init: add some of my qol patches from oe-core

PATCH New [email protected] 1 participant 1 message Jun 26, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 weston-init: add some of my qol patches from oe-core

From: Randolph Sapp <[email protected]>

Add some of the patches still pending for oe-core to satisfy release deadlines and testing requirements.

To be dropped when the following series is accepted:
https://lists.openembedded.org/g/openembedded-core/message/183338

---
 .../wayland/weston-init.bbappend              |  8 ++
 .../wayland/weston-init/weston-socket.sh      | 20 +++++
 .../wayland/weston-init/weston.ini            | 73 ++++++++++++++++++-
 3 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100755 meta-arago-distro/recipes-graphics/wayland/weston-init/weston-socket.sh
meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend +8 -0
index 4d5db58c..be6b534b 100644
@@ -5,10 +5,18 @@ PR:append = ".arago12"
 SRC_URI:append = " \
     file://weston.ini \
     file://weston-launch-calibrator.sh \
+    file://weston-socket.sh \
 "
 
 do_install:append() {
     install -Dm755 weston-launch-calibrator.sh ${D}/${bindir}/weston-launch-calibrator
+
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh
+    fi
 }
 
 FILES:${PN}:append = "${bindir}/weston-launch-calibrator"
+
+GROUPADD_PARAM:${PN} = "-r wayland; -r render"
+USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render weston"
meta-arago-distro/recipes-graphics/wayland/weston-init/weston-socket.sh new file +20 -0
new file mode 100755
index 00000000..86389d63
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# set weston variables for use with global weston socket
+global_socket="/run/wayland-0"
+if [ -e "$global_socket" ]; then
+	weston_group=$(stat -c "%G" "$global_socket")
+	if [ "$(id -u)" = "0" ]; then
+		export WAYLAND_DISPLAY="$global_socket"
+	else
+		case "$(groups "$USER")" in
+			*"$weston_group"*)
+				export WAYLAND_DISPLAY="$global_socket"
+				;;
+			*)
+				;;
+		esac
+	fi
+	unset weston_group
+fi
+unset global_socket
meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini +69 -4

88 lines not on this page · raw message

Signature · 1 line
2.41.0