| Message ID | 1456437341-19025-5-git-send-email-gabe@hashrabbit.co |
|---|---|
| State | Accepted |
| Headers | show |
On 02/25/16 22:55, Gabe Evans wrote: > Signed-off-by: Gabe Evans <gabe@hashrabbit.co> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Without the Config.in change I think it should go into master. Regards, Arnout > --- > package/systemd/Config.in | 3 ++- > package/systemd/systemd.mk | 7 +++++++ > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 1972b1d..9de6e11 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -56,7 +56,8 @@ config BR2_PACKAGE_SYSTEMD > The selection of other packages will enable some features: > > - acl package will add support for multi-seat. > - - xz package will add compression support in journal and coredump. > + - xz and/or lz4 packages will add compression support in journal > + and coredump. > - libgcrypt package will add support for journal sealing and resolved > DNSSEC verification. > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index ac211c8..9f15f24 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -83,6 +83,13 @@ else > SYSTEMD_CONF_OPTS += --disable-bzip2 > endif > > +ifeq ($(BR2_PACKAGE_LZ4),y) > +SYSTEMD_DEPENDENCIES += lz4 > +SYSTEMD_CONF_OPTS += --enable-lz4 > +else > +SYSTEMD_CONF_OPTS += --disable-lz4 > +endif > + > ifeq ($(BR2_PACKAGE_XZ),y) > SYSTEMD_DEPENDENCIES += xz > SYSTEMD_CONF_OPTS += --enable-xz >
Dear Gabe Evans, On Thu, 25 Feb 2016 21:55:13 +0000, Gabe Evans wrote: > Signed-off-by: Gabe Evans <gabe@hashrabbit.co> > --- > package/systemd/Config.in | 3 ++- > package/systemd/systemd.mk | 7 +++++++ > 2 files changed, 9 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Dear Gabe Evans, > On Thu, 25 Feb 2016 21:55:13 +0000, Gabe Evans wrote: >> Signed-off-by: Gabe Evans <gabe@hashrabbit.co> >> --- >> package/systemd/Config.in | 3 ++- >> package/systemd/systemd.mk | 7 +++++++ >> 2 files changed, 9 insertions(+), 1 deletion(-) > Applied to master, thanks. Seems like you applied it to next instead?
Dear Peter Korsgaard, On Mon, 29 Feb 2016 23:02:12 +0100, Peter Korsgaard wrote: > >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > > > Dear Gabe Evans, > > On Thu, 25 Feb 2016 21:55:13 +0000, Gabe Evans wrote: > >> Signed-off-by: Gabe Evans <gabe@hashrabbit.co> > >> --- > >> package/systemd/Config.in | 3 ++- > >> package/systemd/systemd.mk | 7 +++++++ > >> 2 files changed, 9 insertions(+), 1 deletion(-) > > > Applied to master, thanks. > > Seems like you applied it to next instead? Gaah, yes, indeed. I have keyboard shortcuts to send those "applied to <foo>, thanks" e-mails, so it's pretty easy to make a mistake while sending out the e-mail. Sorry for that :/ Thomas
diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 1972b1d..9de6e11 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -56,7 +56,8 @@ config BR2_PACKAGE_SYSTEMD The selection of other packages will enable some features: - acl package will add support for multi-seat. - - xz package will add compression support in journal and coredump. + - xz and/or lz4 packages will add compression support in journal + and coredump. - libgcrypt package will add support for journal sealing and resolved DNSSEC verification. diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ac211c8..9f15f24 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -83,6 +83,13 @@ else SYSTEMD_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_LZ4),y) +SYSTEMD_DEPENDENCIES += lz4 +SYSTEMD_CONF_OPTS += --enable-lz4 +else +SYSTEMD_CONF_OPTS += --disable-lz4 +endif + ifeq ($(BR2_PACKAGE_XZ),y) SYSTEMD_DEPENDENCIES += xz SYSTEMD_CONF_OPTS += --enable-xz
Signed-off-by: Gabe Evans <gabe@hashrabbit.co> --- package/systemd/Config.in | 3 ++- package/systemd/systemd.mk | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-)