commit: 39dd811517b6495f872445ccd28257e2ffc638bb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 21:01:34 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 21:01:34 2024 +0000
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 <sam <AT> gentoo.org>
sys-apps/kmod/kmod-32.ebuild | 14 --------------
sys-apps/kmod/kmod-9999.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-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 9d4a9de69ccb..531212bc23bc 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.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
