From 49b2a2e5b360ead6fda81ded60f67c01d779ba68 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sat, 12 Sep 2020 15:16:49 +0200 Subject: [PATCH] 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 2208af9e74..fcd64efd03 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 4131b479be..75010d6bee 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"