* [ptxdist] [PATCH 1/2] libkmod: Version bump. v33 -> v34
@ 2025-02-23 19:22 Christian Melki
2025-02-23 19:22 ` [ptxdist] [PATCH 2/2] host-libkmod: Follow target libkmod v33 -> v34 bump Christian Melki
2025-02-24 15:53 ` [ptxdist] [APPLIED] libkmod: Version bump. v33 -> v34 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Christian Melki @ 2025-02-23 19:22 UTC (permalink / raw)
To: ptxdist
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 <christian.melki@t2data.com>
---
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] host-libkmod: Follow target libkmod v33 -> v34 bump.
2025-02-23 19:22 [ptxdist] [PATCH 1/2] libkmod: Version bump. v33 -> v34 Christian Melki
@ 2025-02-23 19:22 ` Christian Melki
2025-02-24 15:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-02-24 15:53 ` [ptxdist] [APPLIED] libkmod: Version bump. v33 -> v34 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Christian Melki @ 2025-02-23 19:22 UTC (permalink / raw)
To: ptxdist
* Convert from autotools to meson.
* Drop special install rule. Should be ok now if I understood it right.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/host-libkmod.in | 1 +
rules/host-libkmod.make | 39 +++++++++++++--------------------------
2 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/rules/host-libkmod.in b/rules/host-libkmod.in
index 29b01e9db..d73ccf525 100644
--- a/rules/host-libkmod.in
+++ b/rules/host-libkmod.in
@@ -2,6 +2,7 @@
config HOST_LIBKMOD
tristate
+ select HOST_MESON
select HOST_ZLIB if HOST_LIBKMOD_ZLIB
select HOST_ZSTD if HOST_LIBKMOD_ZSTD
default y if ALLYES
diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make
index adb42a33a..766d8be26 100644
--- a/rules/host-libkmod.make
+++ b/rules/host-libkmod.make
@@ -16,33 +16,20 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBKMOD) += host-libkmod
# ----------------------------------------------------------------------------
#
-# autoconf
+# meson
#
-HOST_LIBKMOD_CONF_TOOL := autoconf
+HOST_LIBKMOD_CONF_TOOL := meson
HOST_LIBKMOD_CONF_OPT := \
- $(HOST_AUTOCONF) \
- --disable-static \
- --enable-shared \
- --enable-tools \
- --disable-manpages \
- --disable-test-modules \
- --disable-logging \
- --disable-debug \
- --disable-coverage \
- --enable-year2038 \
- --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \
- --without-xz \
- --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZLIB)-zlib \
- --without-openssl
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-libkmod.install:
- @$(call targetinfo)
- @$(call world/install, HOST_LIBKMOD)
- @ln -s ../bin/kmod $(HOST_LIBKMOD_PKGDIR)/usr/sbin/depmod
- @$(call touch)
+ $(HOST_MESON_OPT) \
+ -Dbuild-tests=false \
+ -Ddebug-messages=false \
+ -Ddocs=false \
+ -Dlogging=false \
+ -Dmanpages=false \
+ -Dopenssl=disabled \
+ -Dtools=true \
+ -Dzstd=$(call ptx/endis,PTXCONF_HOST_LIBKMOD_ZSTD)d \
+ -Dxz=disabled \
+ -Dzlib=$(call ptx/endis,PTXCONF_HOST_LIBKMOD_ZLIB)d
# vim: syntax=make
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] libkmod: Version bump. v33 -> v34
2025-02-23 19:22 [ptxdist] [PATCH 1/2] libkmod: Version bump. v33 -> v34 Christian Melki
2025-02-23 19:22 ` [ptxdist] [PATCH 2/2] host-libkmod: Follow target libkmod v33 -> v34 bump Christian Melki
@ 2025-02-24 15:53 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-02-24 15:53 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as a84172a394a8b75743e8c4d7dea0b2c7396821b9.
Michael
[sent from post-receive hook]
On Mon, 24 Feb 2025 16:53:02 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> 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 <christian.melki@t2data.com>
> Message-Id: <20250223192215.1957788-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libkmod.in b/rules/libkmod.in
> index 11af184e81df..4b7d27c5c88b 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 b091edc8cf2d..994ba51c33e5 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] host-libkmod: Follow target libkmod v33 -> v34 bump.
2025-02-23 19:22 ` [ptxdist] [PATCH 2/2] host-libkmod: Follow target libkmod v33 -> v34 bump Christian Melki
@ 2025-02-24 15:53 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-02-24 15:53 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 644753c124fc2bac5e4f43e7d0894817564cba07.
Michael
[sent from post-receive hook]
On Mon, 24 Feb 2025 16:53:03 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> * Convert from autotools to meson.
>
> * Drop special install rule. Should be ok now if I understood it right.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250223192215.1957788-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-libkmod.in b/rules/host-libkmod.in
> index 29b01e9dbebd..d73ccf52557b 100644
> --- a/rules/host-libkmod.in
> +++ b/rules/host-libkmod.in
> @@ -2,6 +2,7 @@
>
> config HOST_LIBKMOD
> tristate
> + select HOST_MESON
> select HOST_ZLIB if HOST_LIBKMOD_ZLIB
> select HOST_ZSTD if HOST_LIBKMOD_ZSTD
> default y if ALLYES
> diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make
> index adb42a33af9d..766d8be26f2a 100644
> --- a/rules/host-libkmod.make
> +++ b/rules/host-libkmod.make
> @@ -16,33 +16,20 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBKMOD) += host-libkmod
> # ----------------------------------------------------------------------------
>
> #
> -# autoconf
> +# meson
> #
> -HOST_LIBKMOD_CONF_TOOL := autoconf
> +HOST_LIBKMOD_CONF_TOOL := meson
> HOST_LIBKMOD_CONF_OPT := \
> - $(HOST_AUTOCONF) \
> - --disable-static \
> - --enable-shared \
> - --enable-tools \
> - --disable-manpages \
> - --disable-test-modules \
> - --disable-logging \
> - --disable-debug \
> - --disable-coverage \
> - --enable-year2038 \
> - --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \
> - --without-xz \
> - --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZLIB)-zlib \
> - --without-openssl
> -
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/host-libkmod.install:
> - @$(call targetinfo)
> - @$(call world/install, HOST_LIBKMOD)
> - @ln -s ../bin/kmod $(HOST_LIBKMOD_PKGDIR)/usr/sbin/depmod
> - @$(call touch)
> + $(HOST_MESON_OPT) \
> + -Dbuild-tests=false \
> + -Ddebug-messages=false \
> + -Ddocs=false \
> + -Dlogging=false \
> + -Dmanpages=false \
> + -Dopenssl=disabled \
> + -Dtools=true \
> + -Dzstd=$(call ptx/endis,PTXCONF_HOST_LIBKMOD_ZSTD)d \
> + -Dxz=disabled \
> + -Dzlib=$(call ptx/endis,PTXCONF_HOST_LIBKMOD_ZLIB)d
>
> # vim: syntax=make
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-24 15:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-23 19:22 [ptxdist] [PATCH 1/2] libkmod: Version bump. v33 -> v34 Christian Melki
2025-02-23 19:22 ` [ptxdist] [PATCH 2/2] host-libkmod: Follow target libkmod v33 -> v34 bump Christian Melki
2025-02-24 15:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-02-24 15:53 ` [ptxdist] [APPLIED] libkmod: Version bump. v33 -> v34 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox