[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 2751bf3a225e0f7520dea945d3a6b4f901cb3ca6 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Oct 9 07:15:11 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Oct 9 07:15:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2751bf3a sys-apps/kmod: Stabilize 33 arm64, #940868 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-33.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-33.ebuild b/sys-apps/kmod/kmod-33.ebuild index eae4e008977f..0e572687d292 100644 --- a/sys-apps/kmod/kmod-33.ebuild +++ b/sys-apps/kmod/kmod-33.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: fa98c68f304f830f186be9e742eecb677a9699a3 Author: Jakov Smolić gentoo org> AuthorDate: Wed Oct 9 00:05:23 2024 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Oct 9 00:05:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa98c68f sys-apps/kmod: Stabilize 33 ppc, #940868 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kmod/kmod-33.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-33.ebuild b/sys-apps/kmod/kmod-33.ebuild index 7a9b69dd31e6..eae4e008977f 100644 --- a/sys-apps/kmod/kmod-33.ebuild +++ b/sys-apps/kmod/kmod-33.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: a8f5333b7646a9693fb19b885e85838ccb430a9e Author: Arthur Zamarin gentoo org> AuthorDate: Sat Oct 5 14:29:45 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Oct 5 14:29:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f5333b sys-apps/kmod: Stabilize 33 arm, #940868 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-33.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-33.ebuild b/sys-apps/kmod/kmod-33.ebuild index 8d69fd690285..7a9b69dd31e6 100644 --- a/sys-apps/kmod/kmod-33.ebuild +++ b/sys-apps/kmod/kmod-33.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" fi LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 5f7afda462ba776a7dd4758cf564e7d1e3767506 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Oct 5 12:28:41 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Oct 5 12:28:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7afda4 sys-apps/kmod: Stabilize 33 amd64, #940868 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-33.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-33.ebuild b/sys-apps/kmod/kmod-33.ebuild index aec4117d5680..8ea9403f3e4f 100644 --- a/sys-apps/kmod/kmod-33.ebuild +++ b/sys-apps/kmod/kmod-33.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 6fb23cfc5a745b149fd25fa34fb17b1d0b64204e Author: Sam James gentoo org> AuthorDate: Sat Oct 5 11:10:59 2024 + Commit: Sam James gentoo org> CommitDate: Sat Oct 5 11:10:59 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb23cfc sys-apps/kmod: Stabilize 33 ppc64, #940868 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-33.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-33.ebuild b/sys-apps/kmod/kmod-33.ebuild index ef67100015c4..aec4117d5680 100644 --- a/sys-apps/kmod/kmod-33.ebuild +++ b/sys-apps/kmod/kmod-33.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 182d0bcc12df904e8ab40dcb902c555a1aed34e5 Author: Sam James gentoo org> AuthorDate: Thu Aug 15 00:25:37 2024 + Commit: Sam James gentoo org> CommitDate: Thu Aug 15 00:26:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182d0bcc sys-apps/kmod: workaround broken man dist logic The man pages are in the dist but if they're not set to be *built*, the directory isn't recursed into. Workaround that in src_install. Closes: https://bugs.gentoo.org/937942 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-33.ebuild | 10 ++ sys-apps/kmod/kmod-.ebuild | 10 ++ 2 files changed, 20 insertions(+) diff --git a/sys-apps/kmod/kmod-33.ebuild b/sys-apps/kmod/kmod-33.ebuild index 3b1e8cdb68ca..b9af14296739 100644 --- a/sys-apps/kmod/kmod-33.ebuild +++ b/sys-apps/kmod/kmod-33.ebuild @@ -91,12 +91,22 @@ src_configure() { $(use_with zstd) ) + if [[ ${PV} != ]] ; then + # See src_install + myeconfargs+=( --disable-manpages ) + fi + econf "${myeconfargs[@]}" } src_install() { default + if [[ ${PV} != ]] ; 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 if use tools; then diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 3b1e8cdb68ca..b9af14296739 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -91,12 +91,22 @@ src_configure() { $(use_with zstd) ) + if [[ ${PV} != ]] ; then + # See src_install + myeconfargs+=( --disable-manpages ) + fi + econf "${myeconfargs[@]}" } src_install() { default + if [[ ${PV} != ]] ; 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 if use tools; then
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 57ea37b8eb6015afae67afff69dbc619edce7c4d Author: Sam James gentoo org> AuthorDate: Wed Aug 14 22:40:21 2024 + Commit: Sam James gentoo org> CommitDate: Wed Aug 14 22:52:58 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ea37b8 sys-apps/kmod: add 33 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/Manifest | 1 + sys-apps/kmod/{kmod-.ebuild => kmod-33.ebuild} | 8 +++- sys-apps/kmod/kmod-.ebuild | 8 +++- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index f630cdcac57d..3f2f5cc1ff71 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1 +1,2 @@ DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24 +DIST kmod-33.tar.xz 514428 BLAKE2B 5fb4ea9d96217f8c94cba752b07a1b53228c6ae79dbaa605030cd84e3c6ca8d9c1a703a0253cea1d6c78a78f1507e2a1d9c6215d28dcb01b9e7f8b98a9fde425 SHA512 32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8 diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-33.ebuild similarity index 95% copy from sys-apps/kmod/kmod-.ebuild copy to sys-apps/kmod/kmod-33.ebuild index 1e49c67ac4af..3b1e8cdb68ca 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-33.ebuild @@ -49,13 +49,9 @@ BDEPEND=" zlib? ( virtual/pkgconfig ) " if [[ ${PV} == * ]]; then - BDEPEND+=" dev-libs/libxslt" + BDEPEND+=" app-text/scdoc" fi -PATCHES=( - "${FILESDIR}"/${PN}-31-musl-basename.patch -) - src_prepare() { default @@ -78,6 +74,8 @@ src_prepare() { } 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" diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 1e49c67ac4af..3b1e8cdb68ca 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -49,13 +49,9 @@ BDEPEND=" zlib? ( virtual/pkgconfig ) " if [[ ${PV} == * ]]; then - BDEPEND+=" dev-libs/libxslt" + BDEPEND+=" app-text/scdoc" fi -PATCHES=( - "${FILESDIR}"/${PN}-31-musl-basename.patch -) - src_prepare() { default @@ -78,6 +74,8 @@ src_prepare() { } 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"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 30ae8ed11ef8caaf0d67f1e0d89812597a0c872c Author: Mike Gilbert gentoo org> AuthorDate: Fri Jun 21 02:30:24 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Jun 21 02:30:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30ae8ed1 sys-apps/kmod: update HOMEPAGE Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/kmod-32-r2.ebuild | 2 +- sys-apps/kmod/kmod-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kmod/kmod-32-r2.ebuild b/sys-apps/kmod/kmod-32-r2.ebuild index 9bd668010dfb..f03e5c487078 100644 --- a/sys-apps/kmod/kmod-32-r2.ebuild +++ b/sys-apps/kmod/kmod-32-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit autotools libtool bash-completion-r1 DESCRIPTION="Library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; +HOMEPAGE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"; if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index f672ae1e6f91..8a46c59fa68a 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit autotools libtool bash-completion-r1 DESCRIPTION="Library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; +HOMEPAGE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"; if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 9c2462d4463f7cd423e23f682e6740d5d844e9a8 Author: Mike Gilbert gentoo org> AuthorDate: Fri Jun 21 02:33:12 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Jun 21 02:33:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2462d4 sys-apps/kmod: update SRC_URI Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/kmod-32-r2.ebuild | 2 +- sys-apps/kmod/kmod-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kmod/kmod-32-r2.ebuild b/sys-apps/kmod/kmod-32-r2.ebuild index f03e5c487078..5b930673338b 100644 --- a/sys-apps/kmod/kmod-32-r2.ebuild +++ b/sys-apps/kmod/kmod-32-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; inherit git-r3 else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 8a46c59fa68a..1e49c67ac4af 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; inherit git-r3 else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 420467c384354eeac3d5e364bd63f7b0f59f370b Author: Mike Gilbert gentoo org> AuthorDate: Fri Jun 21 02:29:50 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Jun 21 02:29:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420467c3 sys-apps/kmod: drop 31, 31-r1 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/Manifest | 1 - sys-apps/kmod/kmod-31-r1.ebuild | 154 --- sys-apps/kmod/kmod-31.ebuild| 224 3 files changed, 379 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 0d9fcf490e5c..f630cdcac57d 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,2 +1 @@ -DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24 diff --git a/sys-apps/kmod/kmod-31-r1.ebuild b/sys-apps/kmod/kmod-31-r1.ebuild deleted file mode 100644 index d0de1d663e3e.. --- a/sys-apps/kmod/kmod-31-r1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools libtool bash-completion-r1 - -DESCRIPTION="Library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; - -if [[ ${PV} == * ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +lzma pkcs7 static-libs +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. -# So we have to restrict it. -# See bug #408915. -#RESTRICT="test" - -# - >=zlib-1.2.6 required because of bug #427130 -# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND=" - !sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - pkcs7? ( >=dev-libs/openssl-1.1.0:= ) - zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-build/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == * ]]; then - BDEPEND+=" dev-libs/libxslt" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-31-musl-basename.patch -) - -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() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - --disable-python - $(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) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || die - - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - dosym ../bin/kmod /sbin/${cmd} - done - - # These are also usable as normal user - for cmd in lsmod modinfo; do
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: eb13455af714ffb37726b04cbc87f91bbc2fbf97 Author: Mike Gilbert gentoo org> AuthorDate: Fri Jun 21 02:16:09 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Jun 21 02:19:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb13455a sys-apps/kmod: move kmod and symlinks back to / This allows us to drop the split-usr USE flag and maintains compatibility with the kernel and genkernel. Closes: https://bugs.gentoo.org/934535 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/{kmod-32-r1.ebuild => kmod-32-r2.ebuild} | 14 +- sys-apps/kmod/kmod-.ebuild | 14 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sys-apps/kmod/kmod-32-r1.ebuild b/sys-apps/kmod/kmod-32-r2.ebuild similarity index 93% rename from sys-apps/kmod/kmod-32-r1.ebuild rename to sys-apps/kmod/kmod-32-r2.ebuild index e7ffd559cc75..9bd668010dfb 100644 --- a/sys-apps/kmod/kmod-32-r1.ebuild +++ b/sys-apps/kmod/kmod-32-r2.ebuild @@ -18,7 +18,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 split-usr static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 static-libs +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. @@ -79,6 +79,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" $(use_enable debug) @@ -99,10 +101,12 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die - if use tools && use split-usr; then - # Move modprobe to /sbin to match CONFIG_MODPROBE_PATH from kernel - rm "${ED}/usr/bin/modprobe" || die - dosym ../usr/bin/kmod /sbin/modprobe + if use tools; then + local cmd + for cmd in depmod insmod modprobe rmmod; do + rm "${ED}"/bin/${cmd} || die + dosym ../bin/kmod /sbin/${cmd} + done fi cat <<-EOF > "${T}"/usb-load-ehci-first.conf diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 341d36a4f5e2..f672ae1e6f91 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -18,7 +18,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 split-usr static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 static-libs +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. @@ -79,6 +79,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" $(use_enable debug) @@ -99,10 +101,12 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die - if use tools && use split-usr; then - # Move modprobe to /sbin to match CONFIG_MODPROBE_PATH from kernel - rm "${ED}/usr/bin/modprobe" || die - dosym ../usr/bin/kmod /sbin/modprobe + if use tools; then + local cmd + for cmd in depmod insmod modprobe rmmod; do + rm "${ED}"/bin/${cmd} || die + dosym ../bin/kmod /sbin/${cmd} + done fi cat <<-EOF > "${T}"/usb-load-ehci-first.conf
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 443ccad355c14442a396cf6589313a79797784b0 Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 29 07:50:42 2024 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 29 07:50:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443ccad3 sys-apps/kmod: Stabilize 32-r1 ppc, #930909 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kmod/kmod-32-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-32-r1.ebuild b/sys-apps/kmod/kmod-32-r1.ebuild index 341d36a4f5e2..3b2e27c7f258 100644 --- a/sys-apps/kmod/kmod-32-r1.ebuild +++ b/sys-apps/kmod/kmod-32-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: b2b33091717dcf1690c182216ae1b1edb518343d Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 29 07:50:43 2024 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 29 07:50:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b33091 sys-apps/kmod: Stabilize 32-r1 ppc64, #930909 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kmod/kmod-32-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-32-r1.ebuild b/sys-apps/kmod/kmod-32-r1.ebuild index 3b2e27c7f258..08673b74bc54 100644 --- a/sys-apps/kmod/kmod-32-r1.ebuild +++ b/sys-apps/kmod/kmod-32-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: e0f3f9da51b19053e04e59e723257f357bddb5d2 Author: Mike Gilbert gentoo org> AuthorDate: Thu Mar 7 22:18:33 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 7 22:18:33 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f3f9da sys-apps/kmod: move modprobe to /sbin on split-usr The kernel calls /sbin/modprobe by default, so we need to match that. Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/{kmod-32.ebuild => kmod-32-r1.ebuild} | 8 +++- sys-apps/kmod/kmod-.ebuild | 8 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys-apps/kmod/kmod-32.ebuild b/sys-apps/kmod/kmod-32-r1.ebuild similarity index 93% rename from sys-apps/kmod/kmod-32.ebuild rename to sys-apps/kmod/kmod-32-r1.ebuild index 531212bc23bc..341d36a4f5e2 100644 --- a/sys-apps/kmod/kmod-32.ebuild +++ b/sys-apps/kmod/kmod-32-r1.ebuild @@ -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 split-usr static-libs +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. @@ -99,6 +99,12 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die + if use tools && use split-usr; then + # Move modprobe to /sbin to match CONFIG_MODPROBE_PATH from kernel + rm "${ED}/usr/bin/modprobe" || die + dosym ../usr/bin/kmod /sbin/modprobe + fi + cat <<-EOF > "${T}"/usb-load-ehci-first.conf softdep uhci_hcd pre: ehci_hcd softdep ohci_hcd pre: ehci_hcd diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 531212bc23bc..341d36a4f5e2 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -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 split-usr static-libs +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. @@ -99,6 +99,12 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die + if use tools && use split-usr; then + # Move modprobe to /sbin to match CONFIG_MODPROBE_PATH from kernel + rm "${ED}/usr/bin/modprobe" || die + dosym ../usr/bin/kmod /sbin/modprobe + fi + cat <<-EOF > "${T}"/usb-load-ehci-first.conf softdep uhci_hcd pre: ehci_hcd softdep ohci_hcd pre: ehci_hcd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 39dd811517b6495f872445ccd28257e2ffc638bb Author: Sam James gentoo org> AuthorDate: Thu Mar 7 21:01:34 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 7 21:01:34 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dd8115 sys-apps/kmod: cleanup usrmerge collisions Remove symlink hacks that don't provide any real benefit, especially we dropped support for no-separate-/usr/-without-initramfs (see news item). This also prevents breakage on usrmerge systems where /bin = /sbin = /usr/bin = /usr/sbin. Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-32.ebuild | 14 -- sys-apps/kmod/kmod-.ebuild | 14 -- 2 files changed, 28 deletions(-) diff --git a/sys-apps/kmod/kmod-32.ebuild b/sys-apps/kmod/kmod-32.ebuild index 9d4a9de69ccb..531212bc23bc 100644 --- a/sys-apps/kmod/kmod-32.ebuild +++ b/sys-apps/kmod/kmod-32.ebuild @@ -79,10 +79,8 @@ src_prepare() { src_configure() { local myeconfargs=( - --bindir="${EPREFIX}/bin" --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" $(use_enable debug) $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) @@ -101,18 +99,6 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - dosym ../bin/kmod /sbin/${cmd} - done - - # These are also usable as normal user - for cmd in lsmod modinfo; do - dosym kmod /bin/${cmd} - done - fi - cat <<-EOF > "${T}"/usb-load-ehci-first.conf softdep uhci_hcd pre: ehci_hcd softdep ohci_hcd pre: ehci_hcd diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 9d4a9de69ccb..531212bc23bc 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -79,10 +79,8 @@ src_prepare() { src_configure() { local myeconfargs=( - --bindir="${EPREFIX}/bin" --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" $(use_enable debug) $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) @@ -101,18 +99,6 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - dosym ../bin/kmod /sbin/${cmd} - done - - # These are also usable as normal user - for cmd in lsmod modinfo; do - dosym kmod /bin/${cmd} - done - fi - cat <<-EOF > "${T}"/usb-load-ehci-first.conf softdep uhci_hcd pre: ehci_hcd softdep ohci_hcd pre: ehci_hcd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: bbd21e43dff806c1b728451432f646b61c0212e8 Author: Sam James gentoo org> AuthorDate: Thu Mar 7 19:58:35 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 7 20:21:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd21e43 sys-apps/kmod: add 32 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/Manifest | 1 + sys-apps/kmod/{kmod-.ebuild => kmod-32.ebuild} | 1 - sys-apps/kmod/kmod-.ebuild | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 554efc99d6a0..0d9fcf490e5c 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1 +1,2 @@ DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 +DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24 diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-32.ebuild similarity index 99% copy from sys-apps/kmod/kmod-.ebuild copy to sys-apps/kmod/kmod-32.ebuild index d0de1d663e3e..9d4a9de69ccb 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-32.ebuild @@ -83,7 +83,6 @@ src_configure() { --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" - --disable-python $(use_enable debug) $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index d0de1d663e3e..9d4a9de69ccb 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -83,7 +83,6 @@ src_configure() { --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" - --disable-python $(use_enable debug) $(usev doc '--enable-gtk-doc') $(use_enable static-libs static)
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/, sys-apps/kmod/files/
commit: bc235c9a342826e6aab77d08ded3ca008823dd28 Author: Sam James gentoo org> AuthorDate: Sat Mar 2 00:16:07 2024 + Commit: Sam James gentoo org> CommitDate: Sat Mar 2 00:16:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc235c9a sys-apps/kmod: drop 30-r1 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/Manifest | 1 - .../kmod/files/kmod-30-configure-clang16.patch | 26 --- sys-apps/kmod/kmod-30-r1.ebuild| 231 - 3 files changed, 258 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index c20a66d382eb..554efc99d6a0 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,2 +1 @@ -DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 diff --git a/sys-apps/kmod/files/kmod-30-configure-clang16.patch b/sys-apps/kmod/files/kmod-30-configure-clang16.patch deleted file mode 100644 index a9e1093aecff.. --- a/sys-apps/kmod/files/kmod-30-configure-clang16.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/kmod-project/kmod/commit/035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 - -From 035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Sat, 17 Dec 2022 17:52:34 +0100 -Subject: [PATCH] kmod: configure.ac: In _Noreturn check, include - for exit - -Otherwise, an implicit functiona declaration is used, causing -a C99 compatibility issue. - -Signed-off-by: Florian Weimer -Signed-off-by: Lucas De Marchi a/configure.ac -+++ b/configure.ac -@@ -68,7 +68,8 @@ AC_COMPILE_IFELSE( - - AC_MSG_CHECKING([whether _Noreturn is supported]) - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])], -+ [AC_LANG_SOURCE([[#include -+ _Noreturn int foo(void) { exit(0); }]])], - [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available]) -AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild deleted file mode 100644 index 5dff1407325b.. --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools libtool bash-completion-r1 python-r1 - -if [[ ${PV} == * ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +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. -# So we have to restrict it. -# See bug #408915. -#RESTRICT="test" - -# - >=zlib-1.2.6 required because of bug #427130 -# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - pkcs7? ( >=dev-libs/openssl-1.1.0:= ) - zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-build/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == * ]]; then - BDEPEND="${BDEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( NEWS README.md TODO ) - -PATCHES=( - "${FILESDIR}"/${P}-configure-clang16.patch -) - -src_prepare() { - default - - if [[ ! -e configure ]] || use doc ; then - if use doc; then - cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/files/, sys-apps/kmod/
commit: 7e18d8b8c3d468754790010cc157cc8eaff3d5b5 Author: Sam James gentoo org> AuthorDate: Sat Mar 2 00:13:33 2024 + Commit: Sam James gentoo org> CommitDate: Sat Mar 2 00:14:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e18d8b8 sys-apps/kmod: drop Python bindings, fix musl-1.2.5 compat (modern C porting) * Drop Python bindings for weird double install issue (bug #925568). This is a somewhat extreme response, but it turns out upstream have dropped the bindings upstream anyway in https://github.com/kmod-project/kmod/commit/594f102cf575b0d5c01ebff22aae450c8a204d45 for the next release. * Fix musl-1.2.5 compat wrt POSIX vs GNU basename. Would segfault at runtime otherwise on a non-strict C compiler. Closes: https://bugs.gentoo.org/925568 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/files/kmod-31-musl-basename.patch| 113 + .../kmod/{kmod-.ebuild => kmod-31-r1.ebuild} | 102 +++ sys-apps/kmod/kmod-.ebuild | 102 +++ 3 files changed, 145 insertions(+), 172 deletions(-) diff --git a/sys-apps/kmod/files/kmod-31-musl-basename.patch b/sys-apps/kmod/files/kmod-31-musl-basename.patch new file mode 100644 index ..f4839dad2474 --- /dev/null +++ b/sys-apps/kmod/files/kmod-31-musl-basename.patch @@ -0,0 +1,113 @@ +https://github.com/kmod-project/kmod/pull/32 + +From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 9 Dec 2023 17:35:59 -0800 +Subject: [PATCH] Use portable implementation for basename API + +musl has removed the non-prototype declaration of basename from +string.h [1] which now results in build errors with clang-17+ compiler + +Implement GNU basename behavior using strchr which is portable across libcs + +Fixes +../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +71 | "Commands:\n", basename(argv[0])); +| ^ + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Suggested-by: Rich Felker + +Signed-off-by: Khem Raj +--- a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c +@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, + bool is_single = false; + + if (name == NULL) { +- name = basename(path); ++ name = gnu_basename(path); + is_single = true; + } + +--- a/shared/util.c b/shared/util.c +@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t * + + char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) + { +- char *modname; ++ const char *modname; + +- modname = basename(path); ++ modname = gnu_basename(path); + if (modname == NULL || modname[0] == '\0') + return NULL; + +--- a/shared/util.h b/shared/util.h +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -76,6 +77,12 @@ do {\ + __p->__v = (val); \ + } while(0) + ++static _always_inline_ const char *gnu_basename(const char *s) ++{ ++ const char *p = strrchr(s, '/'); ++ return p ? p+1 : s; ++} ++ + static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u) + { + return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); +--- a/testsuite/testsuite.c b/testsuite/testsuite.c +@@ -70,7 +70,7 @@ static void help(void) + + printf("Usage:\n" + "\t%s [options] \n" +- "Options:\n", basename(progname)); ++ "Options:\n", gnu_basename(progname)); + + for (itr = options, itr_short = options_short; + itr->name != NULL; itr++, itr_short++) +--- a/tools/depmod.c b/tools/depmod.c +@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files + if (name != NULL) + namelen = strlen(name); + else { +- name = basename(dir); ++ name = gnu_basename(dir); + namelen = strlen(name); + dirlen -= namelen + 1; + } +--- a/tools/kmod.c b/tools/kmod.c +@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[]) + "Options:\n" + "\t-V, --version show version\n" + "\t-h, --helpshow this help\n\n" +- "Commands:\n", basename(argv[0])); ++ "Commands:\n", gnu_basename(argv[0])); + + for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { + if (kmod_cmds[i]->help != NULL) { +@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) + const char *cmd; + size_t i; + +-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: f1df684ed8856ece4d547cf2496080aaf7631da4 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 17 19:11:10 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 17 19:11:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1df684e sys-apps/kmod: Stabilize 31 hppa, #919965 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index 7f3c1a2fb863..a1d670f8bd88 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 7d439c32835de389acc7f8f808cc67c81f80a8d2 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 15 12:53:11 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 15 12:53:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d439c32 sys-apps/kmod: Stabilize 31 x86, #919965 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index acc32f46f0f9..7f3c1a2fb863 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: f0847b47f954e4595fdcaf31738f1ce503de77aa Author: Michał Górny gentoo org> AuthorDate: Fri Dec 15 10:09:52 2023 + Commit: Michał Górny gentoo org> CommitDate: Fri Dec 15 10:09:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0847b47 sys-apps/kmod: Stabilize 31 ppc, #919965 Signed-off-by: Michał Górny gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index ed79b5f26271..acc32f46f0f9 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: ee41f6b244a20ae3213dbd68ee27bf4f42d7b9a5 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:48:53 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:48:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee41f6b2 sys-apps/kmod: Stabilize 31 amd64, #919965 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index d60cbb8298f3..84823ddd8de1 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 0c84f8bd54f7673d5e64031fc9607999ed843586 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:41:59 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:41:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c84f8bd sys-apps/kmod: Stabilize 31 arm64, #919965 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index a3609d0df6b0..d60cbb8298f3 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 6912ebc0462d366242cf35ab3952f20db3a64ce8 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:33:59 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:33:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6912ebc0 sys-apps/kmod: Stabilize 31 sparc, #919965 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index 524058552b79..a3609d0df6b0 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 01e1ba8406366e5524850b7facca5c04849f446e Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:13:43 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:13:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e1ba84 sys-apps/kmod: Stabilize 31 arm, #919965 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index 21e19df0980e..524058552b79 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: faf88204052007fc75917798986a5e1216f99dd2 Author: Sam James gentoo org> AuthorDate: Thu Oct 12 05:50:09 2023 + Commit: Sam James gentoo org> CommitDate: Thu Oct 12 05:50:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf88204 sys-apps/kmod: disable py3.9 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-31.ebuild | 2 +- sys-apps/kmod/kmod-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index f9068f6487f6..21e19df0980e 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools libtool bash-completion-r1 python-r1 diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index f9068f6487f6..21e19df0980e 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools libtool bash-completion-r1 python-r1
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 2c38b2d9969576131269e3c072e48b9063b5d064 Author: Sam James gentoo org> AuthorDate: Thu Oct 12 05:39:50 2023 + Commit: Sam James gentoo org> CommitDate: Thu Oct 12 05:39:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c38b2d9 sys-apps/kmod: add 31 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/Manifest | 1 + sys-apps/kmod/kmod-31.ebuild | 224 +++ 2 files changed, 225 insertions(+) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 0471cb625242..c20a66d382eb 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1 +1,2 @@ DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e +DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild new file mode 100644 index ..50b51480db27 --- /dev/null +++ b/sys-apps/kmod/kmod-31.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools libtool bash-completion-r1 python-r1 + +if [[ ${PV} == * ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc +lzma pkcs7 python static-libs +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. +# So we have to restrict it. +# See bug #408915. +#RESTRICT="test" + +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.2-r1 required for bug #771078 +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + python? ( ${PYTHON_DEPS} ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.5.2-r1:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + python? ( + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == * ]]; then + BDEPEND="${BDEPEND} + dev-libs/libxslt" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( NEWS README.md TODO ) + +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() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + --with-rootlibdir="${EPREFIX}/$(get_libdir)" + $(use_enable debug) + $(usex 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 ECONF_SOURCE="${S}" + + kmod_configure() { + mkdir -p "${BUILD_DIR}" || die + run_in_build_dir econf "${myeconfargs[@]}" "$@" + } + + BUILD_DIR="${WORKDIR}/build" + kmod_configure --disable-python + + if use python; then + python_fo
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 05b4a6cf2c890e5b38bcc21cb8d6066c6203f535 Author: Sam James gentoo org> AuthorDate: Thu Oct 12 05:41:33 2023 + Commit: Sam James gentoo org> CommitDate: Thu Oct 12 05:41:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b4a6cf sys-apps/kmod: add 31 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-31.ebuild | 6 +++--- sys-apps/kmod/kmod-.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild index 50b51480db27..f9068f6487f6 100644 --- a/sys-apps/kmod/kmod-31.ebuild +++ b/sys-apps/kmod/kmod-31.ebuild @@ -136,9 +136,9 @@ src_test() { python_test() { mkdir "${T}/test-${EPYTHON}" || die emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ -VPATH="${native_builddir}:${S}" \ -install-pkgpyexecLTLIBRARIES \ -install-dist_pkgpyexecPYTHON + VPATH="${native_builddir}:${S}" \ + install-pkgpyexecLTLIBRARIES \ + install-dist_pkgpyexecPYTHON # Smoke test based on https://bugs.gentoo.org/891975#c5 local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 50b51480db27..f9068f6487f6 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -136,9 +136,9 @@ src_test() { python_test() { mkdir "${T}/test-${EPYTHON}" || die emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ -VPATH="${native_builddir}:${S}" \ -install-pkgpyexecLTLIBRARIES \ -install-dist_pkgpyexecPYTHON + VPATH="${native_builddir}:${S}" \ + install-pkgpyexecLTLIBRARIES \ + install-dist_pkgpyexecPYTHON # Smoke test based on https://bugs.gentoo.org/891975#c5 local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 94a863a5ff6a3b49ee3c29779c410b18727eb74d Author: Mike Gilbert gentoo org> AuthorDate: Thu Jul 13 17:41:34 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Jul 13 17:41:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a863a5 sys-apps/kmod: drop 30 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/kmod-30.ebuild | 205 --- 1 file changed, 205 deletions(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild deleted file mode 100644 index cf1f8faa5c77.. --- a/sys-apps/kmod/kmod-30.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit autotools libtool bash-completion-r1 python-r1 - -if [[ ${PV} == * ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +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. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# - >=zlib-1.2.6 required because of bug #427130 -# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - pkcs7? ( >=dev-libs/openssl-1.1.0:= ) - zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-util/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == * ]]; then - BDEPEND="${BDEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( NEWS README.md TODO ) - -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() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(usex 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 ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 3d8b3be847fc5053ae195d87ee68f4c83fe8a67a Author: Jakov Smolić gentoo org> AuthorDate: Sat Mar 4 22:30:10 2023 + Commit: Jakov Smolić gentoo org> CommitDate: Sat Mar 4 22:30:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8b3be8 sys-apps/kmod: Stabilize 30-r1 hppa, #899380 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 26a18db7e979..b6d5169ca966 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 5a443bc221e54754704305f33fb3533edbd3d48d Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 14:24:39 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 14:24:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a443bc2 sys-apps/kmod: Stabilize 30-r1 ppc64, #899380 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 663e001b7a15..26a18db7e979 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: e8d560531a8c8c28182de6becf69d1240d64bc13 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 11:12:51 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 11:12:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d56053 sys-apps/kmod: Stabilize 30-r1 ppc, #899380 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 50e92c96e55c..354f77178f57 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: ddc52c4d8a5a1e06c01001319b42b0a3c600d483 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 11:12:51 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 11:12:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc52c4d sys-apps/kmod: Stabilize 30-r1 amd64, #899380 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 354f77178f57..663e001b7a15 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 14d41e6834a2c063424da350193964a38ab6c9b9 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 08:59:51 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 08:59:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d41e68 sys-apps/kmod: Stabilize 30-r1 sparc, #899380 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 09dcec6b1438..50e92c96e55c 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 01c9474be393048a4c3995526531f5aef84a582b Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 08:18:15 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 08:18:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c9474b sys-apps/kmod: Stabilize 30-r1 x86, #899380 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 5aeee707f21f..09dcec6b1438 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: f12dcc70579a7f3ac5c664818099d67b42a363a1 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 06:30:50 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 06:30:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12dcc70 sys-apps/kmod: Stabilize 30-r1 arm, #899380 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 9728cbf764b2..5aeee707f21f 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: e7bd925223a63544c522261e00c69cf0a66e3511 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 06:06:52 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 06:06:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7bd9252 sys-apps/kmod: Stabilize 30-r1 arm64, #899380 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 18c0daa0974a..9728cbf764b2 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: ccfb9e9f8433a844b3d2f2d9a1dd0c0d05e1f6df Author: Sam James gentoo org> AuthorDate: Fri Feb 3 19:00:18 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 3 19:03:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccfb9e9f sys-apps/kmod: enable py3.11 and add python bindings smoketest Thanks to Andrés for the suggestion for the Python test. Now we can add future Python implementations with confidence. Closes: https://bugs.gentoo.org/408915 Thanks-to: Andrés Becerra Sandoval gmail.com> Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-30-r1.ebuild | 23 +-- sys-apps/kmod/kmod-.ebuild | 25 ++--- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild index 9cb6a84d3e0b..18c0daa0974a 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools libtool bash-completion-r1 python-r1 @@ -26,7 +26,7 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # I was also told that the test suite is intended for kmod developers. # So we have to restrict it. # See bug #408915. -RESTRICT="test" +#RESTRICT="test" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch @@ -139,6 +139,25 @@ src_compile() { fi } +src_test() { + python_test() { + mkdir "${T}/test-${EPYTHON}" || die + emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ +VPATH="${native_builddir}:${S}" \ +install-pkgpyexecLTLIBRARIES \ +install-dist_pkgpyexecPYTHON + + # Smoke test based on https://bugs.gentoo.org/891975#c5 + local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" + ${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die + rm -r "${T}/test-${EPYTHON}" || die + } + + if use python; then + python_foreach_impl python_test + fi +} + src_install() { emake -C "${BUILD_DIR}" DESTDIR="${D}" install diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 872dcbbc2737..50b51480db27 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools libtool bash-completion-r1 python-r1 @@ -26,7 +26,7 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # I was also told that the test suite is intended for kmod developers. # So we have to restrict it. # See bug #408915. -RESTRICT="test" +#RESTRICT="test" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch @@ -60,7 +60,7 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS=( NEWS README TODO ) +DOCS=( NEWS README.md TODO ) src_prepare() { default @@ -132,6 +132,25 @@ src_compile() { fi } +src_test() { + python_test() { + mkdir "${T}/test-${EPYTHON}" || die + emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ +VPATH="${native_builddir}:${S}" \ +install-pkgpyexecLTLIBRARIES \ +install-dist_pkgpyexecPYTHON + + # Smoke test based on https://bugs.gentoo.org/891975#c5 + local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" + ${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die + rm -r "${T}/test-${EPYTHON}" || die + } + + if use python; then + python_foreach_impl python_test + fi +} + src_install() { emake -C "${BUILD_DIR}" DESTDIR="${D}" install
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/files/, sys-apps/kmod/
commit: 930f5a77702f60fa65b27e71f6ddd214eb2ed1a4 Author: Sam James gentoo org> AuthorDate: Wed Jan 4 03:46:22 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jan 4 04:31:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930f5a77 sys-apps/kmod: fix configure w/ clang 16 Signed-off-by: Sam James gentoo.org> .../kmod/files/kmod-30-configure-clang16.patch | 26 +++ sys-apps/kmod/kmod-30-r1.ebuild| 212 + 2 files changed, 238 insertions(+) diff --git a/sys-apps/kmod/files/kmod-30-configure-clang16.patch b/sys-apps/kmod/files/kmod-30-configure-clang16.patch new file mode 100644 index ..a9e1093aecff --- /dev/null +++ b/sys-apps/kmod/files/kmod-30-configure-clang16.patch @@ -0,0 +1,26 @@ +https://github.com/kmod-project/kmod/commit/035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 + +From 035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Sat, 17 Dec 2022 17:52:34 +0100 +Subject: [PATCH] kmod: configure.ac: In _Noreturn check, include + for exit + +Otherwise, an implicit functiona declaration is used, causing +a C99 compatibility issue. + +Signed-off-by: Florian Weimer +Signed-off-by: Lucas De Marchi +--- a/configure.ac b/configure.ac +@@ -68,7 +68,8 @@ AC_COMPILE_IFELSE( + + AC_MSG_CHECKING([whether _Noreturn is supported]) + AC_COMPILE_IFELSE( +- [AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])], ++ [AC_LANG_SOURCE([[#include ++ _Noreturn int foo(void) { exit(0); }]])], + [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available]) +AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) + diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild new file mode 100644 index ..745848fed41f --- /dev/null +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools libtool bash-completion-r1 python-r1 + +if [[ ${PV} == * ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc +lzma pkcs7 python static-libs +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. +# So we have to restrict it. +# See bug #408915. +RESTRICT="test" + +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.2-r1 required for bug #771078 +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + python? ( ${PYTHON_DEPS} ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.5.2-r1:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + python? ( + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == * ]]; then + BDEPEND="${BDEPEND} + dev-libs/libxslt" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( NEWS README.md TODO ) + +PATCHES=( + "${FILESDIR}"/${P}-configure-clang16.patch +) + +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 + # TODO: restore to elibtoolize in next release after 30 + # autoreconf only here for clang patch. + eautoreconf + 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() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + --with-rootlibdir="${
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 1b8d861c26ab37300abcbc7efb2f614628454200 Author: Sam James gentoo org> AuthorDate: Fri Sep 23 02:04:44 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 23 02:08:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8d861c sys-apps/kmod: drop 29, 29-r2 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/Manifest | 1 - sys-apps/kmod/kmod-29-r2.ebuild | 205 sys-apps/kmod/kmod-29.ebuild| 203 --- 3 files changed, 409 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 8001e3ac896a..0471cb625242 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,2 +1 @@ -DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e diff --git a/sys-apps/kmod/kmod-29-r2.ebuild b/sys-apps/kmod/kmod-29-r2.ebuild deleted file mode 100644 index d6f72bfcac71.. --- a/sys-apps/kmod/kmod-29-r2.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit autotools libtool bash-completion-r1 python-r1 - -if [[ ${PV} == * ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +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. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# - >=zlib-1.2.6 required because of bug #427130 -# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - pkcs7? ( >=dev-libs/openssl-1.1.0:= ) - zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-util/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == * ]]; then - BDEPEND="${BDEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( NEWS README TODO ) - -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() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(usex 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 ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/buil
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 4053bb438a912f27c50a6bc5512d024ba5249b4f Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 16 18:07:32 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 16 18:07:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4053bb43 sys-apps/kmod: Stabilize 30 ppc64, #868990 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index 818e3fa85378..4fb6f09e6cd5 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: a2004fabfd789a70fc851352004cb169ceeac86a Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 16 15:51:00 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 16 15:51:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2004fab sys-apps/kmod: Stabilize 30 hppa, #868990 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index 97a70fa0cf21..818e3fa85378 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 09b7f6bda97565accb600c746931cdeb4e187050 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Sep 15 17:14:45 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Sep 15 17:14:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b7f6bd sys-apps/kmod: Stabilize 30 ppc, #868990 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index aba0db5c7a69..97a70fa0cf21 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: c2559b4f2a12be264fd6c3c29eb6f58db6f8680f Author: Sam James gentoo org> AuthorDate: Wed Sep 7 01:52:47 2022 + Commit: Sam James gentoo org> CommitDate: Wed Sep 7 01:52:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2559b4f sys-apps/kmod: Stabilize 30 arm64, #868990 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index a9d8b888d37a..aba0db5c7a69 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 47f449f2754a8c48644489abc0f8eb35f3adafd4 Author: Sam James gentoo org> AuthorDate: Wed Sep 7 01:49:34 2022 + Commit: Sam James gentoo org> CommitDate: Wed Sep 7 01:49:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f449f2 sys-apps/kmod: Stabilize 30 sparc, #868990 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index 2247d9a3bf04..a9d8b888d37a 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 22f528f408c6ba9bb0e8011834d6e486fce60cb1 Author: Sam James gentoo org> AuthorDate: Wed Sep 7 01:48:41 2022 + Commit: Sam James gentoo org> CommitDate: Wed Sep 7 01:48:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f528f4 sys-apps/kmod: Stabilize 30 amd64, #868990 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index d71cb860fc2c..2247d9a3bf04 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: aad28b79049419342cebac0d78b66353a0939a9a Author: Jakov Smolić gentoo org> AuthorDate: Tue Sep 6 21:59:03 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Sep 6 21:59:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad28b79 sys-apps/kmod: Stabilize 30 x86, #868990 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index a14740c8c509..d71cb860fc2c 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 99fa08d07f2955fc824ed6245ae65a39223e4c29 Author: Jakov Smolić gentoo org> AuthorDate: Tue Sep 6 21:57:35 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Sep 6 21:57:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99fa08d0 sys-apps/kmod: Stabilize 30 arm, #868990 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kmod/kmod-30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild index 95248947d8d7..a14740c8c509 100644 --- a/sys-apps/kmod/kmod-30.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="library and tools for managing linux kernel modules"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: b7683a8fd44596fc0b352d5f3a29366d7eeb6956 Author: Sam James gentoo org> AuthorDate: Thu Jul 28 12:53:13 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jul 28 13:19:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7683a8f sys-apps/kmod: add github upstream metadata Signed-off-by: Sam James gentoo.org> sys-apps/kmod/metadata.xml | 27 ++- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml index 9cc925a0b0e9..20c2f19925da 100644 --- a/sys-apps/kmod/metadata.xml +++ b/sys-apps/kmod/metadata.xml @@ -1,17 +1,18 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - base-sys...@gentoo.org - Gentoo Base System - - - Enable support for XZ compressed modules - Enable PKCS#7 signature parsing for modinfo. - Install module loading/unloading tools. - Enable support for gzipped modules - - - cpe:/a:kernel:kmod - + + base-sys...@gentoo.org + Gentoo Base System + + + Enable support for XZ compressed modules + Enable PKCS#7 signature parsing for modinfo. + Install module loading/unloading tools. + Enable support for gzipped modules + + + cpe:/a:kernel:kmod + kmod-project/kmod +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: c12e2bb31036dfd0b76291873bcfb592fbf22376 Author: Sam James gentoo org> AuthorDate: Fri Jul 1 08:15:18 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jul 1 08:40:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12e2bb3 sys-apps/kmod: add 30 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/Manifest | 1 + sys-apps/kmod/{kmod-.ebuild => kmod-30.ebuild} | 6 +++--- sys-apps/kmod/kmod-.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 9cfbad230963..8001e3ac896a 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1 +1,2 @@ DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 +DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-30.ebuild similarity index 97% copy from sys-apps/kmod/kmod-.ebuild copy to sys-apps/kmod/kmod-30.ebuild index 48747e41ed50..95248947d8d7 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-30.ebuild @@ -30,7 +30,7 @@ RESTRICT="test" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.1-r3 required for bug #771078 +# - >=zstd-1.5.2-r1 required for bug #771078 RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/zstd-1.5.2-r1:= )" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -60,7 +60,7 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS=( NEWS README TODO ) +DOCS=( NEWS README.md TODO ) src_prepare() { default diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 48747e41ed50..d6f72bfcac71 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -30,7 +30,7 @@ RESTRICT="test" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.1-r3 required for bug #771078 +# - >=zstd-1.5.2-r1 required for bug #771078 RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/zstd-1.5.2-r1:= )" DEPEND="${RDEPEND}" BDEPEND=" doc? (
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: e5f5a24567c083d7615486bf0c58c968e01052ed Author: Sam James gentoo org> AuthorDate: Sat Jun 18 13:04:43 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jun 18 13:04:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5f5a245 sys-apps/kmod: tighten zstd dep Closes: https://bugs.gentoo.org/852860 Bug: https://bugs.gentoo.org/771078 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/{kmod-29-r1.ebuild => kmod-29-r2.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kmod/kmod-29-r1.ebuild b/sys-apps/kmod/kmod-29-r2.ebuild similarity index 98% rename from sys-apps/kmod/kmod-29-r1.ebuild rename to sys-apps/kmod/kmod-29-r2.ebuild index 48747e41ed50..d6f72bfcac71 100644 --- a/sys-apps/kmod/kmod-29-r1.ebuild +++ b/sys-apps/kmod/kmod-29-r2.ebuild @@ -30,7 +30,7 @@ RESTRICT="test" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.1-r3 required for bug #771078 +# - >=zstd-1.5.2-r1 required for bug #771078 RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/zstd-1.5.2-r1:= )" DEPEND="${RDEPEND}" BDEPEND=" doc? (
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 30e6071c742a0e20a8af79c877fcea75ae3182dc Author: Sam James gentoo org> AuthorDate: Thu Jun 16 15:53:03 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 16 15:53:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e6071c sys-apps/kmod: minor ebuild tidying Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-29-r1.ebuild | 13 +++-- sys-apps/kmod/kmod-.ebuild | 13 +++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sys-apps/kmod/kmod-29-r1.ebuild b/sys-apps/kmod/kmod-29-r1.ebuild index e500c5c7fb00..48747e41ed50 100644 --- a/sys-apps/kmod/kmod-29-r1.ebuild +++ b/sys-apps/kmod/kmod-29-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit autotools bash-completion-r1 multilib python-r1 +inherit autotools libtool bash-completion-r1 python-r1 if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; @@ -13,7 +13,6 @@ if [[ ${PV} == * ]]; then else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - #inherit libtool fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -78,7 +77,7 @@ src_prepare() { elibtoolize fi - # Restore possibility of running --enable-static wrt #472608 + # 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 @@ -119,7 +118,7 @@ src_compile() { emake -C "${BUILD_DIR}" if use python; then - local native_builddir=${BUILD_DIR} + local native_builddir="${BUILD_DIR}" python_compile() { emake -C "${BUILD_DIR}" -f Makefile -f - python \ @@ -135,10 +134,11 @@ src_compile() { src_install() { emake -C "${BUILD_DIR}" DESTDIR="${D}" install + einstalldocs if use python; then - local native_builddir=${BUILD_DIR} + local native_builddir="${BUILD_DIR}" python_install() { emake -C "${BUILD_DIR}" DESTDIR="${D}" \ @@ -171,7 +171,8 @@ src_install() { EOF insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 + # bug #260139 + doins "${T}"/usb-load-ehci-first.conf newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes } diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index e500c5c7fb00..48747e41ed50 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit autotools bash-completion-r1 multilib python-r1 +inherit autotools libtool bash-completion-r1 python-r1 if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; @@ -13,7 +13,6 @@ if [[ ${PV} == * ]]; then else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - #inherit libtool fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -78,7 +77,7 @@ src_prepare() { elibtoolize fi - # Restore possibility of running --enable-static wrt #472608 + # 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 @@ -119,7 +118,7 @@ src_compile() { emake -C "${BUILD_DIR}" if use python; then - local native_builddir=${BUILD_DIR} + local native_builddir="${BUILD_DIR}" python_compile() { emake -C "${BUILD_DIR}" -f Makefile -f - python \ @@ -135,10 +134,11 @@ src_compile() { src_install() { emake -C "${BUILD_DIR}" DESTDIR="${D}" install + einstalldocs if use python; then - local native_builddir=${BUILD_DIR} + local native_builddir="${BUILD_DIR}" python_install() { emake -C "${BUILD_DIR}" DESTDIR="${D}" \ @@ -171,7 +171,8 @@ src_install() { EOF insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 + # bug #260139 + doins "${T}"/usb-load-ehci-first.conf newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 80ef1c05eaf312a05e91c56acd56b20464eed81e Author: Sam James gentoo org> AuthorDate: Thu Jun 16 15:29:03 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 16 15:29:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ef1c05 sys-apps/kmod: enable zstd support by default And depends on newer zstd w/ split-usr support. Portage already depends on app-arch/zstd so this doesn't extend @system at all. Closes: https://bugs.gentoo.org/771078 Signed-off-by: Sam James gentoo.org> .../kmod/{kmod-.ebuild => kmod-29-r1.ebuild}| 21 +++-- sys-apps/kmod/kmod-.ebuild | 21 +++-- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-29-r1.ebuild similarity index 90% copy from sys-apps/kmod/kmod-.ebuild copy to sys-apps/kmod/kmod-29-r1.ebuild index c18aedb0e8f6..e500c5c7fb00 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-29-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools bash-completion-r1 multilib python-r1 @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" #inherit libtool fi @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" +IUSE="debug doc +lzma pkcs7 python static-libs +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. @@ -29,17 +29,18 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" # See bug #408915. RESTRICT="test" -# >=zlib-1.2.6 required because of bug #427130 -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.1-r3 required for bug #771078 RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.4.4 )" + zstd? ( >=app-arch/zstd-1.5.1-r3:= )" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -50,7 +51,7 @@ BDEPEND=" python? ( dev-python/cython[${PYTHON_USEDEP}] virtual/pkgconfig - ) + ) zlib? ( virtual/pkgconfig ) " if [[ ${PV} == * ]]; then diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index c18aedb0e8f6..e500c5c7fb00 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools bash-completion-r1 multilib python-r1 @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" #inherit libtool fi @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" +IUSE="debug doc +lzma pkcs7 python static-libs +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. @@ -29,17 +29,18 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" # See bug #408915. RESTRICT="test" -# >=zlib-1.2.6 required because of bug #427130 -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 53616a41975f5637c89f73159dc029ef70a459f7 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Nov 9 04:27:33 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Nov 9 04:28:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53616a41 sys-apps/kmod: enable py3.10 Closes: https://bugs.gentoo.org/822483 Signed-off-by: Georgy Yakovlev gentoo.org> sys-apps/kmod/kmod-29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild index 0e54b83b0aa..d2700e7716d 100644 --- a/sys-apps/kmod/kmod-29.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools bash-completion-r1 multilib python-r1
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 54a10f136e553685304453e62938ff77a34f12fd Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Nov 9 04:28:05 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Nov 9 04:28:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a10f13 sys-apps/kmod: enable py3.10 in live ebuild Signed-off-by: Georgy Yakovlev gentoo.org> sys-apps/kmod/kmod-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index b2369d92355..c18aedb0e8f 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools bash-completion-r1 multilib python-r1
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: be92d9f299a7ee0ec0ab9757d37529788d91e464 Author: David Seifert gentoo org> AuthorDate: Sat Sep 4 17:34:06 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Sep 4 17:34:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be92d9f2 sys-apps/kmod: drop 28 Signed-off-by: David Seifert gentoo.org> sys-apps/kmod/Manifest | 1 - sys-apps/kmod/kmod-28.ebuild | 203 --- 2 files changed, 204 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 9ad5f1386be..9cfbad23096 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,2 +1 @@ -DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild deleted file mode 100644 index e7a05bd1835..000 --- a/sys-apps/kmod/kmod-28.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools bash-completion-r1 multilib python-r1 - -if [[ ${PV} == * ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - #inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +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. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# >=zlib-1.2.6 required because of bug #427130 -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) - zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.4.4 )" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-util/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == * ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -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 wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(usex 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 ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: ab221ae7a8538f2a74bafe8d27524daa8d0ca1cc Author: Sam James gentoo org> AuthorDate: Thu Aug 12 15:29:06 2021 + Commit: Sam James gentoo org> CommitDate: Thu Aug 12 15:29:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab221ae7 sys-apps/kmod: Stabilize 29 arm64, #807496 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild index fa793bbb9f3..0e54b83b0aa 100644 --- a/sys-apps/kmod/kmod-29.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 7b8849d52cad3757b8a68c98893dc4a2f35440d1 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Aug 11 05:36:32 2021 + Commit: Sam James gentoo org> CommitDate: Wed Aug 11 20:13:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8849d5 sys-apps/kmod: stable 29 for hppa, bug #807496 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild index 1621d894165..fa793bbb9f3 100644 --- a/sys-apps/kmod/kmod-29.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 1dc32777f1975bbcdb870e43166b273e37132ef0 Author: Sam James gentoo org> AuthorDate: Wed Aug 11 00:22:30 2021 + Commit: Sam James gentoo org> CommitDate: Wed Aug 11 00:22:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc32777 sys-apps/kmod: Stabilize 29 sparc, #807496 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild index e30aa849361..597d1a66405 100644 --- a/sys-apps/kmod/kmod-29.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: b299f403f0155ce7f3aeb451efcc65fb1e8ac425 Author: Sam James gentoo org> AuthorDate: Wed Aug 11 00:09:37 2021 + Commit: Sam James gentoo org> CommitDate: Wed Aug 11 00:09:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b299f403 sys-apps/kmod: Stabilize 29 ppc64, #807496 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild index 96ef401ee1c..e30aa849361 100644 --- a/sys-apps/kmod/kmod-29.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 3ccede4b4a5569cb32cbb5ca783cd2e562a6b333 Author: Sam James gentoo org> AuthorDate: Tue Aug 10 23:59:49 2021 + Commit: Sam James gentoo org> CommitDate: Wed Aug 11 00:02:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ccede4b sys-apps/kmod: Stabilize 29 x86, #807496 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild index 12563d023cc..123a6a12a20 100644 --- a/sys-apps/kmod/kmod-29.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: e6169c25dce9444c6eaff3e9f1597c01b782bcd6 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Aug 10 15:34:13 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Aug 10 15:34:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6169c25 sys-apps/kmod: amd64 stable wrt bug #807496 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> sys-apps/kmod/kmod-29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild index b2369d92355..12563d023cc 100644 --- a/sys-apps/kmod/kmod-29.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: c085b3e1b83fc8cae840d14117ef3b16ba10041c Author: Mike Gilbert gentoo org> AuthorDate: Mon Aug 9 15:10:18 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Aug 9 15:15:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c085b3e1 sys-apps/kmod: drop udev-bugs from maintainers Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml index ccb7f0ba687..14a7eeb6bb4 100644 --- a/sys-apps/kmod/metadata.xml +++ b/sys-apps/kmod/metadata.xml @@ -1,9 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - udev-b...@gentoo.org - base-sys...@gentoo.org Gentoo Base System
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/files/, sys-apps/kmod/
commit: 874fc0b17dd30cf7c7221f74cf557c4c7e535585 Author: Lars Wendler gentoo org> AuthorDate: Fri May 21 06:49:28 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri May 21 07:06:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874fc0b1 sys-apps/kmod: Removed old Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/Manifest | 1 - ...od-27-depmod-do-not-output-.bin-to-stdout.patch | 53 -- sys-apps/kmod/kmod-27-r2.ebuild| 202 - 3 files changed, 256 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 43d7af8f39e..9ad5f1386be 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,3 +1,2 @@ -DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 diff --git a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch deleted file mode 100644 index dc776b515bc..000 --- a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 53b30aeba2dedae9f5558f560231d9462e063dfc Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi -Date: Thu, 5 Mar 2020 13:33:10 -0800 -Subject: depmod: do not output .bin to stdout - -index_write() relies on fseek/ftell to manage the position to which we -are write and thus needs the file stream to support it. - -Right now when trying to write the index to stdout we fail with: - - depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed. - Aborted (core dumped) - -We have no interest in outputting our index to stdout, so just skip it -like is done with other indexes. - -While at it, add/remove some newlines to improve readability. - -Reported-by: Yanko Kaneti -Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo") - tools/depmod.c | 6 +- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tools/depmod.c b/tools/depmod.c -index fbbce10..875e314 100644 a/tools/depmod.c -+++ b/tools/depmod.c -@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) - struct index_node *idx; - struct kmod_list *l, *builtin = NULL; - -- idx = index_create(); -+ if (out == stdout) -+ return 0; - -+ idx = index_create(); - if (idx == NULL) { - ret = -ENOMEM; - goto fail; -@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) - - if (count) - index_write(idx, out); -+ - index_destroy(idx); -+ - fail: - if (builtin) - kmod_module_unref_list(builtin); --- -cgit 1.2.3-1.el7 - diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild deleted file mode 100644 index 1f01479f150..000 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit autotools bash-completion-r1 multilib python-r1 - -if [[ ${PV} == * ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - #inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib" - -# 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. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/mod
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 191d2e5ceead3b3c9be2655bc27af5dadd636f78 Author: Lars Wendler gentoo org> AuthorDate: Fri May 21 06:48:44 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri May 21 07:06:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=191d2e5c sys-apps/kmod: Bump to version 29 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/Manifest | 1 + sys-apps/kmod/kmod-29.ebuild | 203 +++ 2 files changed, 204 insertions(+) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 29b9d69a8f0..43d7af8f39e 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,2 +1,3 @@ DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a +DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild new file mode 100644 index 000..b2369d92355 --- /dev/null +++ b/sys-apps/kmod/kmod-29.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools bash-completion-r1 multilib python-r1 + +if [[ ${PV} == * ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + #inherit libtool +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc +lzma pkcs7 python static-libs +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. +# So we have to restrict it. +# See bug #408915. +RESTRICT="test" + +# >=zlib-1.2.6 required because of bug #427130 +# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + python? ( ${PYTHON_DEPS} ) + pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.4.4 )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + python? ( + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == * ]]; then + BDEPEND="${BDEPEND} + dev-libs/libxslt" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( NEWS README TODO ) + +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 wrt #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + --with-rootlibdir="${EPREFIX}/$(get_libdir)" + $(use_enable debug) + $(usex 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 ECONF_SOURCE="$
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: d6d70c254b69f2c4d5b09ce82c7cdf819008 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Apr 29 19:05:47 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Apr 29 19:20:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d70c25 sys-apps/kmod: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 7 ++- sys-apps/kmod/kmod-28.ebuild| 7 ++- sys-apps/kmod/kmod-.ebuild | 7 ++- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index c086f244d30..1f01479f150 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib" +IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib" # 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. @@ -36,10 +36,7 @@ RDEPEND="!sys-apps/module-init-tools !=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - pkcs7? ( - !libressl? ( >=dev-libs/openssl-1.1.0:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND}" BDEPEND=" diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index b631bb43ef3..e7a05bd1835 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd" +IUSE="debug doc +lzma pkcs7 python static-libs +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. @@ -37,10 +37,7 @@ RDEPEND="!sys-apps/module-init-tools !=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - pkcs7? ( - !libressl? ( >=dev-libs/openssl-1.1.0:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.4.4 )" DEPEND="${RDEPEND}" diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 46231768099..b2369d92355 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd" +IUSE="debug doc +lzma pkcs7 python static-libs +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. @@ -37,10 +37,7 @@ RDEPEND="!sys-apps/module-init-tools !=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - pkcs7? ( - !libressl? ( >=dev-libs/openssl-1.1.0:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.4.4 )" DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 69fb69ff2ec76e12d75f41a30e9874e14dcbf6f7 Author: Mike Gilbert gentoo org> AuthorDate: Sat Apr 3 18:51:10 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Apr 3 18:51:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fb69ff sys-apps/kmod: replace EROOT with BROOT in src_prepare Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 4 ++-- sys-apps/kmod/kmod-28.ebuild| 2 +- sys-apps/kmod/kmod-.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 2f6ec83339b..38da6ab55f7 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -70,7 +70,7 @@ src_prepare() { if [[ ! -e configure ]] || use doc ; then if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 3a10626ae5c..a8423812033 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -70,7 +70,7 @@ src_prepare() { if [[ ! -e configure ]] || use doc ; then if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index cf4d5e008df..46231768099 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -70,7 +70,7 @@ src_prepare() { if [[ ! -e configure ]] || use doc ; then if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 59213842ac0fc85ff935dbe885ee2d240da31124 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 12:29:30 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 12:29:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59213842 sys-apps/kmod: Stabilize 28 ppc, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 406ea963d09..3a10626ae5c 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: bde329a52effa18b468a3ad6ccbf0fa7d44585c1 Author: Sam James gentoo org> AuthorDate: Mon Feb 15 10:47:55 2021 + Commit: Sam James gentoo org> CommitDate: Mon Feb 15 10:47:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde329a5 sys-apps/kmod: Stabilize 28 arm, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 77407d5a3e4..406ea963d09 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: b985045e1b0ee8c65bd235c7c97b24741278b7b0 Author: Sam James gentoo org> AuthorDate: Sun Feb 14 14:52:48 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 14 14:52:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b985045e sys-apps/kmod: Stabilize 28 arm64, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index c163e6b8ac2..77407d5a3e4 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 3a5c36a76bfd0e29a8d958acad043ef02e922ea9 Author: Sam James gentoo org> AuthorDate: Thu Feb 11 07:53:24 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 11 07:53:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5c36a7 sys-apps/kmod: Stabilize 28 x86, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 8373389736a..c163e6b8ac2 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: fc25a2281e6dd453e609ffabad8c018ebcde80c1 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Feb 10 15:38:43 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Feb 10 16:29:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc25a228 sys-apps/kmod: stable 28 for hppa, bug #769617 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 7bf60b4339a..8373389736a 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc ~x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: b7d7fca96fd6ae77db2f8756aa6f214c0239f035 Author: Sam James gentoo org> AuthorDate: Tue Feb 9 22:51:59 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 9 22:51:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d7fca9 sys-apps/kmod: Stabilize 28 amd64, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index fa1fe1987e9..7bf60b4339a 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc ~x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: f46b1646a8d457f1bb71c955dd5fdab3bca71a94 Author: Sam James gentoo org> AuthorDate: Tue Feb 9 06:16:38 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 9 06:16:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46b1646 sys-apps/kmod: Stabilize 28 sparc, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 822cd785ccf..fa1fe1987e9 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc ~x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 26c582abe6c09128deae603c69d7896794c766b7 Author: Sam James gentoo org> AuthorDate: Tue Feb 9 06:15:46 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 9 06:15:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c582ab sys-apps/kmod: Stabilize 28 s390, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 87310cfd63b..822cd785ccf 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sparc ~x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 14c62fff6985117a747c102ee1cc351dba9bd31c Author: Sam James gentoo org> AuthorDate: Tue Feb 9 06:15:09 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 9 06:15:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c62fff sys-apps/kmod: Stabilize 28 ppc64, #769617 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 5b098b96fef..87310cfd63b 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 06037628cbb263b10d8045c6167f66d71656fa52 Author: David Michael gmail com> AuthorDate: Fri Jan 8 19:26:18 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 8 19:27:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06037628 sys-apps/kmod: Fix xsltproc dependency and sync live ebuild with latest release Closes: https://bugs.gentoo.org/764467 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/kmod-.ebuild | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index a7e386f475a..d608f43bcf1 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit autotools bash-completion-r1 multilib python-r1 @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" +IUSE="debug doc libressl +lzma pkcs7 python static-libs +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. @@ -29,6 +29,7 @@ IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" # See bug #408915. RESTRICT="test" +# >=zlib-1.2.6 required because of bug #427130 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils @@ -40,7 +41,8 @@ RDEPEND="!sys-apps/module-init-tools !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.4.4 )" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -55,13 +57,13 @@ BDEPEND=" zlib? ( virtual/pkgconfig ) " if [[ ${PV} == * ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} dev-libs/libxslt" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS="NEWS README TODO" +DOCS=( NEWS README TODO ) src_prepare() { default @@ -97,6 +99,7 @@ src_configure() { $(use_with lzma xz) $(use_with pkcs7 openssl) $(use_with zlib) + $(use_with zstd) ) local ECONF_SOURCE="${S}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 25839e92b262f606bf7f71b37ad1c0cfdc192caf Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 8 14:06:18 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 8 14:15:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25839e92 sys-apps/kmod: Bump to version 28 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/Manifest | 1 + sys-apps/kmod/kmod-28.ebuild | 206 +++ 2 files changed, 207 insertions(+) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index d62d2b683b0..010ee9f2330 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,2 +1,3 @@ DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c +DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild new file mode 100644 index 000..94820b237d3 --- /dev/null +++ b/sys-apps/kmod/kmod-28.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit autotools bash-completion-r1 multilib python-r1 + +if [[ ${PV} == * ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + #inherit libtool +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc libressl +lzma pkcs7 python static-libs +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. +# So we have to restrict it. +# See bug #408915. +RESTRICT="test" + +# >=zlib-1.2.6 required because of bug #427130 +# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + python? ( ${PYTHON_DEPS} ) + pkcs7? ( + !libressl? ( >=dev-libs/openssl-1.1.0:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.4.4 )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + python? ( + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == * ]]; then + DEPEND="${DEPEND} + dev-libs/libxslt" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS="NEWS README TODO" + +src_prepare() { + default + + if [[ ! -e configure ]] || use doc ; then + if use doc; then + cp "${EROOT}"/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 wrt #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + --with-rootlibdir="${EPREFIX}/$(get_libdir)" + $(use_enable debug) + $(usex doc '--enable-gtk-doc' '') + $(use_enable static-libs static) + $(use_enable tools) + $(use_with lzma xz) +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/files/, sys-apps/kmod/
commit: abe3c527bd51c009f61e85e2a86fca60ea3c4f20 Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 8 14:12:00 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 8 14:15:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe3c527 sys-apps/kmod: Removed old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/Manifest | 1 - sys-apps/kmod/files/kmod-26-libressl.patch | 143 sys-apps/kmod/kmod-26-r5.ebuild| 201 - 3 files changed, 345 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 010ee9f2330..29b9d69a8f0 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,3 +1,2 @@ -DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a diff --git a/sys-apps/kmod/files/kmod-26-libressl.patch b/sys-apps/kmod/files/kmod-26-libressl.patch deleted file mode 100644 index cb36ab401c2..000 --- a/sys-apps/kmod/files/kmod-26-libressl.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 628677e066198d8658d7edd5511a5bb27cd229f5 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Sun, 19 May 2019 03:42:01 +0300 -Subject: [PATCH] libkmod-signature: use PKCS#7 instead of CMS - -Linux uses either PKCS #7 or CMS for signing modules (see -scripts/sign-file.c). CMS is not supported by LibreSSL or older OpenSSL, -so PKCS #7 is used on systems with these libcrypto providers. - -CMS and PKCS #7 formats are very similar. CMS is newer but is as much as -possible backward compatible with PKCS #7 [1]. PKCS #7 is supported in -the latest OpenSSL as well as CMS. The fields used for signing kernel -modules are supported both in PKCS #7 and CMS. - -For now modinfo uses CMS with no alternative requiring OpenSSL 1.1.0 or -newer. - -Use PKCS #7 for parsing module signature information, so that modinfo -could be used both with OpenSSL and LibreSSL. - -[1] https://tools.ietf.org/html/rfc5652#section-1.1 - -Changes v1->v2: -- Don't use ifdefs for keeping redundant CMS code, just use PKCS #7 both -with OpenSSL and LibreSSL. - -Upstream-Status: Accepted -[https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=628677e066198d8658d7edd5511a5bb27cd229f5] -Signed-off-by: Stefan Strogin - libkmod/libkmod-signature.c | 37 +++-- - 1 file changed, 19 insertions(+), 18 deletions(-) - -diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c -index 48d0145..4e8748c 100644 a/libkmod/libkmod-signature.c -+++ b/libkmod/libkmod-signature.c -@@ -20,7 +20,7 @@ - #include - #include - #ifdef ENABLE_OPENSSL --#include -+#include - #include - #endif - #include -@@ -122,7 +122,7 @@ static bool fill_default(const char *mem, off_t size, - #ifdef ENABLE_OPENSSL - - struct pkcs7_private { -- CMS_ContentInfo *cms; -+ PKCS7 *pkcs7; - unsigned char *key_id; - BIGNUM *sno; - }; -@@ -132,7 +132,7 @@ static void pkcs7_free(void *s) - struct kmod_signature_info *si = s; - struct pkcs7_private *pvt = si->private; - -- CMS_ContentInfo_free(pvt->cms); -+ PKCS7_free(pvt->pkcs7); - BN_free(pvt->sno); - free(pvt->key_id); - free(pvt); -@@ -197,11 +197,10 @@ static bool fill_pkcs7(const char *mem, off_t size, - struct kmod_signature_info *sig_info) - { - const char *pkcs7_raw; -- CMS_ContentInfo *cms; -- STACK_OF(CMS_SignerInfo) *sis; -- CMS_SignerInfo *si; -- int rc; -- ASN1_OCTET_STRING *key_id; -+ PKCS7 *pkcs7; -+ STACK_OF(PKCS7_SIGNER_INFO) *sis; -+ PKCS7_SIGNER_INFO *si; -+ PKCS7_ISSUER_AND_SERIAL *is; - X509_NAME *issuer; - ASN1_INTEGER *sno; - ASN1_OCTET_STRING *sig; -@@ -220,31 +219,33 @@ static bool fill_pkcs7(const char *mem, off_t size, - - in = BIO_new_mem_buf(pkcs7_raw, sig_len); - -- cms = d2i_CMS_bio(in, NULL); -- if (cms == NULL) { -+ pkcs7 = d2i_PKCS7_bio(in, NULL); -+ if (pkcs7 == NULL) { - BIO_free(in); - retu
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 81900cb1829c265b7380599bc4207c5ed432876d Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Oct 26 17:30:52 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Oct 26 17:31:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81900cb1 sys-apps/kmod: add Python 3.9 support Closes: https://bugs.gentoo.org/747094 Closes: https://github.com/gentoo/gentoo/pull/17796 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- sys-apps/kmod/kmod-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 25f44473524..8eb51ecede2 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit autotools bash-completion-r1 multilib python-r1 diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 7a4f75e4ee5..a7e386f475a 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit autotools bash-completion-r1 multilib python-r1
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: a6d07608de5755a5d418dbba2c9b1aa7b4e08be4 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 20 10:04:13 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 20 10:05:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d07608 sys-apps/kmod: Do not print OpenRC messages on systemd Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Mikle Kolyada gentoo.org> sys-apps/kmod/kmod-26-r5.ebuild | 2 +- sys-apps/kmod/kmod-27-r2.ebuild | 2 +- sys-apps/kmod/kmod-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-apps/kmod/kmod-26-r5.ebuild b/sys-apps/kmod/kmod-26-r5.ebuild index 0971ec42863..53000bb3deb 100644 --- a/sys-apps/kmod/kmod-26-r5.ebuild +++ b/sys-apps/kmod/kmod-26-r5.ebuild @@ -190,7 +190,7 @@ pkg_postinst() { fi if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!" diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index d221e38e307..25f44473524 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -194,7 +194,7 @@ pkg_postinst() { fi if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!" diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index c9e60cdc33f..7a4f75e4ee5 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -192,7 +192,7 @@ pkg_postinst() { fi if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: b6a2e28960b8381f7addb061b8f5c70870e90f45 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Sep 19 20:06:28 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Sep 19 20:06:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a2e289 sys-apps/kmod: Stabilize 27-r2 amd64, #736723 Signed-off-by: Mikle Kolyada gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 6810471a0ce..d221e38e307 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: c68d69945ae29b9bc610ea95dbe92046235f86bd Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Sep 18 08:11:06 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Sep 18 08:11:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68d6994 sys-apps/kmod: s390 stable wrt bug #736723 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="s390" Signed-off-by: Agostino Sarubbo gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 721f68de6d5..6810471a0ce 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 7ef9d972dd4e189564c4c67366e50b90c23daa69 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Sep 7 08:10:09 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Sep 7 08:19:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef9d972 sys-apps/kmod: stable 27-r2 for ppc stable wrt bug #736723 Package-Manager: Portage-3.0.5, Repoman-3.0.1 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index f7c5298d4aa..59a588c7394 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: c96c447f6d244f2fa2a21695687dd5550beff7d2 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Sep 6 07:45:18 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Sep 6 07:49:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96c447f sys-apps/kmod: stable 27-r2 for hppa stable wrt bug #736723 Package-Manager: Portage-3.0.5, Repoman-3.0.1 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 27621e7504c..f7c5298d4aa 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 138ea0456aea9b0cea8ec7635b5533d0da7e9b49 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Sep 4 10:23:48 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Sep 4 10:31:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138ea045 sys-apps/kmod: stable 27-r2 for sparc stable wrt bug #736723 Package-Manager: Portage-3.0.5, Repoman-3.0.1 RepoMan-Options: --include-arches="sparc" Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index e78a84c7647..27621e7504c 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 5706cc5d1dc51218b50db4c37e6c751c17d275c9 Author: Sam James gentoo org> AuthorDate: Fri Sep 4 04:22:27 2020 + Commit: Sam James gentoo org> CommitDate: Fri Sep 4 04:22:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5706cc5d sys-apps/kmod: Stabilize 27-r2 arm, #736723 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index e1bf9dfadb6..e78a84c7647 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: cc8d725db985a9de0e5b9ceeea410dbc06a0f6f0 Author: Sam James gentoo org> AuthorDate: Fri Sep 4 03:33:57 2020 + Commit: Sam James gentoo org> CommitDate: Fri Sep 4 03:34:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8d725d sys-apps/kmod: Stabilize 27-r2 arm64, #736723 Signed-off-by: Sam James gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 53104ffcdf8..e1bf9dfadb6 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 3324407fd0373a815aae0a64a4e397c669f413a9 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Sep 3 14:49:53 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Sep 3 14:49:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3324407f sys-apps/kmod: x86 stable (bug #736723) Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 6a97a8b568d..53104ffcdf8 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" #inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/, sys-apps/kmod/files/
commit: 4e4dff82bbb63e8b5a6e97880b085c3ee2e2e583 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 2 23:15:16 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Sep 3 14:16:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4dff82 sys-apps/kmod: rev bump to fix crash Fixes depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed. Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> ...od-27-depmod-do-not-output-.bin-to-stdout.patch | 53 ++ .../kmod/{kmod-27-r1.ebuild => kmod-27-r2.ebuild} | 2 + 2 files changed, 55 insertions(+) diff --git a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch new file mode 100644 index 000..dc776b515bc --- /dev/null +++ b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch @@ -0,0 +1,53 @@ +From 53b30aeba2dedae9f5558f560231d9462e063dfc Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi +Date: Thu, 5 Mar 2020 13:33:10 -0800 +Subject: depmod: do not output .bin to stdout + +index_write() relies on fseek/ftell to manage the position to which we +are write and thus needs the file stream to support it. + +Right now when trying to write the index to stdout we fail with: + + depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed. + Aborted (core dumped) + +We have no interest in outputting our index to stdout, so just skip it +like is done with other indexes. + +While at it, add/remove some newlines to improve readability. + +Reported-by: Yanko Kaneti +Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo") +--- + tools/depmod.c | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tools/depmod.c b/tools/depmod.c +index fbbce10..875e314 100644 +--- a/tools/depmod.c b/tools/depmod.c +@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) + struct index_node *idx; + struct kmod_list *l, *builtin = NULL; + +- idx = index_create(); ++ if (out == stdout) ++ return 0; + ++ idx = index_create(); + if (idx == NULL) { + ret = -ENOMEM; + goto fail; +@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) + + if (count) + index_write(idx, out); ++ + index_destroy(idx); ++ + fail: + if (builtin) + kmod_module_unref_list(builtin); +-- +cgit 1.2.3-1.el7 + diff --git a/sys-apps/kmod/kmod-27-r1.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild similarity index 98% rename from sys-apps/kmod/kmod-27-r1.ebuild rename to sys-apps/kmod/kmod-27-r2.ebuild index c9e60cdc33f..d01054db3c4 100644 --- a/sys-apps/kmod/kmod-27-r1.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -63,6 +63,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS="NEWS README TODO" +PATCHES=( "${FILESDIR}"/${P}-depmod-do-not-output-.bin-to-stdout.patch ) + src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 905da57efbf9a8353ee1a79b96fa3a7b072e59a7 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 2 23:22:15 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Sep 3 14:16:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905da57e sys-apps/kmod: enable support for compressed modules by default Closes: https://bugs.gentoo.org/680996 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/kmod/kmod-27-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index d01054db3c4..6a97a8b568d 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" +IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib" # 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.
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: a3235ecd7bd2a2d1af8a839a6df5b51cdf1c2ed7 Author: Roy Yang google com> AuthorDate: Sat May 2 22:16:46 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon May 4 17:35:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3235ecd Fixed CPE tag for sys-apps/kmod Signed-off-by: Roy Yang google.com> Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/kmod/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml index be2aa770174..ccb7f0ba687 100644 --- a/sys-apps/kmod/metadata.xml +++ b/sys-apps/kmod/metadata.xml @@ -14,4 +14,7 @@ Install module loading/unloading tools. Enable support for gzipped modules + + cpe:/a:kernel:kmod +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 0c0b4a1f9cd9d5f3122e355c1b6c9d7b2aa9767b Author: Mike Gilbert gentoo org> AuthorDate: Fri Mar 6 15:32:08 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Mar 6 15:32:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0b4a1f sys-apps/kmod: uncomment python_optimize Bug: https://bugs.gentoo.org/711602 Package-Manager: Portage-2.3.92_p3, Repoman-2.3.20_p118 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/{kmod-26-r4.ebuild => kmod-26-r5.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-26-r4.ebuild b/sys-apps/kmod/kmod-26-r5.ebuild similarity index 99% rename from sys-apps/kmod/kmod-26-r4.ebuild rename to sys-apps/kmod/kmod-26-r5.ebuild index a3805406d20..55fb119f24f 100644 --- a/sys-apps/kmod/kmod-26-r4.ebuild +++ b/sys-apps/kmod/kmod-26-r5.ebuild @@ -142,7 +142,7 @@ src_install() { VPATH="${native_builddir}:${S}" \ install-pkgpyexecLTLIBRARIES \ install-dist_pkgpyexecPYTHON - #python_optimize + python_optimize } python_foreach_impl python_install
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 13a5885ecf8d9f3129d3c84346fc4fd90719b3c5 Author: Mike Gilbert gentoo org> AuthorDate: Thu Mar 5 15:58:52 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 5 15:59:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a5885e sys-apps/kmod: call python_optimize Closes: https://bugs.gentoo.org/711602 Package-Manager: Portage-2.3.91_p5, Repoman-2.3.20_p113 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/{kmod-26-r3.ebuild => kmod-26-r4.ebuild} | 1 + sys-apps/kmod/{kmod-27.ebuild => kmod-27-r1.ebuild}| 1 + sys-apps/kmod/kmod-.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r4.ebuild similarity index 99% rename from sys-apps/kmod/kmod-26-r3.ebuild rename to sys-apps/kmod/kmod-26-r4.ebuild index 11caee768c3..a3805406d20 100644 --- a/sys-apps/kmod/kmod-26-r3.ebuild +++ b/sys-apps/kmod/kmod-26-r4.ebuild @@ -142,6 +142,7 @@ src_install() { VPATH="${native_builddir}:${S}" \ install-pkgpyexecLTLIBRARIES \ install-dist_pkgpyexecPYTHON + #python_optimize } python_foreach_impl python_install diff --git a/sys-apps/kmod/kmod-27.ebuild b/sys-apps/kmod/kmod-27-r1.ebuild similarity index 99% rename from sys-apps/kmod/kmod-27.ebuild rename to sys-apps/kmod/kmod-27-r1.ebuild index e0a5eee807d..f7ff20bf0db 100644 --- a/sys-apps/kmod/kmod-27.ebuild +++ b/sys-apps/kmod/kmod-27-r1.ebuild @@ -144,6 +144,7 @@ src_install() { VPATH="${native_builddir}:${S}" \ install-pkgpyexecLTLIBRARIES \ install-dist_pkgpyexecPYTHON + python_optimize } python_foreach_impl python_install diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index e0a5eee807d..f7ff20bf0db 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -144,6 +144,7 @@ src_install() { VPATH="${native_builddir}:${S}" \ install-pkgpyexecLTLIBRARIES \ install-dist_pkgpyexecPYTHON + python_optimize } python_foreach_impl python_install
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 7293bf944137112097f78ac0866ff11f71325f79 Author: Mike Gilbert gentoo org> AuthorDate: Thu Mar 5 15:59:44 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 5 16:00:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7293bf94 sys-apps/kmod: remove old Package-Manager: Portage-2.3.91_p5, Repoman-2.3.20_p113 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kmod/Manifest | 1 - sys-apps/kmod/kmod-25.ebuild | 191 --- 2 files changed, 192 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index c32d51e4790..d62d2b683b0 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,3 +1,2 @@ -DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild deleted file mode 100644 index ca101dc3423..000 --- a/sys-apps/kmod/kmod-25.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit bash-completion-r1 ltprune multilib python-r1 - -if [[ ${PV} == * ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit autotools git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" - inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc lzma python static-libs +tools zlib" - -# 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. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig )" -if [[ ${PV} == * ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -src_prepare() { - default - - if [ ! -e configure ]; then - if use doc; then - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - $(use_enable tools) - $(use_with lzma xz) - $(use_with zlib) - ) - - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_co
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 7f14a2d9d6f14424478b4f376478cb1a78097b53 Author: Lars Wendler gentoo org> AuthorDate: Wed Feb 19 09:48:39 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Feb 19 09:48:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f14a2d9 sys-apps/kmod: Synced live ebuild Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/kmod-.ebuild | 46 -- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 1ba782da271..e0a5eee807d 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) -inherit bash-completion-r1 multilib python-r1 +inherit autotools bash-completion-r1 multilib python-r1 if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; - inherit autotools git-r3 + inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - inherit libtool + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + #inherit libtool fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -41,14 +41,19 @@ RDEPEND="!sys-apps/module-init-tools libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[${PYTHON_USEDEP}] virtual/pkgconfig ) - zlib? ( virtual/pkgconfig )" + zlib? ( virtual/pkgconfig ) +" if [[ ${PV} == * ]]; then DEPEND="${DEPEND} dev-libs/libxslt" @@ -61,8 +66,9 @@ DOCS="NEWS README TODO" src_prepare() { default - if [[ ! -e configure ]] ; then + if [[ ! -e configure ]] || use doc ; then if use doc; then + cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make @@ -85,7 +91,7 @@ src_configure() { --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" $(use_enable debug) - $(use_enable doc gtk-doc) + $(usex doc '--enable-gtk-doc' '') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) @@ -143,7 +149,7 @@ src_install() { python_foreach_impl python_install fi - find "${ED}" -name "*.la" -delete || die + find "${ED}" -type f -name "*.la" -delete || die if use tools; then local cmd @@ -169,23 +175,23 @@ src_install() { } pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes fi # Add kmod to the runlevel automatically if this is the first install of this package. if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT}"/etc/runlevels/sysinit fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes fi fi - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then + if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 6cee0a3ce3cef2c28ce58c5e66a407f826f381ea Author: Lars Wendler gentoo org> AuthorDate: Wed Feb 19 09:47:28 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Feb 19 09:47:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cee0a3c sys-apps/kmod: Bump to version 27 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/Manifest | 1 + sys-apps/kmod/kmod-27.ebuild | 202 +++ 2 files changed, 203 insertions(+) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index b0cb0a1e990..c32d51e4790 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,2 +1,3 @@ DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 +DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c diff --git a/sys-apps/kmod/kmod-27.ebuild b/sys-apps/kmod/kmod-27.ebuild new file mode 100644 index 000..e0a5eee807d --- /dev/null +++ b/sys-apps/kmod/kmod-27.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools bash-completion-r1 multilib python-r1 + +if [[ ${PV} == * ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + #inherit libtool +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" + +# 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. +# So we have to restrict it. +# See bug #408915. +RESTRICT="test" + +# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + python? ( ${PYTHON_DEPS} ) + pkcs7? ( + !libressl? ( >=dev-libs/openssl-1.1.0:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + python? ( + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == * ]]; then + DEPEND="${DEPEND} + dev-libs/libxslt" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS="NEWS README TODO" + +src_prepare() { + default + + if [[ ! -e configure ]] || use doc ; then + if use doc; then + cp "${EROOT}"/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 wrt #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + --with-rootlibdir="${EPREFIX}/$(get_libdir)" + $(use_enable debug) + $(usex doc '--enable-gtk-doc' '') + $(use_enable static-libs static) + $(use_enable tools) + $(use_with lzma xz) + $(use_with pkcs7 openssl) + $(use_with zlib) + ) + +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 531f44f64cdf3697119d88b69f333c93682a4961 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 10 21:13:36 2020 + Commit: Michał Górny gentoo org> CommitDate: Mon Feb 10 21:24:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531f44f6 sys-apps/kmod: Remove py2 Signed-off-by: Michał Górny gentoo.org> sys-apps/kmod/kmod-25.ebuild| 2 +- sys-apps/kmod/kmod-26-r3.ebuild | 2 +- sys-apps/kmod/kmod-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild index e6938000740..ca101dc3423 100644 --- a/sys-apps/kmod/kmod-25.ebuild +++ b/sys-apps/kmod/kmod-25.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit bash-completion-r1 ltprune multilib python-r1 diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild index 068cb797969..11caee768c3 100644 --- a/sys-apps/kmod/kmod-26-r3.ebuild +++ b/sys-apps/kmod/kmod-26-r3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit bash-completion-r1 multilib python-r1 diff --git a/sys-apps/kmod/kmod-.ebuild b/sys-apps/kmod/kmod-.ebuild index 3313669d60c..1ba782da271 100644 --- a/sys-apps/kmod/kmod-.ebuild +++ b/sys-apps/kmod/kmod-.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit bash-completion-r1 multilib python-r1
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: fb052fcf34d9bd6409ceab3c8b313768ff7efe74 Author: Matt Turner gentoo org> AuthorDate: Thu Dec 5 01:47:29 2019 + Commit: Matt Turner gentoo org> CommitDate: Thu Dec 5 01:51:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb052fcf sys-apps/kmod-26-r3: alpha stable, bug 684778 Signed-off-by: Matt Turner gentoo.org> sys-apps/kmod/kmod-26-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild index 68c8ddc6a35..2e7ab7e1654 100644 --- a/sys-apps/kmod/kmod-26-r3.ebuild +++ b/sys-apps/kmod/kmod-26-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit autotools git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" inherit libtool fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
commit: 353db3be0dbc2929592f87dad7ffdc7afd856d14 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Nov 30 21:42:13 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Nov 30 21:42:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353db3be sys-apps/kmod: stable 26-r3 for hppa, bug #684778 Package-Manager: Portage-2.3.80, Repoman-2.3.19 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kmod/kmod-26-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild index 4c0380e44bd..68c8ddc6a35 100644 --- a/sys-apps/kmod/kmod-26-r3.ebuild +++ b/sys-apps/kmod/kmod-26-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then inherit autotools git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" inherit libtool fi