mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] libkmod: version bump 27 -> 28
@ 2021-05-10 10:19 Philipp Zabel
  2021-05-11  8:08 ` Philipp Zabel
  0 siblings, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2021-05-10 10:19 UTC (permalink / raw)
  To: ptxdist

- add Zstandard compression support, allows to enable the
  kernel CONFIG_MODULE_COMPRESS_ZSTD option
- LIBKMOD_ZSTD selects HOST_LIBKMOD_ZSTD so depmod understands
  Zstandard during kernel build

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/host-libkmod.in   | 8 ++++++++
 rules/host-libkmod.make | 1 +
 rules/libkmod.in        | 8 ++++++++
 rules/libkmod.make      | 5 +++--
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/rules/host-libkmod.in b/rules/host-libkmod.in
index dc03abc2a2ab..a32c0e353b19 100644
--- a/rules/host-libkmod.in
+++ b/rules/host-libkmod.in
@@ -2,4 +2,12 @@
 
 config HOST_LIBKMOD
 	tristate
+	select HOST_ZSTD	if HOST_LIBKMOD_ZSTD
 	default y if ALLYES
+
+if HOST_LIBKMOD
+
+config HOST_LIBKMOD_ZSTD
+	bool
+
+endif
diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make
index 57c8b2ecf9f9..1438eda33424 100644
--- a/rules/host-libkmod.make
+++ b/rules/host-libkmod.make
@@ -32,6 +32,7 @@ HOST_LIBKMOD_CONF_OPT	:= \
 	--disable-coverage \
 	--without-xz \
 	--without-zlib \
+	--$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \
 	--without-openssl
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libkmod.in b/rules/libkmod.in
index 1660f7c4b58b..80590a9d0d81 100644
--- a/rules/libkmod.in
+++ b/rules/libkmod.in
@@ -3,6 +3,8 @@
 menuconfig LIBKMOD
 	tristate
 	select ZLIB if LIBKMOD_ZLIB
+	select ZSTD if LIBKMOD_ZSTD
+	select HOST_LIBKMOD_ZSTD if LIBKMOD_ZSTD
 	prompt "libkmod                       "
 	help
 	  libkmod is a library with a set of tools frontends to handle common
@@ -83,6 +85,12 @@ config LIBKMOD_ZLIB
 	help
 	  Use the 'zlib' to handle compressed modules
 
+config LIBKMOD_ZSTD
+	bool
+	prompt "use zstd"
+	help
+	  Use 'libzstd' to handle Zstandard compressed modules
+
 config LIBKMOD_LOGGING
 	bool
 	prompt "enable syslog"
diff --git a/rules/libkmod.make b/rules/libkmod.make
index 4f6510fd92d0..f51d4323e283 100644
--- a/rules/libkmod.make
+++ b/rules/libkmod.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod
 #
 # Paths and names
 #
-LIBKMOD_VERSION	:= 27
-LIBKMOD_MD5	:= 3973a74786670d3062d89a827e266581
+LIBKMOD_VERSION	:= 28
+LIBKMOD_MD5	:= 0a2b887b1b3dfb8c0b3f41f598203e56
 LIBKMOD		:= kmod-$(LIBKMOD_VERSION)
 LIBKMOD_SUFFIX	:= tar.xz
 LIBKMOD_URL	:= $(call ptx/mirror, KERNEL, utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX))
@@ -45,6 +45,7 @@ LIBKMOD_CONF_OPT	:= \
 	--disable-coverage \
 	--without-xz \
 	--$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib \
+	--$(call ptx/wwo, PTXCONF_LIBKMOD_ZSTD)-zstd \
 	--without-openssl
 
 # ----------------------------------------------------------------------------
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH] libkmod: version bump 27 -> 28
  2021-05-10 10:19 [ptxdist] [PATCH] libkmod: version bump 27 -> 28 Philipp Zabel
@ 2021-05-11  8:08 ` Philipp Zabel
  2021-05-11 15:41   ` Michael Olbrich
  0 siblings, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2021-05-11  8:08 UTC (permalink / raw)
  To: ptxdist

On Mon, 2021-05-10 at 12:19 +0200, Philipp Zabel wrote:
> - add Zstandard compression support, allows to enable the
>   kernel CONFIG_MODULE_COMPRESS_ZSTD option
> - LIBKMOD_ZSTD selects HOST_LIBKMOD_ZSTD so depmod understands
>   Zstandard during kernel build
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/host-libkmod.in   | 8 ++++++++
>  rules/host-libkmod.make | 1 +
>  rules/libkmod.in        | 8 ++++++++
>  rules/libkmod.make      | 5 +++--
>  4 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/host-libkmod.in b/rules/host-libkmod.in
> index dc03abc2a2ab..a32c0e353b19 100644
> --- a/rules/host-libkmod.in
> +++ b/rules/host-libkmod.in
> @@ -2,4 +2,12 @@
>  
>  config HOST_LIBKMOD
>  	tristate
> +	select HOST_ZSTD	if HOST_LIBKMOD_ZSTD
>  	default y if ALLYES
> +
> +if HOST_LIBKMOD
> +
> +config HOST_LIBKMOD_ZSTD
> +	bool
> +
> +endif
> diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make
> index 57c8b2ecf9f9..1438eda33424 100644
> --- a/rules/host-libkmod.make
> +++ b/rules/host-libkmod.make
> @@ -32,6 +32,7 @@ HOST_LIBKMOD_CONF_OPT	:= \
>  	--disable-coverage \
>  	--without-xz \
>  	--without-zlib \
> +	--$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \
>  	--without-openssl
>  
>  # ----------------------------------------------------------------------------
> diff --git a/rules/libkmod.in b/rules/libkmod.in
> index 1660f7c4b58b..80590a9d0d81 100644
> --- a/rules/libkmod.in
> +++ b/rules/libkmod.in
> @@ -3,6 +3,8 @@
>  menuconfig LIBKMOD
>  	tristate
>  	select ZLIB if LIBKMOD_ZLIB
> +	select ZSTD if LIBKMOD_ZSTD

Of course this is also missing:

+	select HOST_LIBKMOD if LIBKMOD_ZSTD

> +	select HOST_LIBKMOD_ZSTD if LIBKMOD_ZSTD

Would this be the correct way to enable Zstandard support in depmod
during kernel build?

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH] libkmod: version bump 27 -> 28
  2021-05-11  8:08 ` Philipp Zabel
