[ptxdist] [PATCH v2] libkmod: version bump 27 -> 28

[Philipp Zabel <p.zabel@pengutronix.de>]

- add Zstandard compression support, allows to enable the
  kernel CONFIG_MODULE_COMPRESS_ZSTD option
- LIBKMOD_ZLIB/ZSTD select HOST_LIBKMOD_ZLIB/ZSTD so depmod understands
  compressed modules during kernel build
---
Changes since v1:
 - fix alignment
 - enable host-libkmod zlib support, selected by libkmod zlib support
---
 rules/host-libkmod.in   | 12 ++++++++++++
 rules/host-libkmod.make |  3 ++-
 rules/libkmod.in        | 12 +++++++++++-
 rules/libkmod.make      |  5 +++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/rules/host-libkmod.in b/rules/host-libkmod.in
index dc03abc2a2ab..29b01e9dbebd 100644
--- a/rules/host-libkmod.in
+++ b/rules/host-libkmod.in
@@ -2,4 +2,16 @@
 
 config HOST_LIBKMOD
 	tristate
+	select HOST_ZLIB	if HOST_LIBKMOD_ZLIB
+	select HOST_ZSTD	if HOST_LIBKMOD_ZSTD
 	default y if ALLYES
+
+if HOST_LIBKMOD
+
+config HOST_LIBKMOD_ZLIB
+	bool
+
+config HOST_LIBKMOD_ZSTD
+	bool
+
+endif
diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make
index 57c8b2ecf9f9..be37a7c59c71 100644
--- a/rules/host-libkmod.make
+++ b/rules/host-libkmod.make
@@ -31,7 +31,8 @@ HOST_LIBKMOD_CONF_OPT	:= \
 	--disable-python \
 	--disable-coverage \
 	--without-xz \
-	--without-zlib \
+	--$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZLIB)-zlib \
+	--$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \
 	--without-openssl
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libkmod.in b/rules/libkmod.in
index 1660f7c4b58b..11af184e81df 100644
--- a/rules/libkmod.in
+++ b/rules/libkmod.in
@@ -2,7 +2,11 @@
 
 menuconfig LIBKMOD
 	tristate
-	select ZLIB if LIBKMOD_ZLIB
+	select ZLIB			if LIBKMOD_ZLIB
+	select ZSTD			if LIBKMOD_ZSTD
+	select HOST_LIBKMOD		if LIBKMOD_ZLIB || LIBKMOD_ZSTD
+	select HOST_LIBKMOD_ZLIB	if LIBKMOD_ZLIB
+	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 +87,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