From 8b1baf589ebad0862791c32c7a9b953071dec20a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 5 May 2020 15:04:46 -0400 Subject: meta-agl-profile-graphical: add SMACK labelling for weston The initial patch to allow disabling memfd usage in weston has proven to be naive, as the v7 wayland seat resource changes in Weston 8.0.0 are dependent on them. To avoid needing to make more invasive changes such as forcing the seat resource version back to v6, drop the patch in favor of having Weston run under a System::Weston SMACK label and adding the rules required to have it work. As well, use-XDG_RUNTIMESHARE_DIR.patch and the associated service unit changes have been removed since they are not required now with explicit labelling in place. Bug-AGL: SPEC-3305, SPEC-3350 Signed-off-by: Scott Murray Change-Id: I8aef287219a7f95992a82f4ec2ee8e1822ca4ce8 --- .../recipes-graphics/wayland/weston_8.0.0.bbappend | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.0.bbappend') diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.0.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.0.bbappend index 03626abe8..bafd6bbcf 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.0.bbappend +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.0.bbappend @@ -6,11 +6,21 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" # and waltham can take a look and update it. SRC_URI_append = "\ file://0001-Allow-regular-users-to-launch-Weston_7.0.0.patch \ - file://use-XDG_RUNTIMESHARE_DIR.patch \ file://0002-ivi-shell-Fix-crash-due-no-transmitter-screen.patch \ file://0001-libweston-Expose-weston_output_damage-in-libweston.patch \ file://0004-unconditionally-include-mman.h.patch \ - file://0005-add-memfd-create-option.patch \ + file://smack-weston \ " -EXTRA_OEMESON_append = " -Denable-user-start=true -Dmemfd-create=false" +EXTRA_OEMESON_append = " -Denable-user-start=true" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'smack', 'true', 'false', d)}; then + # Install SMACK rules + install -D -m 0644 ${WORKDIR}/smack-weston ${D}${sysconfdir}/smack/accesses.d/weston + fi +} + +FILES_${PN} += "\ + ${sysconfdir}/smack/accesses.d/* \ +" -- cgit 1.2.3-korg