| Message ID | 20230728093950.12046-2-alex.kiernan@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | d443fad3687c4dd2d7b4107079e0d297d03e94d6 |
| Headers | show |
| Series | [1/2] base-passwd: Add the sgx group | expand |
On Fri, Jul 28, 2023 at 2:45 AM Alex Kiernan <alex.kiernan@gmail.com> wrote: > > The sgx group is part of base-passwd now. > thats ok although it is specific to Intel SGX enclave device nodes having this group. I wonder if we should make it just for x86 > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > --- > > meta/recipes-core/systemd/systemd_253.3.bb | 2 +- > 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 cf0e17ff002b..1fd4556afd0e 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 \ > ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ > " > GROUPADD_PARAM:${PN} = "-r systemd-journal;" > -GROUPADD_PARAM:udev = "-r render;-r sgx;" > +GROUPADD_PARAM:udev = "-r render" > GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" > USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" > 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 4268bcc2c5de..572ccecafd0c 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 > > GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" > > -inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases useradd > +inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases > > CONFLICT_DISTRO_FEATURES = "systemd" > > @@ -85,6 +85,3 @@ pkg_postinst:${PN}-hwdb () { > pkg_prerm:${PN}-hwdb () { > rm -f $D${sysconfdir}/udev/hwdb.bin > } > - > -USERADD_PACKAGES = "${PN}" > -GROUPADD_PARAM:${PN} = "-r sgx" > -- > 2.39.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#185016): https://lists.openembedded.org/g/openembedded-core/message/185016 > Mute This Topic: https://lists.openembedded.org/mt/100407491/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-core/systemd/systemd_253.3.bb b/meta/recipes-core/systemd/systemd_253.3.bb index cf0e17ff002b..1fd4556afd0e 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 \ ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ " GROUPADD_PARAM:${PN} = "-r systemd-journal;" -GROUPADD_PARAM:udev = "-r render;-r sgx;" +GROUPADD_PARAM:udev = "-r render" GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" 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 4268bcc2c5de..572ccecafd0c 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 GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" -inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases useradd +inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases CONFLICT_DISTRO_FEATURES = "systemd" @@ -85,6 +85,3 @@ pkg_postinst:${PN}-hwdb () { pkg_prerm:${PN}-hwdb () { rm -f $D${sysconfdir}/udev/hwdb.bin } - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "-r sgx"
The sgx group is part of base-passwd now. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- meta/recipes-core/systemd/systemd_253.3.bb | 2 +- meta/recipes-core/udev/eudev_3.2.12.bb | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-)