@ 2021-05-11 15:41   ` Michael Olbrich
  2021-05-12  6:25     ` Philipp Zabel
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2021-05-11 15:41 UTC (permalink / raw)
  To: ptxdist

On Tue, May 11, 2021 at 10:08:29AM +0200, Philipp Zabel wrote:
> On Mon, 2021-05-10 at 12:19 +0200, Philipp Zabel wrote:
> > - add Zstandard compression support, allows to enable the
> >   kernel CONFIG_MODULE_COMPRESS_ZSTD option
> > - LIBKMOD_ZSTD selects HOST_LIBKMOD_ZSTD so depmod understands
> >   Zstandard during kernel build
> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  rules/host-libkmod.in   | 8 ++++++++
> >  rules/host-libkmod.make | 1 +
> >  rules/libkmod.in        | 8 ++++++++
> >  rules/libkmod.make      | 5 +++--
> >  4 files changed, 20 insertions(+), 2 deletions(-)
> > 
> > diff --git a/rules/host-libkmod.in b/rules/host-libkmod.in
> > index dc03abc2a2ab..a32c0e353b19 100644
> > --- a/rules/host-libkmod.in
> > +++ b/rules/host-libkmod.in
> > @@ -2,4 +2,12 @@
> >  
> >  config HOST_LIBKMOD
> >  	tristate
> > +	select HOST_ZSTD	if HOST_LIBKMOD_ZSTD
> >  	default y if ALLYES
> > +
> > +if HOST_LIBKMOD
> > +
> > +config HOST_LIBKMOD_ZSTD
> > +	bool
> > +
> > +endif
> > diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make
> > index 57c8b2ecf9f9..1438eda33424 100644
> > --- a/rules/host-libkmod.make
> > +++ b/rules/host-libkmod.make
> > @@ -32,6 +32,7 @@ HOST_LIBKMOD_CONF_OPT	:= \
> >  	--disable-coverage \
> >  	--without-xz \
> >  	--without-zlib \
> > +	--$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \
> >  	--without-openssl
> >  
> >  # ----------------------------------------------------------------------------
> > diff --git a/rules/libkmod.in b/rules/libkmod.in
> > index 1660f7c4b58b..80590a9d0d81 100644
> > --- a/rules/libkmod.in
> > +++ b/rules/libkmod.in
> > @@ -3,6 +3,8 @@
> >  menuconfig LIBKMOD
> >  	tristate
> >  	select ZLIB if LIBKMOD_ZLIB
> > +	select ZSTD if LIBKMOD_ZSTD
> 
> Of course this is also missing:
> 
> +	select HOST_LIBKMOD if LIBKMOD_ZSTD
> 
> > +	select HOST_LIBKMOD_ZSTD if LIBKMOD_ZSTD

Please align the 'if's.

> Would this be the correct way to enable Zstandard support in depmod
> during kernel build?

It's not easy to find when building the kernel fails, but I don't have a
better idea either. But please do the same thing for zlib support to make
this consistent.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH] libkmod: version bump 27 -> 28
  2021-05-11 15:41   ` Michael Olbrich
@ 2021-05-12  6:25     ` Philipp Zabel
  0 siblings, 0 replies; 4+ messages in thread
From: Philipp Zabel @ 2021-05-12  6:25 UTC (permalink / raw)
  To: ptxdist

On Tue, 2021-05-11 at 17:41 +0200, Michael Olbrich wrote:
[...]
> > +	select HOST_LIBKMOD if LIBKMOD_ZSTD
> > 
> > > +	select HOST_LIBKMOD_ZSTD if LIBKMOD_ZSTD
> 
> Please align the 'if's.

Ok.

> > Would this be the correct way to enable Zstandard support in depmod
> > during kernel build?
> 
> It's not easy to find when building the kernel fails, but I don't have a
> better idea either.

The build doesn't even fail without compression support in depmod.
modprobe will just fail to find any compressed modules at runtime.

> But please do the same thing for zlib support to make
> this consistent.

Will do, thanks.

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-05-12  6:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-10 10:19 [ptxdist] [PATCH] libkmod: version bump 27 -> 28 Philipp Zabel
2021-05-11  8:08 ` Philipp Zabel
2021-05-11 15:41   ` Michael Olbrich
2021-05-12  6:25     ` Philipp Zabel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox