From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/2] host-libkmod: Follow target libkmod v33 -> v34 bump.
Date: Sun, 23 Feb 2025 20:22:15 +0100 [thread overview]
Message-ID: <20250223192215.1957788-2-christian.melki@t2data.com> (raw)
In-Reply-To: <20250223192215.1957788-1-christian.melki@t2data.com>
* 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
next prev parent reply other threads:[~2025-02-23 19:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-23 19:22 [ptxdist] [PATCH 1/2] libkmod: Version bump. v33 -> v34 Christian Melki
2025-02-23 19:22 ` Christian Melki [this message]
2025-02-24 15:53 ` [ptxdist] [APPLIED] host-libkmod: Follow target libkmod v33 -> v34 bump Michael Olbrich
2025-02-24 15:53 ` [ptxdist] [APPLIED] libkmod: Version bump. v33 -> v34 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250223192215.1957788-2-christian.melki@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox