From a9b74e1c7c7f2d5ad03a7b7675bbef8d241dd47e Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 5 Sep 2019 16:38:20 +0200 Subject: weston-init: Refactor, simplify, fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The recipe weston-init was setting smack labels of input devices to ^. This had the effect to enforce processes that wanted to read /dev/input/eventXX to have the Smack label System. I changed the label to * and keep the protection of groups. At the same time, a refactoring of the recipe make it cleaner to maintain. Bug-AGL: SPEC-2796 Change-Id: I3e2345d48a40b15254e68e25bbfcd9b22fcd8629 Signed-off-by: José Bollo --- .../wayland/weston-init/tmpfiles.conf.in | 6 ++++++ .../recipes-graphics/wayland/weston-init/weston.conf.in | 17 +++++++++++++++++ .../wayland/weston-init/weston.service.add | 11 ----------- .../wayland/weston-init/weston_tmpfiles.conf | 6 ------ .../wayland/weston-init/zz-dri-imx.rules.in | 2 ++ .../wayland/weston-init/zz-dri.rules.in | 1 + .../recipes-graphics/wayland/weston-init/zz-input.rules | 1 + .../wayland/weston-init/zz-tty.rules.in | 1 + 8 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/tmpfiles.conf.in create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri.rules.in create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-input.rules create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-tty.rules.in (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/weston-init') diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/tmpfiles.conf.in b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/tmpfiles.conf.in new file mode 100644 index 000000000..c4b302faf --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/tmpfiles.conf.in @@ -0,0 +1,6 @@ +# This file is distributed to create weston XDG_RUNTIME_DIR (/run/deamon/@WESTONUSER@) +# +# See tmpfiles.d(5) for details + +d /run/platform/ 0775 root root - +d /run/platform/@WESTONUSER@ 0770 @WESTONUSER@ @WESTONGROUP@ - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in new file mode 100644 index 000000000..89c436695 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in @@ -0,0 +1,17 @@ +[Unit] +Conflicts=getty@tty@WESTONTTY@.service +[Service] +Type=notify +User=@WESTONUSER@ +Group=@WESTONGROUP@ +Environment="XDG_RUNTIME_DIR=@XDG_RUNTIME_DIR@" +Environment="XDG_RUNTIMESHARE_DIR=@XDG_RUNTIME_DIR@/share" +ExecStartPre=/bin/mkdir -p @XDG_RUNTIME_DIR@/share +ExecStartPre=+/usr/bin/chsmack -a User::App-Shared -t @XDG_RUNTIME_DIR@/share +ExecStart=@WESTONSTART@ +TTYPath=/dev/tty@WESTONTTY@ +StandardInput=tty +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes +UtmpIdentifier=tty@WESTONTTY@ diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add deleted file mode 100644 index d24a8eb23..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add +++ /dev/null @@ -1,11 +0,0 @@ -Type=notify -Environment="XDG_RUNTIME_DIR=@XDG_RUNTIME_DIR@" -Environment="XDG_RUNTIMESHARE_DIR=@XDG_RUNTIME_DIR@/share" -ExecStartPre=/bin/mkdir -p @XDG_RUNTIME_DIR@/share -ExecStartPre=+/usr/bin/chsmack -a User::App-Shared -t @XDG_RUNTIME_DIR@/share -TTYPath=/dev/tty@WESTONTTY@ -StandardInput=tty -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -UtmpIdentifier=tty@WESTONTTY@ diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf deleted file mode 100644 index c4b302faf..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf +++ /dev/null @@ -1,6 +0,0 @@ -# This file is distributed to create weston XDG_RUNTIME_DIR (/run/deamon/@WESTONUSER@) -# -# See tmpfiles.d(5) for details - -d /run/platform/ 0775 root root - -d /run/platform/@WESTONUSER@ 0770 @WESTONUSER@ @WESTONGROUP@ - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in new file mode 100644 index 000000000..585db6be8 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in @@ -0,0 +1,2 @@ +SUBSYSTEM=="gpu_class", MODE="0660", GROUP="@WESTONGROUP@", SECLABEL{smack}="*" + diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri.rules.in b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri.rules.in new file mode 100644 index 000000000..707d12e28 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri.rules.in @@ -0,0 +1 @@ +SUBSYSTEM=="drm", MODE="0660", GROUP="@WESTONGROUP@", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-input.rules b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-input.rules new file mode 100644 index 000000000..c0842135a --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-input.rules @@ -0,0 +1 @@ +SUBSYSTEM=="input", MODE="0660", GROUP="input", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-tty.rules.in b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-tty.rules.in new file mode 100644 index 000000000..bfdf55b81 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-tty.rules.in @@ -0,0 +1 @@ +SUBSYSTEM=="tty", KERNEL=="tty@WESTONTTY@", OWNER="@WESTONUSER@", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" -- cgit 1.2.3-korg