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 45E94158041 for ; Thu, 7 Mar 2024 22:19:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 688F3E29B1; Thu, 7 Mar 2024 22:19:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4CC49E29B1 for ; Thu, 7 Mar 2024 22:19:49 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E012340DE6 for ; Thu, 7 Mar 2024 22:19:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CA8B144C for ; Thu, 7 Mar 2024 22:19:47 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1709849913.e0f3f9da51b19053e04e59e723257f357bddb5d2.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/kmod/kmod-32-r1.ebuild sys-apps/kmod/kmod-32.ebuild sys-apps/kmod/kmod-9999.ebuild X-VCS-Directories: sys-apps/kmod/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e0f3f9da51b19053e04e59e723257f357bddb5d2 X-VCS-Branch: master Date: Thu, 7 Mar 2024 22:19:47 +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: f36ea573-c30d-461c-80b7-addfa40c7c4e X-Archives-Hash: a1e2a4216d84637b169c97793c48981a commit: e0f3f9da51b19053e04e59e723257f357bddb5d2 Author: Mike Gilbert gentoo org> AuthorDate: Thu Mar 7 22:18:33 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 7 22:18:33 2024 +0000 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-9999.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-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 531212bc23bc..341d36a4f5e2 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.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