From 373c41cb05e328f4c62bb109f25e2de12681d67e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 12 Sep 2020 15:16:44 +0200
Subject: [PATCH 1/2] 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 ef2a10bac28..6b345bef905 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 664f899abb9..ba61736f1b5 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"

From 71ef9750c10b66d60564cda4f0ee9590a4054be9 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 12 Sep 2020 15:16:49 +0200
Subject: [PATCH 2/2] xbps-triggers: (dkms) build 'prepare0' instead of
 'scripts'

to ensure modpost is built on the host else modules don't build on
crossbuilt kernels >= 5.0 sinc
    linux/60df1aee2aecb53efb4218b4dfdf7d6c80a5a3de
moved modpost from target 'scripts' to 'prepare0'.

The same has been applied to xbps-triggers/dkms
---
 srcpkgs/xbps-triggers/files/dkms | 6 +++---
 srcpkgs/xbps-triggers/template   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 2208af9e745..fcd64efd030 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -70,9 +70,9 @@ add_modules() {
 			echo "Skipping kernel-${_kver}. kernel-headers package not installed..."
 			continue
 		fi
-		if [ ! -f ${f}/build/scripts/basic/fixdep ] ; then
-			echo -n "Building scripts for kernel-${_kver}... "
-			yes "" | make -j$(nproc) -C ${f}/build scripts > ${f}/build/make.log 2>&1
+		if [ ! -f ${f}/build/scripts/basic/fixdep ] || [ ! -f ${f}/build/scripts/mod/modpost ] ; then
+			echo -n "Prepare to build modules for kernel-${_kver}... "
+			yes "" | make -j$(nproc) -C ${f}/build prepare0 > ${f}/build/make.log 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 4131b479bef..75010d6bee7 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.117
+version=0.118
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"