| Message ID | 20220425111148.87319-1-tianyuanhao3@163.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/udev: move render and sgx out of UDEV_USERS | expand |
On 25/04/2022 13:11, TIAN Yuanhao wrote: > Moved group render and group sgx into UDEV_USERS_SYSTEMD as they > currently only appear in systemd's udev rules. > > In systemd, group render was introduced since commit 4e15a73, and group > sgx was introduced since commit c9c4899. > > In eudev, group render was introduced since commit bb070c1, but was > removed since commit a8ffcd1 [1]. > > [1]: https://github.com/eudev-project/eudev/issues/160 > > Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> > Cc: Yann E. MORIN <yann.morin.1998@free.fr> > --- > package/systemd/systemd.mk | 2 -- > package/udev/udev.mk | 7 +++++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 58a1376b51..1f2bc108bf 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -602,8 +602,6 @@ define SYSTEMD_PERMISSIONS > endef > > define SYSTEMD_USERS > - # udev user groups > - # systemd user groups > - - systemd-journal -1 * - - - Journal > $(SYSTEMD_REMOTE_USER) > $(SYSTEMD_COREDUMP_USER) > diff --git a/package/udev/udev.mk b/package/udev/udev.mk > index ce93d98431..40d12ad469 100644 > --- a/package/udev/udev.mk > +++ b/package/udev/udev.mk > @@ -4,11 +4,14 @@ > # > ################################################################################ > > -# Required by default rules for input devices > define UDEV_USERS > - - input -1 * - - - Input device group > - - - render -1 * - - - DRI rendering nodes > - - kvm -1 * - - - kvm nodes > + $(UDEV_USERS_$(call UPPERCASE,$(call qstrip,$(BR2_PACKAGE_PROVIDES_UDEV)))) There is really no reason to do it this way. You can simply put it in SYSTEMD_USERS (under the 'udev groups' comment). If we need additional groups for eudev, we can put them in EUDEV_USERS. Regards, Arnout > +endef > + > +define UDEV_USERS_SYSTEMD > + - - render -1 * - - - DRI rendering nodes > - - sgx -1 * - - - SGX device nodes > endef >
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 58a1376b51..1f2bc108bf 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -602,8 +602,6 @@ define SYSTEMD_PERMISSIONS endef define SYSTEMD_USERS - # udev user groups - # systemd user groups - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) diff --git a/package/udev/udev.mk b/package/udev/udev.mk index ce93d98431..40d12ad469 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -4,11 +4,14 @@ # ################################################################################ -# Required by default rules for input devices define UDEV_USERS - - input -1 * - - - Input device group - - - render -1 * - - - DRI rendering nodes - - kvm -1 * - - - kvm nodes + $(UDEV_USERS_$(call UPPERCASE,$(call qstrip,$(BR2_PACKAGE_PROVIDES_UDEV)))) +endef + +define UDEV_USERS_SYSTEMD + - - render -1 * - - - DRI rendering nodes - - sgx -1 * - - - SGX device nodes endef
Moved group render and group sgx into UDEV_USERS_SYSTEMD as they currently only appear in systemd's udev rules. In systemd, group render was introduced since commit 4e15a73, and group sgx was introduced since commit c9c4899. In eudev, group render was introduced since commit bb070c1, but was removed since commit a8ffcd1 [1]. [1]: https://github.com/eudev-project/eudev/issues/160 Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> Cc: Yann E. MORIN <yann.morin.1998@free.fr> --- package/systemd/systemd.mk | 2 -- package/udev/udev.mk | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-)