From 98f0d747926a46958d3caaacd30cb792b7e48615 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 26 Jun 2024 12:54:08 -0400 Subject: dkms: depend on pahole CONFIG_DEBUG_INFO_BTF_MODULES is enabled on most/all void kernels, and thus pahole is used when generating BTF information during compilation of external modules. on cross-built kernels, the absence of pahole will remove CONFIG_DEBUG_INFO_BTF_MODULES from /usr/src/kernel-headers-$version/include/generated/autoconf.h when the dkms kernel.d hook runs for the first time (because cross-built kernels have their host tools removed). When this is removed, part of the module struct in include/linux/module.h is missing, resulting in a mismatch in the size of the __this_module struct (.gnu.link_once.this_module section of the .ko) in external modules of exactly 64 bytes. struct module { // ... #ifdef CONFIG_DEBUG_INFO_BTF_MODULES unsigned int btf_data_size; void *btf_data; #endif // ... } fixes #51005 --- srcpkgs/dkms/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index a5277fbfee2..2f585aa82d0 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,9 +1,9 @@ # Template file for 'dkms' pkgname=dkms version=3.0.12 -revision=1 +revision=2 conf_files="/etc/dkms/framework.conf /etc/default/dkms" -depends="bash kmod gcc bc make coreutils xbps-triggers>=0.123_1" +depends="bash kmod gcc bc make coreutils pahole xbps-triggers>=0.123_1" short_desc="Dynamic Kernel Module Support" maintainer="Orphaned " license="GPL-2.0-or-later" -- cgit v1.2.3