moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

dkms: allow limiting jobs, add missing dep

Browse source 
some less-powerful platforms may be overwhelmed by the default `-j$(nproc)`.
Allow overriding this by setting `DKMS_JOBS` in `/etc/default/dkms`

`bc` is needed for `make prepare0` on kernel 6.1+, which is run on cross.
This commit is contained in:
classabbyamp 2023-09-29 17:40:53 -04:00 • committed by classabbyamp
parent 2d90f29aca
commit 6cb5dcabf9
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/dkms/files/dkms.default Normal file
View file

@ -0,0 +1,2 @@
# number of parallel jobs to use for DKMS compilation (default: $(nproc))
#DKMS_JOBS=

9
srcpkgs/dkms/files/kernel.d/dkms.postinst
View file

@ -17,10 +17,13 @@ if [ ! -e /lib/modules/${VERSION}/build/include ] ; then
exit 0 exit 0
fi fi
[ -r /etc/default/dkms ] && . /etc/default/dkms
: "${DKMS_JOBS:=$(nproc)}"
export IGNORE_CC_MISMATCH=1 export IGNORE_CC_MISMATCH=1
if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] || [ ! -f /lib/modules/${VERSION}/build/scripts/mod/modpost ]; then 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 yes "" | make -j "${DKMS_JOBS}" -C /lib/modules/${VERSION}/build prepare0
fi fi
# Check available DKMS modules # Check available DKMS modules
@ -68,7 +71,7 @@ while [ $# -gt 1 ]; do
fi fi
# Build the module # Build the module
echo -n "Building DKMS module: ${module}-${modulever}... " echo -n "Building DKMS module: ${module}-${modulever}... "
/usr/bin/dkms build -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH} /usr/bin/dkms build -j "${DKMS_JOBS}" -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
rval=$? rval=$?
# If the module was skipped or failed, go to the next module. # If the module was skipped or failed, go to the next module.
if [ $rval -eq 0 ]; then if [ $rval -eq 0 ]; then
@ -87,7 +90,7 @@ while [ $# -gt 1 ]; do
if [ $(echo "$status"|grep -c ": built") -eq 1 ] && if [ $(echo "$status"|grep -c ": built") -eq 1 ] &&
[ $(echo "$status"|grep -c ": installed") -eq 0 ]; then [ $(echo "$status"|grep -c ": installed") -eq 0 ]; then
echo -n "Installing DKMS module: ${module}-${modulever}... " echo -n "Installing DKMS module: ${module}-${modulever}... "
/usr/bin/dkms install --force -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH} /usr/bin/dkms install --force -j "${DKMS_JOBS}" -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
rval=$? rval=$?
# If the module failed installation, go to the next module. # If the module failed installation, go to the next module.
if [ $rval -eq 0 ]; then if [ $rval -eq 0 ]; then

11
srcpkgs/dkms/template
View file

@ -1,9 +1,9 @@
# Template file for 'dkms' # Template file for 'dkms'
pkgname=dkms pkgname=dkms
version=3.0.10 version=3.0.10
revision=2 revision=3
conf_files="/etc/dkms/framework.conf" conf_files="/etc/dkms/framework.conf /etc/default/dkms"
depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1" depends="bash kmod gcc bc make coreutils xbps-triggers>=0.123_1"
short_desc="Dynamic Kernel Module Support" short_desc="Dynamic Kernel Module Support"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
@ -35,6 +35,7 @@ do_install() {
vcompletion dkms.bash-completion bash dkms vcompletion dkms.bash-completion bash dkms
vinstall dkms_framework.conf 644 etc/dkms framework.conf vinstall dkms_framework.conf 644 etc/dkms framework.conf
# Kernel hooks. # Kernel hooks.
vinstall ${FILESDIR}/kernel.d/dkms.postinst 754 etc/kernel.d/post-install 10-dkms vinstall "${FILESDIR}/kernel.d/dkms.postinst" 754 etc/kernel.d/post-install 10-dkms
vinstall ${FILESDIR}/kernel.d/dkms.prerm 754 etc/kernel.d/pre-remove 10-dkms vinstall "${FILESDIR}/kernel.d/dkms.prerm" 754 etc/kernel.d/pre-remove 10-dkms
vinstall "${FILESDIR}/dkms.default" 644 etc/default dkms
} }