From 2a8eff2496c9936c5c8132e4d0e3d3791afd9ba0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 30 Sep 2023 21:45:14 -0400 Subject: [PATCH] xbps-triggers: update to 0.126. adds the ability to limit the number of makejobs to the dkms trigger --- srcpkgs/xbps-triggers/files/dkms | 9 ++++++--- srcpkgs/xbps-triggers/template | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms index ae87f3bff83..4c5aeb4d6a2 100755 --- a/srcpkgs/xbps-triggers/files/dkms +++ b/srcpkgs/xbps-triggers/files/dkms @@ -52,6 +52,9 @@ remove_modules() { add_modules() { local rval= + [ -r /etc/default/dkms ] && . /etc/default/dkms + : "${DKMS_JOBS:=$(nproc)}" + # Add/build and install the specified modules for all kernels. set -- ${dkms_modules} while [ $# -gt 0 ]; do @@ -77,7 +80,7 @@ add_modules() { fi 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 + yes "" | make -j "$DKMS_JOBS" -C ${f}/build prepare0 > ${f}/build/make.log 2>&1 if [ $? -eq 0 ]; then echo "done." else @@ -89,7 +92,7 @@ add_modules() { set -- ${dkms_modules} while [ $# -gt 0 ]; do echo -n "Building DKMS module '$1-$2' for kernel-${_kver}... " - $DKMS build -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1 + $DKMS build -j "${DKMS_JOBS}" -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo "done." else @@ -99,7 +102,7 @@ add_modules() { shift 2; continue fi echo -n "Installing DKMS module '$1-$2' for kernel-${_kver}... " - $DKMS install --force -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1 + $DKMS install --force -j "${DKMS_JOBS}" -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo "done." else diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 89cc9398c8c..76c3a6b27fa 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.125 +version=0.126 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux"