From ae715228a25a500c408e6e11c0f60b4e397e1309 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sat, 12 Sep 2020 15:16:44 +0200 Subject: [PATCH] dkms: build 'prepare0' instead of 'scripts' to ensure modpost is built on the host else modules don't build on crossbuilt kernels >= 5.0 since linux/60df1aee2aecb53efb4218b4dfdf7d6c80a5a3de moved modpost from target 'scripts' to 'prepare0'. The same has been applied to xbps-triggers/dkms --- srcpkgs/dkms/files/kernel.d/dkms.postinst | 4 ++-- srcpkgs/dkms/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst index ef2a10bac2..6b345bef90 100644 --- a/srcpkgs/dkms/files/kernel.d/dkms.postinst +++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst @@ -19,8 +19,8 @@ fi export IGNORE_CC_MISMATCH=1 -if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] ; then - yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build scripts +if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] || [ ! -f /lib/modules/${VERSION}/build/scripts/mod/modpost ]; then + yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build prepare0 fi # Check available DKMS modules diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index 664f899abb..ba61736f1b 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,7 +1,7 @@ # Template file for 'dkms' pkgname=dkms version=2.8.3 -revision=2 +revision=3 conf_files="/etc/dkms/framework.conf" depends="bash kmod gcc make coreutils" short_desc="Dynamic Kernel Modules System"