x11-volatiles: register x11 volatile directories
PATCH 1/1 x11-volatiles: register x11 volatile directories
From: Randolph Sapp <[email protected]>
Add a volatiles entry for popular x11 and adjacent utilities. This is designed to mimic the systemd tmpfiles.d entries and prevent any one user from creating these directories with permissions that may negatively impact multi-user environments.
---
Split to separate package and conditionally enabled following previous discussions here:
https://lists.openembedded.org/g/openembedded-core/topic/115646663#msg225134
meta/conf/distro/include/maintainers.inc | 1 + .../x11-common/x11-volatiles.bb | 20 +++++++++++++++++++ .../x11-common/x11-volatiles/02_x11 | 6 ++++++ .../xorg-xserver/xserver-xorg_21.1.18.bb | 2 ++ .../xwayland/xwayland_24.1.8.bb | 2 +- 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/x11-common/x11-volatiles.bb create mode 100644 meta/recipes-graphics/x11-common/x11-volatiles/02_x11
meta/conf/distro/include/maintainers.inc +1 -0
@@ -886,6 +886,7 @@ RECIPE_MAINTAINER:pn-wic-tools = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-wireless-regdb = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-wpa-supplicant = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-wpebackend-fdo = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-x11-volatiles = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-x11perf = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-x264 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xauth = "Unassigned <[email protected]>"
meta/recipes-graphics/x11-common/x11-volatiles.bb new file +20 -0
@@ -0,0 +1,20 @@ +SUMMARY = "Xserver Volatile Directories" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" +SECTION = "x11" + +SRC_URI = "file://02_x11" + +S = "${UNPACKDIR}" + +inherit bin_package features_check + +REQUIRED_DISTRO_FEATURES = "x11" +CONFLICT_DISTRO_FEATURES = "systemd" + +do_install() { + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${UNPACKDIR}/02_x11 ${D}${sysconfdir}/default/volatiles +} + +FILES:${PN} += "${sysconfdir}/default/volatiles"
meta/recipes-graphics/x11-common/x11-volatiles/02_x11 new file +6 -0
@@ -0,0 +1,6 @@ +# Volatile entries to match systemd +# https://github.com/systemd/systemd/blob/main/tmpfiles.d/x11.conf +d root root 1777 /tmp/.X11-unix none +d root root 1777 /tmp/.ICE-unix none +d root root 1777 /tmp/.XIM-unix none +d root root 1777 /tmp/.font-unix none
meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.18.bb +2 -0
@@ -26,3 +26,5 @@ RCONFLICTS:${PN} = "${PN}-extension-dri \ ${PN}-extension-extmod \ ${PN}-extension-dbe \ " + +RDEPENDS:${PN} += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "x11-volatiles", d)}"
meta/recipes-graphics/xwayland/xwayland_24.1.8.bb +1 -1
@@ -47,4 +47,4 @@ do_install:append() { FILES:${PN} += "${libdir}/xorg/protocol.txt" -RDEPENDS:${PN} += "xkbcomp" +RDEPENDS:${PN} += "xkbcomp ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "x11-volatiles", d)}"
Signature · 1 line
2.51.1
Quoted 1 line · Randolph Sapp via lists.openembedded.org
+inherit
bin_packagefeatures_check
It's not a major issue, but I don't think bin_package is required (and it's intended for installing prebuilt binaries). On the other hand, this recipe installs only architecture-independent data, and so should inherit allarch.
Can you make these changes, test that they work, and send a followup patch?
Alex