From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
Date: Wed, 09 Jul 2025 18:50:35 +0000 (UTC) [thread overview]
Message-ID: <1752087030.1cd12ccd617eb82eb7e0c278a962f16f5de98e5a.floppym@gentoo> (raw)
commit: 1cd12ccd617eb82eb7e0c278a962f16f5de98e5a
Author: Emil Velikov <emil.l.velikov <AT> gmail <DOT> com>
AuthorDate: Sun Oct 20 10:24:19 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jul 9 18:50:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd12ccd
sys-apps/kmod: switch to meson, drop static-lib support
Over the last few months, we've got meson support upstream and the plan
is to quickly migrate from autotools with just one version overlap.
There is no plan to support static-lib upstream and as illustrated in
the original thread it doesn't quite work since we get lots of symbol
collisions, so drop the IUSE flag and local workarounds.
Upstream has also started pulling the shell completions into the main
project, to indicate that use the respective get_*compdir helpers.
Suspecting those could live behind an IUSE flag, as does scdoc... Which
can come at a later day.
NOTE: kmod not installs the symlinks to sbin, update our logic to only
manage lsmod and modinfo.
Signed-off-by: Emil Velikov <emil.l.velikov <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/39053
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/kmod/kmod-9999.ebuild | 82 +++++++++++-------------------------------
1 file changed, 21 insertions(+), 61 deletions(-)
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index ef67100015c4..d8dd25935497 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools libtool bash-completion-r1
+inherit meson shell-completion
DESCRIPTION="Library and tools for managing linux kernel modules"
HOMEPAGE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"
@@ -18,7 +18,7 @@ fi
LICENSE="LGPL-2"
SLOT="0"
-IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd"
+IUSE="debug doc +lzma pkcs7 +tools +zlib +zstd"
# Upstream does not support running the test suite with custom configure flags.
# I was also told that the test suite is intended for kmod developers.
@@ -41,79 +41,39 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- doc? (
- dev-util/gtk-doc
- dev-build/gtk-doc-am
- )
+ app-text/scdoc
+ doc? ( dev-util/gtk-doc )
lzma? ( virtual/pkgconfig )
zlib? ( virtual/pkgconfig )
"
-if [[ ${PV} == 9999* ]]; then
- BDEPEND+=" app-text/scdoc"
-fi
-
-src_prepare() {
- default
-
- if [[ ! -e configure ]] || use doc ; then
- if use doc; then
- cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
- gtkdocize --copy --docdir libkmod/docs || die
- else
- touch libkmod/docs/gtk-doc.make
- fi
- eautoreconf
- else
- elibtoolize
- fi
-
- # Restore possibility of running --enable-static, bug #472608
- sed -i \
- -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
- configure || die
-}
-
src_configure() {
# TODO: >=33 enables decompressing without libraries being built in
# as kmod defers to the kernel. How should the ebuild be adapted?
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --enable-shared
- --with-bashcompletiondir="$(get_bashcompdir)"
- $(use_enable debug)
- $(usev doc '--enable-gtk-doc')
- $(use_enable static-libs static)
- $(use_enable tools)
- $(use_with lzma xz)
- $(use_with pkcs7 openssl)
- $(use_with zlib)
- $(use_with zstd)
+ local emesonargs=(
+ --bindir "${EPREFIX}/bin"
+ --sbindir "${EPREFIX}/sbin"
+ -Dbashcompletiondir="$(get_bashcompdir)"
+ -Dfishcompletiondir="$(get_fishcompdir)"
+ -Dzshcompletiondir="$(get_zshcompdir)"
+ $(meson_use debug debug-messages)
+ $(meson_use doc docs)
+ $(meson_use tools)
+ $(meson_feature lzma xz)
+ $(meson_feature pkcs7 openssl)
+ $(meson_feature zlib)
+ $(meson_feature zstd)
)
- if [[ ${PV} != 9999 ]] ; then
- # See src_install
- myeconfargs+=( --disable-manpages )
- fi
-
- econf "${myeconfargs[@]}"
+ meson_src_configure
}
src_install() {
- default
-
- if [[ ${PV} != 9999 ]] ; then
- # The dist logic is broken but the files are in there (bug #937942)
- emake -C man DESTDIR="${D}" install
- fi
-
- find "${ED}" -type f -name "*.la" -delete || die
+ meson_src_install
if use tools; then
local cmd
- for cmd in depmod insmod modprobe rmmod; do
- rm "${ED}"/bin/${cmd} || die
- dosym ../bin/kmod /sbin/${cmd}
+ for cmd in lsmod modinfo; do
+ dosym kmod /bin/${cmd}
done
fi
next reply other threads:[~2025-07-09 18:51 UTC|newest]
Thread overview: 192+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-09 18:50 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-30 6:08 [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/ Arthur Zamarin
2025-08-30 6:07 Arthur Zamarin
2025-08-30 6:07 Arthur Zamarin
2025-08-18 12:46 Sam James
2025-08-18 12:46 Sam James
2025-08-18 12:46 Sam James
2025-08-18 9:11 Sam James
2025-07-14 20:06 Mike Gilbert
2025-07-14 20:02 Mike Gilbert
2025-07-09 19:06 Mike Gilbert
2025-07-09 19:06 Mike Gilbert
2025-07-09 19:06 Mike Gilbert
2025-07-09 18:59 Mike Gilbert
2025-07-09 18:50 Mike Gilbert
2025-07-09 18:50 Mike Gilbert
2025-07-09 18:50 Mike Gilbert
2024-11-12 20:49 Sam James
2024-10-13 11:06 Sam James
2024-10-09 7:15 Arthur Zamarin
2024-10-09 0:06 Jakov Smolić
2024-10-05 14:30 Arthur Zamarin
2024-10-05 12:28 Arthur Zamarin
2024-10-05 11:12 Sam James
2024-08-15 0:26 Sam James
2024-08-14 22:53 Sam James
2024-06-21 2:33 Mike Gilbert
2024-06-21 2:33 Mike Gilbert
2024-06-21 2:33 Mike Gilbert
2024-06-21 2:23 Mike Gilbert
2024-04-29 7:51 Jakov Smolić
2024-04-29 7:51 Jakov Smolić
2024-03-07 22:19 Mike Gilbert
2024-03-07 21:02 Sam James
2024-03-07 20:21 Sam James
2023-12-17 19:11 Arthur Zamarin
2023-12-15 12:53 Arthur Zamarin
2023-12-15 10:10 Michał Górny
2023-12-15 7:49 Sam James
2023-12-15 7:42 Sam James
2023-12-15 7:34 Sam James
2023-12-15 7:14 Sam James
2023-10-12 5:50 Sam James
2023-10-12 5:48 Sam James
2023-10-12 5:48 Sam James
2023-07-13 17:44 Mike Gilbert
2023-03-04 22:30 Jakov Smolić
2023-03-04 14:24 Arthur Zamarin
2023-03-04 11:13 Arthur Zamarin
2023-03-04 11:13 Arthur Zamarin
2023-03-04 9:00 Arthur Zamarin
2023-03-04 8:18 Arthur Zamarin
2023-03-04 6:30 Arthur Zamarin
2023-03-04 6:07 Arthur Zamarin
2023-02-03 19:03 Sam James
2022-09-23 2:09 Sam James
2022-09-16 18:07 Arthur Zamarin
2022-09-16 15:51 Arthur Zamarin
2022-09-15 17:14 Arthur Zamarin
2022-09-07 1:53 Sam James
2022-09-07 1:50 Sam James
2022-09-07 1:50 Sam James
2022-09-06 21:59 Jakov Smolić
2022-09-06 21:58 Jakov Smolić
2022-07-28 13:20 Sam James
2022-07-01 8:41 Sam James
2022-06-18 13:05 Sam James
2022-06-16 15:53 Sam James
2022-06-16 15:30 Sam James
2021-11-09 4:29 Georgy Yakovlev
2021-11-09 4:29 Georgy Yakovlev
2021-09-04 17:35 David Seifert
2021-08-12 15:31 Sam James
2021-08-11 20:14 Sam James
2021-08-11 0:24 Sam James
2021-08-11 0:12 Sam James
2021-08-11 0:02 Sam James
2021-08-10 15:36 Agostino Sarubbo
2021-08-09 15:15 Mike Gilbert
2021-05-21 7:06 Lars Wendler
2021-04-29 19:20 Mikle Kolyada
2021-04-03 18:51 Mike Gilbert
2021-02-16 12:30 Sam James
2021-02-15 10:48 Sam James
2021-02-14 14:53 Sam James
2021-02-11 7:53 Sam James
2021-02-10 16:29 Sergei Trofimovich
2021-02-09 22:52 Sam James
2021-02-09 6:16 Sam James
2021-02-09 6:15 Sam James
2021-02-09 6:15 Sam James
2021-01-08 19:27 Lars Wendler
2021-01-08 14:15 Lars Wendler
2020-10-26 17:32 Thomas Deutschmann
2020-09-20 10:05 Mikle Kolyada
2020-09-19 20:06 Mikle Kolyada
2020-09-18 8:11 Agostino Sarubbo
2020-09-07 8:20 Sergei Trofimovich
2020-09-06 7:49 Sergei Trofimovich
2020-09-04 10:31 Sergei Trofimovich
2020-09-04 4:22 Sam James
2020-09-04 3:34 Sam James
2020-09-03 14:50 Thomas Deutschmann
2020-09-03 14:16 Thomas Deutschmann
2020-05-04 17:36 Thomas Deutschmann
2020-03-06 15:32 Mike Gilbert
2020-03-05 16:00 Mike Gilbert
2020-03-05 16:00 Mike Gilbert
2020-02-19 9:48 Lars Wendler
2020-02-19 9:48 Lars Wendler
2020-02-10 21:25 Michał Górny
2019-12-05 1:52 Matt Turner
2019-11-30 21:45 Sergei Trofimovich
2019-11-15 18:50 Mike Gilbert
2019-11-15 18:45 Mike Gilbert
2019-11-15 18:37 Mike Gilbert
2019-11-13 11:28 Agostino Sarubbo
2019-11-12 16:02 Agostino Sarubbo
2019-11-12 10:38 Agostino Sarubbo
2019-11-12 10:13 Agostino Sarubbo
2019-11-07 0:52 Aaron Bauman
2019-11-02 8:01 Mikle Kolyada
2019-11-02 8:01 Mikle Kolyada
2019-11-02 8:01 Mikle Kolyada
2019-11-01 10:39 Mikle Kolyada
2019-10-28 8:38 Agostino Sarubbo
2019-10-27 23:20 Thomas Deutschmann
2019-08-18 16:25 Mike Gilbert
2019-06-10 14:23 Thomas Deutschmann
2019-05-05 10:36 Mikle Kolyada
2019-03-02 17:35 Lars Wendler
2019-03-02 16:31 Mikle Kolyada
2019-03-02 16:31 Mikle Kolyada
2019-03-02 16:31 Mikle Kolyada
2019-03-02 16:31 Mikle Kolyada
2019-02-24 19:20 Markus Meier
2019-02-17 17:14 Sergei Trofimovich
2019-02-17 17:08 Sergei Trofimovich
2019-02-17 16:57 Sergei Trofimovich
2019-02-15 7:16 Sergei Trofimovich
2019-02-14 22:09 Sergei Trofimovich
2019-02-14 19:05 Mart Raudsepp
2019-02-14 17:40 Mikle Kolyada
2019-02-13 23:46 Lars Wendler
2019-02-13 23:46 Lars Wendler
2018-05-18 16:01 Mike Gilbert
2018-04-21 9:42 Mikle Kolyada
2018-03-25 18:23 Lars Wendler
2018-03-21 22:40 Mart Raudsepp
2018-03-15 14:22 Mikle Kolyada
2018-03-04 11:34 Tobias Klausmann
2018-02-10 18:38 Sergei Trofimovich
2018-01-15 19:03 Tobias Klausmann
2018-01-12 19:35 Thomas Deutschmann
2018-01-11 22:31 Sergei Trofimovich
2018-01-09 22:26 Sergei Trofimovich
2018-01-09 8:47 Lars Wendler
2018-01-09 8:47 Lars Wendler
2017-05-03 2:06 Patrick McLean
2017-02-27 10:44 Lars Wendler
2017-02-27 10:44 Lars Wendler
2017-02-17 3:25 Mike Frysinger
2017-01-31 16:12 Jeroen Roovers
2017-01-27 2:27 Zac Medico
2017-01-25 12:16 Tobias Klausmann
2017-01-23 16:27 Agostino Sarubbo
2017-01-22 16:27 Agostino Sarubbo
2017-01-21 20:33 Agostino Sarubbo
2017-01-19 10:59 Agostino Sarubbo
2017-01-19 10:37 Agostino Sarubbo
2016-11-10 6:20 Mike Frysinger
2016-09-15 17:00 William Hubbs
2016-09-15 16:57 William Hubbs
2016-08-16 1:04 William Hubbs
2016-08-15 21:15 William Hubbs
2016-07-23 12:21 Lars Wendler
2016-07-06 9:23 Agostino Sarubbo
2016-05-25 7:44 Jeroen Roovers
2016-05-25 6:29 Matt Turner
2016-05-17 18:37 Markus Meier
2016-05-13 14:51 Agostino Sarubbo
2016-03-30 23:48 Mike Frysinger
2016-03-30 23:48 Mike Frysinger
2016-02-29 8:46 Stephen Klimaszewski
2015-12-04 22:26 William Hubbs
2015-11-21 14:20 Markus Meier
2015-11-16 14:19 Agostino Sarubbo
2015-11-15 20:51 Matt Turner
2015-11-05 11:20 Agostino Sarubbo
2015-11-04 15:17 Agostino Sarubbo
2015-11-02 5:20 Jeroen Roovers
2015-11-01 16:03 Mikle Kolyada
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=1752087030.1cd12ccd617eb82eb7e0c278a962f16f5de98e5a.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/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