gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-08 06:17:07 -08:00
Code Issues Projects Releases Wiki Activity

sys-apps/kmod: move kmod and symlinks back to /

Browse Source 
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@gentoo.org>
This commit is contained in:
Mike Gilbert
2024-06-20 22:19:07 -04:00
parent c775217a26
commit eb13455af7
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys-apps/kmod/kmod-32-r1.ebuild → sys-apps/kmod/kmod-32-r2.ebuild
+9 -5
View File
@@ -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
sys-apps/kmod/kmod-9999.ebuild
+9 -5
View File
@@ -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