| Message ID | 20200308091640.65742-1-james.hilliard1@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/systemd: add repart support | expand |
Hi James, On Sun, Mar 08 2020, James Hilliard wrote: > systemd-repart grows and adds partitions to a partition table, based on > the configuration files described in repart.d. > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > package/systemd/Config.in | 9 +++++++++ > package/systemd/systemd.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index c727082a1a..64d30f32aa 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -153,6 +153,15 @@ config BR2_PACKAGE_SYSTEMD_BINFMT > > http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html > > +config BR2_PACKAGE_SYSTEMD_REPART > + bool "enable repart support" > + select BR2_PACKAGE_OPENSSL The systemd meson.build indicates that util-linux libfdisk is also required for repart. baruch > + help > + systemd-repart grows and adds partitions to a partition table, > + based on the configuration files described in repart.d. > + > + https://www.freedesktop.org/software/systemd/man/systemd-repart.html > + > config BR2_PACKAGE_SYSTEMD_COREDUMP > bool "enable coredump hook" > help > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 1c3b81cfcb..d05541a2f6 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -41,7 +41,6 @@ SYSTEMD_CONF_OPTS += \ > -Dumount-path=/usr/bin/umount \ > -Dnobody-group=nogroup \ > -Didn=true \ > - -Drepart=false \ > -Duserdb=false \ > -Dhomed=false \ > -Dnss-systemd=true > @@ -305,6 +304,13 @@ else > SYSTEMD_CONF_OPTS += -Dlocaled=false > endif > > +ifeq ($(BR2_PACKAGE_SYSTEMD_REPART),y) > +SYSTEMD_CONF_OPTS += -Drepart=true > +SYSTEMD_DEPENDENCIES += openssl > +else > +SYSTEMD_CONF_OPTS += -Drepart=false > +endif > + > ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) > SYSTEMD_CONF_OPTS += -Dcoredump=true > SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper
On Sun, Mar 8, 2020 at 3:25 AM Baruch Siach <baruch@tkos.co.il> wrote: > > Hi James, > > On Sun, Mar 08 2020, James Hilliard wrote: > > systemd-repart grows and adds partitions to a partition table, based on > > the configuration files described in repart.d. > > > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > > --- > > package/systemd/Config.in | 9 +++++++++ > > package/systemd/systemd.mk | 8 +++++++- > > 2 files changed, 16 insertions(+), 1 deletion(-) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index c727082a1a..64d30f32aa 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -153,6 +153,15 @@ config BR2_PACKAGE_SYSTEMD_BINFMT > > > > http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html > > > > +config BR2_PACKAGE_SYSTEMD_REPART > > + bool "enable repart support" > > + select BR2_PACKAGE_OPENSSL > > The systemd meson.build indicates that util-linux libfdisk is also > required for repart. This is selected by BR2_PACKAGE_SYSTEMD already since BR2_PACKAGE_UTIL_LINUX_BINARIES selects BR2_PACKAGE_UTIL_LINUX_LIBFDISK. > > baruch > > > + help > > + systemd-repart grows and adds partitions to a partition table, > > + based on the configuration files described in repart.d. > > + > > + https://www.freedesktop.org/software/systemd/man/systemd-repart.html > > + > > config BR2_PACKAGE_SYSTEMD_COREDUMP > > bool "enable coredump hook" > > help > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index 1c3b81cfcb..d05541a2f6 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -41,7 +41,6 @@ SYSTEMD_CONF_OPTS += \ > > -Dumount-path=/usr/bin/umount \ > > -Dnobody-group=nogroup \ > > -Didn=true \ > > - -Drepart=false \ > > -Duserdb=false \ > > -Dhomed=false \ > > -Dnss-systemd=true > > @@ -305,6 +304,13 @@ else > > SYSTEMD_CONF_OPTS += -Dlocaled=false > > endif > > > > +ifeq ($(BR2_PACKAGE_SYSTEMD_REPART),y) > > +SYSTEMD_CONF_OPTS += -Drepart=true > > +SYSTEMD_DEPENDENCIES += openssl > > +else > > +SYSTEMD_CONF_OPTS += -Drepart=false > > +endif > > + > > ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) > > SYSTEMD_CONF_OPTS += -Dcoredump=true > > SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper > > > -- > http://baruch.siach.name/blog/ ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
On Sun, 8 Mar 2020 03:16:40 -0600 James Hilliard <james.hilliard1@gmail.com> wrote: > systemd-repart grows and adds partitions to a partition table, based on > the configuration files described in repart.d. > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > package/systemd/Config.in | 9 +++++++++ > package/systemd/systemd.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index c727082a1a..64d30f32aa 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -153,6 +153,15 @@ config BR2_PACKAGE_SYSTEMD_BINFMT > > http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html > > +config BR2_PACKAGE_SYSTEMD_REPART > + bool "enable repart support" > + select BR2_PACKAGE_OPENSSL > + help > + systemd-repart grows and adds partitions to a partition table, > + based on the configuration files described in repart.d. > + > + https://www.freedesktop.org/software/systemd/man/systemd-repart.html Alphabetic sorting of options was not respected here, so I've moved this option. I've also added an explicit select of libfdisk, as suggested by Baruch. Even though it is implied by the top-level option, making it explicit doesn't hurt. Applied to next with those changes. Thanks! Thomas
diff --git a/package/systemd/Config.in b/package/systemd/Config.in index c727082a1a..64d30f32aa 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -153,6 +153,15 @@ config BR2_PACKAGE_SYSTEMD_BINFMT http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html +config BR2_PACKAGE_SYSTEMD_REPART + bool "enable repart support" + select BR2_PACKAGE_OPENSSL + help + systemd-repart grows and adds partitions to a partition table, + based on the configuration files described in repart.d. + + https://www.freedesktop.org/software/systemd/man/systemd-repart.html + config BR2_PACKAGE_SYSTEMD_COREDUMP bool "enable coredump hook" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 1c3b81cfcb..d05541a2f6 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -41,7 +41,6 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dnobody-group=nogroup \ -Didn=true \ - -Drepart=false \ -Duserdb=false \ -Dhomed=false \ -Dnss-systemd=true @@ -305,6 +304,13 @@ else SYSTEMD_CONF_OPTS += -Dlocaled=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_REPART),y) +SYSTEMD_CONF_OPTS += -Drepart=true +SYSTEMD_DEPENDENCIES += openssl +else +SYSTEMD_CONF_OPTS += -Drepart=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper
systemd-repart grows and adds partitions to a partition table, based on the configuration files described in repart.d. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- package/systemd/Config.in | 9 +++++++++ package/systemd/systemd.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-)