From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DD8C158091 for ; Thu, 16 Jun 2022 15:53:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FC34E0957; Thu, 16 Jun 2022 15:53:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F104E0957 for ; Thu, 16 Jun 2022 15:53:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6857D34205D for ; Thu, 16 Jun 2022 15:53:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C33CC3C3 for ; Thu, 16 Jun 2022 15:53:18 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1655394784.30e6071c742a0e20a8af79c877fcea75ae3182dc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/kmod/kmod-29-r1.ebuild sys-apps/kmod/kmod-9999.ebuild X-VCS-Directories: sys-apps/kmod/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 30e6071c742a0e20a8af79c877fcea75ae3182dc X-VCS-Branch: master Date: Thu, 16 Jun 2022 15:53:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e4afe7e0-4e7f-48c9-bc01-4a1a8bc0f993 X-Archives-Hash: d469bf22b9d24402642581eb9b68651a commit: 30e6071c742a0e20a8af79c877fcea75ae3182dc Author: Sam James gentoo org> AuthorDate: Thu Jun 16 15:53:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 16 15:53:04 2022 +0000 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-9999.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} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -13,7 +13,6 @@ if [[ ${PV} == 9999* ]]; 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-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index e500c5c7fb00..48747e41ed50 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.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} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -13,7 +13,6 @@ if [[ ${PV} == 9999* ]]; 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 }