[gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     eb13455af714ffb37726b04cbc87f91bbc2fbf97
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 02:16:09 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 02:19:07 2024 +0000
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 <floppym <AT> gentoo.org>

 sys-apps/kmod/{kmod-32-r1.ebuild => kmod-32-r2.ebuild} | 14 +++++++++-----
 sys-apps/kmod/kmod-9999.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-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 341d36a4f5e2..f672ae1e6f91 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 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