From efe694ed366e77a281c6e4745bc7e14ff686af3b Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Wed, 18 May 2022 09:27:07 +0530 Subject: [PATCH] dkms: update to 3.0.6 files/kernel.d/dkms.prerm has been updated to match the kernel_prerm.d_dkms file distributed with dkms 3.0.6 Also, note that these dkms.conf directives have been deprecated since dkms 2.8.8 - MODULES_CONF - MODULES_CONF_ALIAS_TYPE - MODULES_CONF_OBSOLETES - MODULES_CONF_OBSOLETE_ONLY - REMAKE_INITRD Also, note that the output of `dkms status` was changed in version 2.8.6 old - zfs, 2.1.4, 5.15.39_1, x86_64: installed new - zfs/2.1.4, 5.15.39_1, x86_64: installed --- srcpkgs/dkms/files/kernel.d/dkms.prerm | 22 ++++++++++------------ srcpkgs/dkms/template | 15 +++++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/srcpkgs/dkms/files/kernel.d/dkms.prerm b/srcpkgs/dkms/files/kernel.d/dkms.prerm index 155e9734aee..1c4e52a073a 100644 --- a/srcpkgs/dkms/files/kernel.d/dkms.prerm +++ b/srcpkgs/dkms/files/kernel.d/dkms.prerm @@ -1,21 +1,19 @@ -#!/bin/bash +#!/bin/sh -# We're passed the version of the kernel being installed +# We're passed the version of the kernel being removed PKGNAME="$1" VERSION="$2" if [ -x /usr/bin/dkms ]; then -while read line; do - name=`echo "$line" | awk '{print $1}' | sed 's/,$//'` - vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'` - arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'` - echo "dkms: removing: $name $vers (${PKGNAME}-${VERSION}) ($arch)" >&2 - /usr/bin/dkms remove -q -m $name -v $vers -k ${VERSION} -a $arch -done < <(/usr/bin/dkms status -k ${VERSION} 2>/dev/null | grep ": installed") + /usr/bin/dkms status -k "$VERSION" 2>/dev/null | while IFS=" ,:/" read -r name vers _ arch status; do + [ "$status" = installed ] || continue + echo "dkms: removing: $name $vers ($PKGNAME-$VERSION) ($arch)" >&2 + /usr/bin/dkms remove -q -m "$name" -v "$vers" -k "$VERSION" -a "$arch" + done fi -rmdir \ - "/lib/modules/${VERSION}/updates/dkms" \ - "/lib/modules/${VERSION}/updates" 2>/dev/null +rmdir 2>/dev/null \ + "/lib/modules/$VERSION/updates/dkms" \ + "/lib/modules/$VERSION/updates" exit 0 diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index 32b0211981f..ac1ccecffa5 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,15 +1,15 @@ # Template file for 'dkms' pkgname=dkms -version=2.8.4 -revision=2 +version=3.0.6 +revision=1 conf_files="/etc/dkms/framework.conf" depends="bash kmod gcc make coreutils" -short_desc="Dynamic Kernel Modules System" +short_desc="Dynamic Kernel Module Support" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/dell/dkms" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=540912bf0d845ac333f6971a3ccb80911c770a042af1b30ffbb9b420ac979af3 +distfiles="https://github.com/dell/dkms/archive/v${version}.tar.gz" +checksum=1e1ae273d2a72e3a89b829f3c72f482fb903f12cf766c054d11612e1d70795b4 case "$XBPS_TARGET_MACHINE" in # Too many competing kernels for arm* to depend on linux-headers @@ -21,11 +21,14 @@ if [ "$CROSS_BUILD" ]; then depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex" fi +do_build() { + make dkms dkms.8 +} + do_install() { # We are only interested in the bare minimum. vbin dkms vman dkms.8 - vinstall dkms_dbversion 644 var/lib/dkms vcompletion dkms.bash-completion bash dkms vinstall dkms_framework.conf 644 etc/dkms framework.conf # Kernel hooks.