From 41591d4f8c586aa801220fac0924556f406c58bd Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 8 Dec 2020 11:15:02 +0100 Subject: SPEC-3723: restructure meta-agl-demo All demo related components should be in here now. We keep the packagegroups on purpose for now to stay backward-compatible. v2: layer does pass yocto-check-layer, dependencies adapted v3: remove the dynamic-layer setup, use all-in-one approach v4: Fixed comments from Paul Barker. Tnx! v5: Removed wayland/weston/agl-compositor additions, except for demo specific weston-init bbappend Follow-up changes required later: - massaging packagegroups - scrub of recipes Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller Signed-off-by: Scott Murray Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8 --- recipes-graphics/wayland/weston-init/tmpfiles.conf.in | 6 ++++++ recipes-graphics/wayland/weston-init/weston-dep.conf.in | 3 +++ recipes-graphics/wayland/weston-init/weston.conf.in | 12 ++++++++++++ recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in | 2 ++ recipes-graphics/wayland/weston-init/zz-dri.rules.in | 1 + recipes-graphics/wayland/weston-init/zz-input.rules.in | 1 + recipes-graphics/wayland/weston-init/zz-tty.rules.in | 1 + 7 files changed, 26 insertions(+) create mode 100644 recipes-graphics/wayland/weston-init/tmpfiles.conf.in create mode 100644 recipes-graphics/wayland/weston-init/weston-dep.conf.in create mode 100644 recipes-graphics/wayland/weston-init/weston.conf.in create mode 100644 recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in create mode 100644 recipes-graphics/wayland/weston-init/zz-dri.rules.in create mode 100644 recipes-graphics/wayland/weston-init/zz-input.rules.in create mode 100644 recipes-graphics/wayland/weston-init/zz-tty.rules.in (limited to 'recipes-graphics/wayland/weston-init') diff --git a/recipes-graphics/wayland/weston-init/tmpfiles.conf.in b/recipes-graphics/wayland/weston-init/tmpfiles.conf.in new file mode 100644 index 00000000..c4b302fa --- /dev/null +++ b/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/recipes-graphics/wayland/weston-init/weston-dep.conf.in b/recipes-graphics/wayland/weston-init/weston-dep.conf.in new file mode 100644 index 00000000..2b810209 --- /dev/null +++ b/recipes-graphics/wayland/weston-init/weston-dep.conf.in @@ -0,0 +1,3 @@ +[Unit] +Requires=@WESTON_DRM_DEVICE@ +After=@WESTON_DRM_DEVICE@ diff --git a/recipes-graphics/wayland/weston-init/weston.conf.in b/recipes-graphics/wayland/weston-init/weston.conf.in new file mode 100644 index 00000000..9c3df052 --- /dev/null +++ b/recipes-graphics/wayland/weston-init/weston.conf.in @@ -0,0 +1,12 @@ +[Service] +Type=notify +Environment="XDG_RUNTIME_DIR=@XDG_RUNTIME_DIR@" +# Note that clearing PAMName (thus not having PAMName=login) disables +# logind support for the session, which allows setting XDG_RUNTIME_DIR +# to something other than /run/user/% (as is done above). +# Without systemd-logind support, weston needs to be patched to allow +# its direct launcher to work for non-root users in this scenario. +PAMName= +ExecStart= +ExecStart=@WESTONSTART@ +SmackProcessLabel=System::Weston diff --git a/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in b/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in new file mode 100644 index 00000000..585db6be --- /dev/null +++ b/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/recipes-graphics/wayland/weston-init/zz-dri.rules.in b/recipes-graphics/wayland/weston-init/zz-dri.rules.in new file mode 100644 index 00000000..51c68c30 --- /dev/null +++ b/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@@WESTONUSER@.service" diff --git a/recipes-graphics/wayland/weston-init/zz-input.rules.in b/recipes-graphics/wayland/weston-init/zz-input.rules.in new file mode 100644 index 00000000..fb3e677f --- /dev/null +++ b/recipes-graphics/wayland/weston-init/zz-input.rules.in @@ -0,0 +1 @@ +SUBSYSTEM=="input", MODE="0660", GROUP="input", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston@@WESTONUSER@.service" diff --git a/recipes-graphics/wayland/weston-init/zz-tty.rules.in b/recipes-graphics/wayland/weston-init/zz-tty.rules.in new file mode 100644 index 00000000..e5ce4b55 --- /dev/null +++ b/recipes-graphics/wayland/weston-init/zz-tty.rules.in @@ -0,0 +1 @@ +SUBSYSTEM=="tty", KERNEL=="tty7", OWNER="@WESTONUSER@", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston@@WESTONUSER@.service" -- cgit 1.2.3-korg