diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2023-07-28 10:39:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-29 08:34:35 +0100 |
commit | 36ed53a64843367fdaea168c414b68b3978d906a (patch) | |
tree | cdff65519c8268413dcd20109acc9ded5db5835d | |
parent | a10c01f9d16fc0bcdedde3cd51c6decd59e55263 (diff) | |
download | poky-36ed53a64843367fdaea168c414b68b3978d906a.tar.gz |
udev: eudev: Revert add group to sgx
The sgx group is part of base-passwd now.
(From OE-Core rev: d443fad3687c4dd2d7b4107079e0d297d03e94d6)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd_253.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/udev/eudev_3.2.12.bb | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd_253.3.bb b/meta/recipes-core/systemd/systemd_253.3.bb index cf0e17ff00..1fd4556afd 100644 --- a/meta/recipes-core/systemd/systemd_253.3.bb +++ b/meta/recipes-core/systemd/systemd_253.3.bb | |||
@@ -424,7 +424,7 @@ USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ | |||
424 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ | 424 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ |
425 | " | 425 | " |
426 | GROUPADD_PARAM:${PN} = "-r systemd-journal;" | 426 | GROUPADD_PARAM:${PN} = "-r systemd-journal;" |
427 | GROUPADD_PARAM:udev = "-r render;-r sgx;" | 427 | GROUPADD_PARAM:udev = "-r render" |
428 | GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" | 428 | GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" |
429 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" | 429 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" |
430 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" | 430 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" |
diff --git a/meta/recipes-core/udev/eudev_3.2.12.bb b/meta/recipes-core/udev/eudev_3.2.12.bb index 4268bcc2c5..572ccecafd 100644 --- a/meta/recipes-core/udev/eudev_3.2.12.bb +++ b/meta/recipes-core/udev/eudev_3.2.12.bb | |||
@@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5ea | |||
18 | 18 | ||
19 | GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" | 19 | GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" |
20 | 20 | ||
21 | inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases useradd | 21 | inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases |
22 | 22 | ||
23 | CONFLICT_DISTRO_FEATURES = "systemd" | 23 | CONFLICT_DISTRO_FEATURES = "systemd" |
24 | 24 | ||
@@ -85,6 +85,3 @@ pkg_postinst:${PN}-hwdb () { | |||
85 | pkg_prerm:${PN}-hwdb () { | 85 | pkg_prerm:${PN}-hwdb () { |
86 | rm -f $D${sysconfdir}/udev/hwdb.bin | 86 | rm -f $D${sysconfdir}/udev/hwdb.bin |
87 | } | 87 | } |
88 | |||
89 | USERADD_PACKAGES = "${PN}" | ||
90 | GROUPADD_PARAM:${PN} = "-r sgx" | ||