Pretty significant bump. Runtime dlopen loadable compression etc.
Autotools is set to be dropped and seemed broken on this last release,
so convert it to meson.
https://github.com/kmod-project/kmod/releases/tag/v34

* Convert autotools to meson.

Signed-off-by: Christian Melki <[email protected]>
---
 rules/libkmod.in   |  1 +
 rules/libkmod.make | 33 ++++++++++++++-------------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/rules/libkmod.in b/rules/libkmod.in
index 11af184e8..4b7d27c5c 100644
--- a/rules/libkmod.in
+++ b/rules/libkmod.in
@@ -2,6 +2,7 @@
 
 menuconfig LIBKMOD
        tristate
+       select HOST_MESON
        select ZLIB                     if LIBKMOD_ZLIB
        select ZSTD                     if LIBKMOD_ZSTD
        select HOST_LIBKMOD             if LIBKMOD_ZLIB || LIBKMOD_ZSTD
diff --git a/rules/libkmod.make b/rules/libkmod.make
index b091edc8c..994ba51c3 100644
--- a/rules/libkmod.make
+++ b/rules/libkmod.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod
 #
 # Paths and names
 #
-LIBKMOD_VERSION        := 33
-LIBKMOD_MD5    := c451c4aa61521adbe8af147f498046f8
+LIBKMOD_VERSION        := 34
+LIBKMOD_MD5    := 3e6c5c9ad9c7367ab9c3cc4f08dfde62
 LIBKMOD                := kmod-$(LIBKMOD_VERSION)
 LIBKMOD_SUFFIX := tar.xz
 LIBKMOD_URL    := $(call ptx/mirror, KERNEL, 
utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX))
@@ -32,24 +32,19 @@ LIBKMOD_CVE_PRODUCT := kernel:kmod
 # Prepare
 # ----------------------------------------------------------------------------
 
-LIBKMOD_CONF_TOOL      := autoconf
+LIBKMOD_CONF_TOOL      := meson
 LIBKMOD_CONF_OPT       := \
-       $(CROSS_AUTOCONF_USR) \
-       $(GLOBAL_LARGE_FILE_OPTION) \
-       --$(call ptx/endis, PTXCONF_LIBKMOD_TOOLS)-tools \
-       --disable-manpages \
-       --disable-test-modules \
-       --$(call ptx/endis, PTXCONF_LIBKMOD_LOGGING)-logging \
-       --$(call ptx/endis, PTXCONF_LIBKMOD_DEBUG)-debug \
-       --disable-coverage \
-       --disable-gtk-doc \
-       --disable-gtk-doc-html \
-       --disable-gtk-doc-pdf \
-       --$(call ptx/endis, PTXDIST_Y2038)-year2038 \
-       --$(call ptx/wwo, PTXCONF_LIBKMOD_ZSTD)-zstd \
-       --without-xz \
-       --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib \
-       --without-openssl
+       $(CROSS_MESON_USR) \
+       -Dbuild-tests=false \
+       -Ddebug-messages=$(call ptx/truefalse,PTXCONF_LIBKMOD_DEBUG) \
+       -Ddocs=false \
+       -Dlogging=$(call ptx/truefalse,PTXCONF_LIBKMOD_LOGGING) \
+       -Dmanpages=false \
+       -Dopenssl=disabled \
+       -Dtools=$(call ptx/truefalse,PTXCONF_LIBKMOD_TOOLS) \
+       -Dzstd=$(call ptx/endis,PTXCONF_LIBKMOD_ZSTD)d \
+       -Dxz=disabled \
+       -Dzlib=$(call ptx/endis,PTXCONF_LIBKMOD_ZLIB)d
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.34.1


Reply via email to