* [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional
@ 2020-07-31 21:53 Norbert Lange
2020-07-31 21:53 ` [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 Norbert Lange
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Norbert Lange @ 2020-07-31 21:53 UTC (permalink / raw)
To: buildroot
This is the previous single patch split uo into several smaller ones #1-#4,
there are no changes in these.
One patch is added to disable the portabled option
Norbert Lange (5):
package/systemd: import does not need bzip2 and lz4
package/systemd: remove libblkid dependency
package/systemd: remove util-linux binaries dependency
package/systemd: remove util-linux nologin dependency
package/systemd: disable portabled
package/systemd/Config.in | 5 -----
package/systemd/systemd.mk | 16 ++++++++++++++--
2 files changed, 14 insertions(+), 7 deletions(-)
--
2.27.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 2020-07-31 21:53 [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional Norbert Lange @ 2020-07-31 21:53 ` Norbert Lange 2020-08-05 13:51 ` Thomas Petazzoni 2020-07-31 21:53 ` [Buildroot] [PATCH 2/5] package/systemd: remove libblkid dependency Norbert Lange ` (3 subsequent siblings) 4 siblings, 1 reply; 12+ messages in thread From: Norbert Lange @ 2020-07-31 21:53 UTC (permalink / raw) To: buildroot Those are optional dependencies. Signed-off-by: Norbert Lange <nolange79@gmail.com> --- package/systemd/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index ccdd5bfa92..8d29b09add 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -265,8 +265,6 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_LZ4 select BR2_PACKAGE_XZ select BR2_PACKAGE_ZLIB help -- 2.27.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 2020-07-31 21:53 ` [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 Norbert Lange @ 2020-08-05 13:51 ` Thomas Petazzoni 0 siblings, 0 replies; 12+ messages in thread From: Thomas Petazzoni @ 2020-08-05 13:51 UTC (permalink / raw) To: buildroot On Fri, 31 Jul 2020 23:53:41 +0200 Norbert Lange <nolange79@gmail.com> wrote: > Those are optional dependencies. > > Signed-off-by: Norbert Lange <nolange79@gmail.com> > --- > package/systemd/Config.in | 2 -- > 1 file changed, 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/5] package/systemd: remove libblkid dependency 2020-07-31 21:53 [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional Norbert Lange 2020-07-31 21:53 ` [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 Norbert Lange @ 2020-07-31 21:53 ` Norbert Lange 2020-08-05 13:51 ` Thomas Petazzoni 2020-07-31 21:53 ` [Buildroot] [PATCH 3/5] package/systemd: remove util-linux binaries dependency Norbert Lange ` (2 subsequent siblings) 4 siblings, 1 reply; 12+ messages in thread From: Norbert Lange @ 2020-07-31 21:53 UTC (permalink / raw) To: buildroot this dependency is optional, it is used to allow udev to add information to blockdevices. Aslong as MOUNT or FSCK are enabled, it will end up enabled anyway, but this seems more clear and correct. Signed-off-by: Norbert Lange <nolange79@gmail.com> --- package/systemd/Config.in | 1 - package/systemd/systemd.mk | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 8d29b09add..56d7eed063 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -28,7 +28,6 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_DBUS # runtime dependency only select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_AGETTY diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index edb2e56a72..00c18be210 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -25,7 +25,6 @@ SYSTEMD_CONF_OPTS += \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dutmp=false \ - -Dblkid=true \ -Dman=false \ -Dima=false \ -Dldconfig=false \ @@ -212,6 +211,12 @@ else SYSTEMD_CONF_OPTS += -Dpcre2=false endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +SYSTEMD_CONF_OPTS += -Dblkid=true +else +SYSTEMD_CONF_OPTS += -Dblkid=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) SYSTEMD_CONF_OPTS += -Dinitrd=true else -- 2.27.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/5] package/systemd: remove libblkid dependency 2020-07-31 21:53 ` [Buildroot] [PATCH 2/5] package/systemd: remove libblkid dependency Norbert Lange @ 2020-08-05 13:51 ` Thomas Petazzoni 0 siblings, 0 replies; 12+ messages in thread From: Thomas Petazzoni @ 2020-08-05 13:51 UTC (permalink / raw) To: buildroot On Fri, 31 Jul 2020 23:53:42 +0200 Norbert Lange <nolange79@gmail.com> wrote: > this dependency is optional, it is used to > allow udev to add information to blockdevices. > Aslong as MOUNT or FSCK are enabled, it will end up enabled > anyway, but this seems more clear and correct. > > Signed-off-by: Norbert Lange <nolange79@gmail.com> > --- > package/systemd/Config.in | 1 - > package/systemd/systemd.mk | 7 ++++++- > 2 files changed, 6 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/5] package/systemd: remove util-linux binaries dependency 2020-07-31 21:53 [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional Norbert Lange 2020-07-31 21:53 ` [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 Norbert Lange 2020-07-31 21:53 ` [Buildroot] [PATCH 2/5] package/systemd: remove libblkid dependency Norbert Lange @ 2020-07-31 21:53 ` Norbert Lange 2020-08-05 13:51 ` Thomas Petazzoni 2020-07-31 21:53 ` [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency Norbert Lange 2020-07-31 21:53 ` [Buildroot] [PATCH 5/5] package/systemd: disable portabled Norbert Lange 4 siblings, 1 reply; 12+ messages in thread From: Norbert Lange @ 2020-07-31 21:53 UTC (permalink / raw) To: buildroot None of the tools in this set are necessary. Signed-off-by: Norbert Lange <nolange79@gmail.com> --- package/systemd/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 56d7eed063..bea8aaa019 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -29,7 +29,6 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_NOLOGIN -- 2.27.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/5] package/systemd: remove util-linux binaries dependency 2020-07-31 21:53 ` [Buildroot] [PATCH 3/5] package/systemd: remove util-linux binaries dependency Norbert Lange @ 2020-08-05 13:51 ` Thomas Petazzoni 0 siblings, 0 replies; 12+ messages in thread From: Thomas Petazzoni @ 2020-08-05 13:51 UTC (permalink / raw) To: buildroot On Fri, 31 Jul 2020 23:53:43 +0200 Norbert Lange <nolange79@gmail.com> wrote: > None of the tools in this set are necessary. > > Signed-off-by: Norbert Lange <nolange79@gmail.com> > --- > package/systemd/Config.in | 1 - > 1 file changed, 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency 2020-07-31 21:53 [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional Norbert Lange ` (2 preceding siblings ...) 2020-07-31 21:53 ` [Buildroot] [PATCH 3/5] package/systemd: remove util-linux binaries dependency Norbert Lange @ 2020-07-31 21:53 ` Norbert Lange 2020-08-05 13:52 ` Thomas Petazzoni 2020-07-31 21:53 ` [Buildroot] [PATCH 5/5] package/systemd: disable portabled Norbert Lange 4 siblings, 1 reply; 12+ messages in thread From: Norbert Lange @ 2020-07-31 21:53 UTC (permalink / raw) To: buildroot if the tool is not enabled, then configure /bin/false as fallback. Signed-off-by: Norbert Lange <nolange79@gmail.com> --- package/systemd/Config.in | 1 - package/systemd/systemd.mk | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index bea8aaa019..1c37a37789 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -31,7 +31,6 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT - select BR2_PACKAGE_UTIL_LINUX_NOLOGIN select BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 00c18be210..ac03e16829 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -217,6 +217,12 @@ else SYSTEMD_CONF_OPTS += -Dblkid=false endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) +SYSTEMD_CONF_OPTS += -Dnologin-path=/usr/sbin/nologin +else +SYSTEMD_CONF_OPTS += -Dnologin-path=/bin/false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) SYSTEMD_CONF_OPTS += -Dinitrd=true else -- 2.27.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency 2020-07-31 21:53 ` [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency Norbert Lange @ 2020-08-05 13:52 ` Thomas Petazzoni 2020-08-05 14:08 ` Norbert Lange 0 siblings, 1 reply; 12+ messages in thread From: Thomas Petazzoni @ 2020-08-05 13:52 UTC (permalink / raw) To: buildroot On Fri, 31 Jul 2020 23:53:44 +0200 Norbert Lange <nolange79@gmail.com> wrote: > +ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) > +SYSTEMD_CONF_OPTS += -Dnologin-path=/usr/sbin/nologin nologin is in fact installed in /sbin in a non-merged /usr configuration. I know in the case of systemd, merged /usr is always enabled so that is not a big deal, but I nevertheless changed to /sbin/nologin since it seems to be the canonical location for nologin. Applied with this change. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency 2020-08-05 13:52 ` Thomas Petazzoni @ 2020-08-05 14:08 ` Norbert Lange 0 siblings, 0 replies; 12+ messages in thread From: Norbert Lange @ 2020-08-05 14:08 UTC (permalink / raw) To: buildroot Am Mi., 5. Aug. 2020 um 15:52 Uhr schrieb Thomas Petazzoni <thomas.petazzoni@bootlin.com>: > > On Fri, 31 Jul 2020 23:53:44 +0200 > Norbert Lange <nolange79@gmail.com> wrote: > > > +ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) > > +SYSTEMD_CONF_OPTS += -Dnologin-path=/usr/sbin/nologin > > nologin is in fact installed in /sbin in a non-merged /usr > configuration. I know in the case of systemd, merged /usr is always > enabled so that is not a big deal, but I nevertheless changed to > /sbin/nologin since it seems to be the canonical location for nologin. > > Applied with this change. Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Hello, I am not terribly concerned with the change, but what happened until now, is that meson picked either the host binary or the "default" one from systemd (see [1], where this is addressed). I'd prefer to pick the default settings from systemd (favoring /usr being self-contained), following: ----------------- # if -Dxxx-path option is found, use that. Otherwise, check in $PATH, # /usr/sbin, /sbin, and fall back to the default from middle column. progs = [['quotaon', '/usr/sbin/quotaon' ], ['quotacheck', '/usr/sbin/quotacheck' ], ['kmod', '/usr/bin/kmod' ], ['kexec', '/usr/sbin/kexec' ], ['sulogin', '/usr/sbin/sulogin' ], ['mount', '/usr/bin/mount', 'MOUNT_PATH'], ['umount', '/usr/bin/umount', 'UMOUNT_PATH'], ['loadkeys', '/usr/bin/loadkeys', 'KBD_LOADKEYS'], ['setfont', '/usr/bin/setfont', 'KBD_SETFONT'], ['nologin', '/usr/sbin/nologin', ], ----------------- Regards, Norbert [1] - https://patchwork.ozlabs.org/project/buildroot/patch/20200710234150.185609-2-nolange79 at gmail.com/ ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 5/5] package/systemd: disable portabled 2020-07-31 21:53 [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional Norbert Lange ` (3 preceding siblings ...) 2020-07-31 21:53 ` [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency Norbert Lange @ 2020-07-31 21:53 ` Norbert Lange 2020-08-05 13:53 ` Thomas Petazzoni 4 siblings, 1 reply; 12+ messages in thread From: Norbert Lange @ 2020-07-31 21:53 UTC (permalink / raw) To: buildroot portabled is a container-like service, but so far its still a preview and basically unknown as the portablectl is hidden in /usr/lib/systemd. Disable it for now. See https://systemd.io/PORTABLE_SERVICES/ Signed-off-by: Norbert Lange <nolange79@gmail.com> --- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ac03e16829..0e95a2d36b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -45,7 +45,8 @@ SYSTEMD_CONF_OPTS += \ -Dsetfont-path=/usr/bin/setfont \ -Dtelinit-path=/sbin/telinit \ -Didn=true \ - -Dnss-systemd=true + -Dnss-systemd=true \ + -Dportabled=false ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl -- 2.27.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 5/5] package/systemd: disable portabled 2020-07-31 21:53 ` [Buildroot] [PATCH 5/5] package/systemd: disable portabled Norbert Lange @ 2020-08-05 13:53 ` Thomas Petazzoni 0 siblings, 0 replies; 12+ messages in thread From: Thomas Petazzoni @ 2020-08-05 13:53 UTC (permalink / raw) To: buildroot On Fri, 31 Jul 2020 23:53:45 +0200 Norbert Lange <nolange79@gmail.com> wrote: > portabled is a container-like service, but so far its > still a preview and basically unknown as the portablectl > is hidden in /usr/lib/systemd. > > Disable it for now. > > See https://systemd.io/PORTABLE_SERVICES/ > > Signed-off-by: Norbert Lange <nolange79@gmail.com> > --- > package/systemd/systemd.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-08-05 14:08 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-07-31 21:53 [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional Norbert Lange 2020-07-31 21:53 ` [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 Norbert Lange 2020-08-05 13:51 ` Thomas Petazzoni 2020-07-31 21:53 ` [Buildroot] [PATCH 2/5] package/systemd: remove libblkid dependency Norbert Lange 2020-08-05 13:51 ` Thomas Petazzoni 2020-07-31 21:53 ` [Buildroot] [PATCH 3/5] package/systemd: remove util-linux binaries dependency Norbert Lange 2020-08-05 13:51 ` Thomas Petazzoni 2020-07-31 21:53 ` [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency Norbert Lange 2020-08-05 13:52 ` Thomas Petazzoni 2020-08-05 14:08 ` Norbert Lange 2020-07-31 21:53 ` [Buildroot] [PATCH 5/5] package/systemd: disable portabled Norbert Lange 2020-08-05 13:53 ` Thomas Petazzoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.