From 4f5d6835763cc4f6cbe67a42cbb3fa010e96bb32 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Thu, 13 Jan 2022 14:42:57 +1100 Subject: [PATCH 1/5] dkms: update to 3.0.3. Main differences from 2.8.4: - The following variables have been deprecated[1]: REMAKE_INITRD, MODULES_CONF, MODULES_CONF_OBSOLETES, MODULES_CONF_ALIAS_TYPE, MODULES_CONF_OBSOLETE_ONLY - Print 'module/version' and not 'module, version' when doing `dkms status`[2][3]. Comparing the output of dkms-2.8.4 with dkms-3.0.3: $ dkms --version && dkms status dkms-2.8.4 v4l2loopback, 0.12.5, 5.15.16_1, x86_64: installed $ dkms --version && dkms status dkms-3.0.3 v4l2loopback/0.12.5, 5.15.16_1, x86_64: installed [1] https://github.com/dell/dkms/commit/961f9ce [2] https://github.com/dell/dkms/commit/f83b758 [3] https://github.com/dell/dkms/commit/65f01a0 --- srcpkgs/dkms/files/kernel.d/dkms.prerm | 6 +++--- srcpkgs/dkms/patches/fix-test.patch | 11 ++++++++++ srcpkgs/dkms/template | 29 ++++++++++++++++++-------- 3 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/dkms/patches/fix-test.patch diff --git a/srcpkgs/dkms/files/kernel.d/dkms.prerm b/srcpkgs/dkms/files/kernel.d/dkms.prerm index 155e9734aee2..2fa327b57934 100644 --- a/srcpkgs/dkms/files/kernel.d/dkms.prerm +++ b/srcpkgs/dkms/files/kernel.d/dkms.prerm @@ -6,9 +6,9 @@ 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/:$//'` + name=`echo "$line" | awk '{print $1}' | sed 's/,$//' | cut -d'/' -f1` + vers=`echo "$line" | awk '{print $1}' | sed 's/,$//' | cut -d'/' -f2` + arch=`echo "$line" | awk '{print $3}' | 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") diff --git a/srcpkgs/dkms/patches/fix-test.patch b/srcpkgs/dkms/patches/fix-test.patch new file mode 100644 index 000000000000..c5783492ac84 --- /dev/null +++ b/srcpkgs/dkms/patches/fix-test.patch @@ -0,0 +1,11 @@ +--- a/run_test.sh ++++ b/run_test.sh +@@ -98,4 +98,8 @@ + alpine) + expected_dest_loc=kernel/extra + ;; ++ void) ++ expected_dest_loc=kernel/extra ++ mod_compression_ext=.gz ++ ;; + *) diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index 32b0211981f8..fbb393a45529 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,15 +1,17 @@ # Template file for 'dkms' pkgname=dkms -version=2.8.4 -revision=2 +version=3.0.3 +revision=1 conf_files="/etc/dkms/framework.conf" depends="bash kmod gcc make coreutils" +checkdepends="linux-headers runit-void" short_desc="Dynamic Kernel Modules System" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/dell/dkms" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=540912bf0d845ac333f6971a3ccb80911c770a042af1b30ffbb9b420ac979af3 +checksum=89e57cf90298f020646a5fa61d11983406631486b9f5591bb9da9465ee969f3d +make_check=ci-skip case "$XBPS_TARGET_MACHINE" in # Too many competing kernels for arm* to depend on linux-headers @@ -21,13 +23,22 @@ if [ "$CROSS_BUILD" ]; then depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex" fi +do_build() { + make dkms +} + +do_check() { + if [ $(id -u) = 0 ]; then + ./run_test.sh + fi +} + 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 + # We are only interested in the bare minimum. + make DESTDIR=${DESTDIR} SBIN=${DESTDIR}/usr/bin install + rm ${DESTDIR}/etc/dkms/sign_helper.sh + rm -r ${DESTDIR}/etc/kernel + rm -r ${DESTDIR}/usr/lib # Kernel hooks. 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 From 894af6db63876614aba68958d4c9e005951a2e48 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Thu, 13 Jan 2022 16:39:18 +1100 Subject: [PATCH 2/5] xbps-triggers: update for dkms-3.0.3 --- srcpkgs/xbps-triggers/files/dkms | 4 ++-- srcpkgs/xbps-triggers/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms index fcd64efd0301..961aa641bad2 100755 --- a/srcpkgs/xbps-triggers/files/dkms +++ b/srcpkgs/xbps-triggers/files/dkms @@ -30,8 +30,8 @@ remove_modules() { if $(echo "$line" | egrep -vq '(added|built|installed)'); then shift 2; continue fi - _modver=$(echo "$line"|sed "s/$1,[[:blank:]]\([^,]*\)[,:].*/\1/;t;d") - _kver=$(echo "$line"|awk '{print $3}'|sed "s/\(.*\),$/\1/") + _modver=$(echo "$line"|sed "s/[^/]*\/\([^\,]*\).*/\1/") + _kver=$(echo "$line"|awk '{print $2}'|sed "s/\(.*\),$/\1/") echo -n "Removing DKMS module '${1}-${_modver}' for kernel-${_kver}... " $DKMS remove -m "$1" -v "${_modver}" -k "${_kver}" >/dev/null 2>&1 if [ $? -eq 0 ]; then diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index b1e4f34a4dde..f0249f6f9964 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.122 +version=0.123 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux" From 47b2c3ef6b2e69c618c11695264224a22a1f37a1 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Thu, 13 Jan 2022 14:45:35 +1100 Subject: [PATCH 3/5] broadcom-wl-dkms: update for dkms-3.0.3 --- srcpkgs/broadcom-wl-dkms/files/dkms.conf | 1 - srcpkgs/broadcom-wl-dkms/template | 15 +++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/broadcom-wl-dkms/files/dkms.conf b/srcpkgs/broadcom-wl-dkms/files/dkms.conf index a6219f4c89b8..96acd0dc2092 100644 --- a/srcpkgs/broadcom-wl-dkms/files/dkms.conf +++ b/srcpkgs/broadcom-wl-dkms/files/dkms.conf @@ -3,4 +3,3 @@ PACKAGE_VERSION="@VERSION@" BUILT_MODULE_NAME[0]="wl" DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless" AUTOINSTALL="yes" -REMAKE_INITRD="yes" diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index 55bc9c0e1d36..c3166743b0f7 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -1,19 +1,18 @@ # Template file for 'broadcom-wl-dkms' - pkgname=broadcom-wl-dkms version=6.30.223.271 -revision=11 +revision=12 +archs="i686* x86_64*" +create_wrksrc=yes +depends="dkms" +short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module" maintainer="Orphaned " license="custom:Proprietary Broadcom license" homepage="http://broadcom.com" - -archs="i686* x86_64*" repository="nonfree" -create_wrksrc=yes - -short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module" +# dkms must be before initramfs-regenerate to build modules before images +triggers="dkms initramfs-regenerate" dkms_modules="wl ${version}" -depends="dkms" case "$XBPS_TARGET_MACHINE" in i686*) From 7417d7eed4d650cdad9d21eb44b72fe3748dbafe Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Thu, 13 Jan 2022 14:48:57 +1100 Subject: [PATCH 4/5] rtl8822bu-dkms: update for dkms-3.0.3 --- srcpkgs/rtl8822bu-dkms/files/dkms.conf | 1 - srcpkgs/rtl8822bu-dkms/template | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/rtl8822bu-dkms/files/dkms.conf b/srcpkgs/rtl8822bu-dkms/files/dkms.conf index 3156be8132bc..243a32dbebca 100644 --- a/srcpkgs/rtl8822bu-dkms/files/dkms.conf +++ b/srcpkgs/rtl8822bu-dkms/files/dkms.conf @@ -8,4 +8,3 @@ KSRC=/lib/modules/${kernelver}/build" CLEAN="make clean" DEST_MODULE_LOCATION="/kernel/drivers/net/wireless" AUTOINSTALL="yes" -REMAKE_INITRD=no diff --git a/srcpkgs/rtl8822bu-dkms/template b/srcpkgs/rtl8822bu-dkms/template index 548d0b6299cd..61b92f58464d 100644 --- a/srcpkgs/rtl8822bu-dkms/template +++ b/srcpkgs/rtl8822bu-dkms/template @@ -1,7 +1,7 @@ # Template file for 'rtl8822bu-dkms' pkgname=rtl8822bu-dkms version=20201222 -revision=1 +revision=2 _gitrev=fcfd4ecca1512d4cd2db4aa91679576d2a5ab8eb wrksrc="rtl8822bu-${_gitrev}" depends="dkms" From eeb3c97db8620bc6b473d2ce13600af6cd6513a6 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Thu, 13 Jan 2022 17:03:01 +1100 Subject: [PATCH 5/5] v4l2loopback: update for dkms-3.0.3 --- .../patches/dkms-remove-option.patch | 23 +++++++++++++++++++ srcpkgs/v4l2loopback/template | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/v4l2loopback/patches/dkms-remove-option.patch diff --git a/srcpkgs/v4l2loopback/patches/dkms-remove-option.patch b/srcpkgs/v4l2loopback/patches/dkms-remove-option.patch new file mode 100644 index 000000000000..9c267ae30ecc --- /dev/null +++ b/srcpkgs/v4l2loopback/patches/dkms-remove-option.patch @@ -0,0 +1,23 @@ +From edf0f10bc079e5e3922bddbb8185dc626ab14a1b Mon Sep 17 00:00:00 2001 +From: Emil Velikov +Date: Sun, 10 Oct 2021 12:28:16 +0100 +Subject: [PATCH] dkms.conf: remove REMAKE_INITRD option + +The default state of the option is no - so let's just remove it. +This aligns with my plan of deprecating the option in upstream dkms. + +Signed-off-by: Emil Velikov +--- + dkms.conf | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/dkms.conf b/dkms.conf +index 4e916fc..b1a0069 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -8,5 +8,4 @@ CLEAN="make clean" + BUILT_MODULE_NAME[0]="$PACKAGE_NAME" + DEST_MODULE_LOCATION[0]="/extra" + +-REMAKE_INITRD="no" + AUTOINSTALL="yes" diff --git a/srcpkgs/v4l2loopback/template b/srcpkgs/v4l2loopback/template index 69cf47b863b0..488abce25d6c 100644 --- a/srcpkgs/v4l2loopback/template +++ b/srcpkgs/v4l2loopback/template @@ -1,7 +1,7 @@ # Template file for 'v4l2loopback' pkgname=v4l2loopback version=0.12.5 -revision=1 +revision=2 hostmakedepends="help2man" depends="dkms" short_desc="Kernel module to create V4L2 loopback devices"