From e021d283de410c626b035ce588e7d3faf03fc7ae Mon Sep 17 00:00:00 2001 From: "Sv. Lockal" Date: Wed, 13 May 2026 15:07:22 +0800 Subject: [PATCH] dev-libs/xdna-driver: override driver via /etc/depmod.d Previous method with /etc/modprobe.d was unreliable: with 7.0 kernel amdxdna depends on amd-pmf module. With "insmod" in modprobe.d the driver was sometimes loaded before amd-pmf, failing with "Unknown symbol amd_pmf_get_npu_data". But depmod.d is both reliable and clean way to override in-tree driver with out-of-tree one (i. e. respects "depends" section that one can see in `modinfo amdxdna`). Signed-off-by: Sv. Lockal --- ...2.21.75-r1.ebuild => xdna-driver-2.21.75-r2.ebuild} | 10 +++------- dev-libs/xdna-driver/xdna-driver-999999.ebuild | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) rename dev-libs/xdna-driver/{xdna-driver-2.21.75-r1.ebuild => xdna-driver-2.21.75-r2.ebuild} (96%) diff --git a/dev-libs/xdna-driver/xdna-driver-2.21.75-r1.ebuild b/dev-libs/xdna-driver/xdna-driver-2.21.75-r2.ebuild similarity index 96% rename from dev-libs/xdna-driver/xdna-driver-2.21.75-r1.ebuild rename to dev-libs/xdna-driver/xdna-driver-2.21.75-r2.ebuild index eb4e957af1..35ae86b7ea 100644 --- a/dev-libs/xdna-driver/xdna-driver-2.21.75-r1.ebuild +++ b/dev-libs/xdna-driver/xdna-driver-2.21.75-r2.ebuild @@ -161,14 +161,10 @@ src_install() { popd &>/dev/null || die fi - insinto /usr/lib/modules-load.d + # Prefer out-of-tree driver over kernel/drivers/accel/amdxdna/amdxdna.ko + insinto /etc/depmod.d newins - amdxdna.conf <<-EOF - amdxdna - EOF - - insinto /etc/modprobe.d - newins - amdxdna.conf <<-EOF - install amdxdna /sbin/insmod /lib/modules/\$(uname -r)/extra/amdxdna.ko* \$CMDLINE_OPTS + override amdxdna * extra EOF linux-mod-r1_src_install diff --git a/dev-libs/xdna-driver/xdna-driver-999999.ebuild b/dev-libs/xdna-driver/xdna-driver-999999.ebuild index 1e9e49bdb1..b23cbbe85d 100644 --- a/dev-libs/xdna-driver/xdna-driver-999999.ebuild +++ b/dev-libs/xdna-driver/xdna-driver-999999.ebuild @@ -158,14 +158,10 @@ src_install() { popd &>/dev/null || die fi - insinto /usr/lib/modules-load.d + # Prefer out-of-tree driver over kernel/drivers/accel/amdxdna/amdxdna.ko + insinto /etc/depmod.d newins - amdxdna.conf <<-EOF - amdxdna - EOF - - insinto /etc/modprobe.d - newins - amdxdna.conf <<-EOF - install amdxdna /sbin/insmod /lib/modules/\$(uname -r)/extra/amdxdna.ko* \$CMDLINE_OPTS + override amdxdna * extra EOF linux-mod-r1_src_install