From 6a82c1c94dc84172f5610ccfc0ab9b72d750eb8b Mon Sep 17 00:00:00 2001 From: Kenta Date: Thu, 27 Feb 2025 14:39:09 +0900 Subject: meta-uhmi: Run the UHMI daemons as the agl-driver user Fixed all UHMI daemons to run as the agl-driver user by default. In addition, created udev rules to authorize all UHMI device files to be opened by the agl-driver user. Bug-AGL: SPEC-5363 Change-Id: Id78611a7ff892767e29e9c34f14f624757cf8a43 Signed-off-by: Kenta --- .../udev/uhmi-udev-conf/99-uhmi-user.rules | 4 ++++ .../recipes-config/udev/uhmi-udev-conf_1.0.bb | 18 ++++++++++++++++++ .../recipes-config/uhmi-config/files/app.json | 4 ++-- .../images/agl-uhmi-demo-preconfigured-receiver-agl.bb | 1 + .../images/agl-uhmi-demo-preconfigured-sender-agl.bb | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf/99-uhmi-user.rules create mode 100644 meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf_1.0.bb (limited to 'meta-uhmi/meta-agl-uhmi-demo') diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf/99-uhmi-user.rules b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf/99-uhmi-user.rules new file mode 100644 index 00000000..bf75adf1 --- /dev/null +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf/99-uhmi-user.rules @@ -0,0 +1,4 @@ +KERNEL=="virtio-lo", GROUP="video", MODE="0660" +KERNEL=="uinput", RUN="/usr/bin/chown agl-driver:input /dev/uinput" +SUBSYSTEM=="drm", KERNEL=="card[1-9]*", ACTION=="add", PROGRAM="/bin/bash -c '[ -f /tmp/rvgpu-index ] && cat /tmp/rvgpu-index || echo \"\"'", RUN="/usr/bin/chown agl-driver:video /dev/dri/rvgpu_virtio%c" +SUBSYSTEM=="input", KERNEL=="event[1-9]*", ACTION=="add", ATTRS{name}=="rvgpu*", PROGRAM="/bin/bash -c '[ -f /tmp/rvgpu-index ] && cat /tmp/rvgpu-index || echo \"\"'", RUN="/usr/bin/chown agl-driver:input /dev/input/%s{name}%c" diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf_1.0.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf_1.0.bb new file mode 100644 index 00000000..6566208d --- /dev/null +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf_1.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "UHMI kernel devices user udev configuration" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://99-uhmi-user.rules" + +do_compile[noexec] = "1" + +do_install() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-uhmi-user.rules ${D}${sysconfdir}/udev/rules.d/ + fi +} + +FILES:${PN} += "${systemd_system_unitdir}" + +RDEPENDS:${PN} += "udev" diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json index 1dcce8aa..4da7020d 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json @@ -28,7 +28,7 @@ "listen_port" : 33445, "initial_screen_color" : "0x33333333" }, - "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1" + "env" : "" }, { "launcher" : "agl-host1", @@ -42,7 +42,7 @@ "listen_port" : 33445, "initial_screen_color" : "0x33333333" }, - "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1" + "env" : "" } ] } diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb index c77dc269..89f19073 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb @@ -15,6 +15,7 @@ IMAGE_INSTALL += " \ uhmi-config-receiver \ agl-compositor \ native-shell-client \ + uhmi-udev-conf \ " UHMI_HOSTNAME ?= "agl-host1" diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb index b8033f35..ce47aff6 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb @@ -16,6 +16,7 @@ IMAGE_INSTALL += " \ agl-compositor \ native-shell-client \ glmark2 \ + uhmi-udev-conf \ " UHMI_HOSTNAME ?= "agl-host0" -- cgit