diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-32-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-32-r2.ebuild index 5b93067333..366c2ba3d5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-32-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-32-r2.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. @@ -79,8 +79,6 @@ src_prepare() { src_configure() { local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" $(use_enable debug) @@ -101,12 +99,10 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die - 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 + 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