summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2023-07-28 10:39:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-29 08:34:35 +0100
commit36ed53a64843367fdaea168c414b68b3978d906a (patch)
treecdff65519c8268413dcd20109acc9ded5db5835d
parenta10c01f9d16fc0bcdedde3cd51c6decd59e55263 (diff)
downloadpoky-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.bb2
-rw-r--r--meta/recipes-core/udev/eudev_3.2.12.bb5
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"
426GROUPADD_PARAM:${PN} = "-r systemd-journal;" 426GROUPADD_PARAM:${PN} = "-r systemd-journal;"
427GROUPADD_PARAM:udev = "-r render;-r sgx;" 427GROUPADD_PARAM:udev = "-r render"
428GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" 428GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}"
429USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" 429USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}"
430USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" 430USERADD_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
19GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" 19GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases"
20 20
21inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases useradd 21inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases
22 22
23CONFLICT_DISTRO_FEATURES = "systemd" 23CONFLICT_DISTRO_FEATURES = "systemd"
24 24
@@ -85,6 +85,3 @@ pkg_postinst:${PN}-hwdb () {
85pkg_prerm:${PN}-hwdb () { 85pkg_prerm:${PN}-hwdb () {
86 rm -f $D${sysconfdir}/udev/hwdb.bin 86 rm -f $D${sysconfdir}/udev/hwdb.bin
87} 87}
88
89USERADD_PACKAGES = "${PN}"
90GROUPADD_PARAM:${PN} = "-r sgx"