Date: Saturday, January 14, 2017 @ 15:38:49 Author: seblu Revision: 286365
upgpkg: dkms 2.3-2 - fix FS#51882 - remove patch, use KCONF vars instead - cleanup unused variable definition Modified: dkms/trunk/PKGBUILD dkms/trunk/hook.sh Deleted: dkms/trunk/02-no-kernel-hook.patch -------------------------+ 02-no-kernel-hook.patch | 13 ------------- PKGBUILD | 8 ++++---- hook.sh | 6 +++--- 3 files changed, 7 insertions(+), 20 deletions(-) Deleted: 02-no-kernel-hook.patch =================================================================== --- 02-no-kernel-hook.patch 2017-01-14 15:25:41 UTC (rev 286364) +++ 02-no-kernel-hook.patch 2017-01-14 15:38:49 UTC (rev 286365) @@ -1,13 +0,0 @@ -# Author: Sébastien Luttringer <[email protected]> ---- a/Makefile 2011-12-07 19:23:51.000000000 +0100 -+++ b/Makefile 2013-05-13 00:48:19.620000000 +0200 -@@ -46,9 +46,6 @@ - gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz - chmod 0644 $(MAN)/dkms.8.gz - touch --reference=dkms.8 $(MAN)/dkms.8.gz -- mkdir -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d -- install -p -m 0755 kernel_prerm.d_dkms $(KCONF)/prerm.d/dkms -- install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms - - DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-14 15:25:41 UTC (rev 286364) +++ PKGBUILD 2017-01-14 15:38:49 UTC (rev 286365) @@ -4,7 +4,7 @@ pkgname=dkms pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc='Dynamic Kernel Modules System' arch=('any') url='https://github.com/dell/dkms' @@ -18,15 +18,13 @@ backup=('etc/dkms/framework.conf') install=$pkgname.install source=("git+https://github.com/dell/dkms.git#tag=$pkgver"; - '02-no-kernel-hook.patch' 'hook.install' 'hook.remove' 'hook.sh') md5sums=('SKIP' - '82d520c39c99c34977e48b313a189c6c' '2dfc9905738199bf1fdbaa08d306e265' '4d959fdd4f168b5a6921712404066566' - 'c3971151a2945e5491b786579810cd15') + 'f1ea074ef22d1afe855a1eb63233566b') prepare() { cd dkms @@ -54,10 +52,12 @@ install -D -m 755 hook.sh "$pkgdir/usr/lib/dkms/alpm-hook" # upstream installer cd dkms + # we don't need kconf files, so we install them outside $pkgdir make \ DESTDIR="$pkgdir" \ SBIN="$pkgdir/usr/bin" \ BASHDIR="$pkgdir/usr/share/bash-completion/completions" \ + KCONF="$srcdir"/kconf \ install } Modified: hook.sh =================================================================== --- hook.sh 2017-01-14 15:25:41 UTC (rev 286364) +++ hook.sh 2017-01-14 15:38:49 UTC (rev 286365) @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright © 2016 Sébastien Luttringer +# Copyright © 2017 Sébastien Luttringer # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -73,11 +73,11 @@ # run registered dkms commands dkms_run() { - local modname modver kver args nvk + local nvk mod kver for nvk in "${!DKMS_ACTION[@]}"; do mod=${nvk%/*} kver=${nvk##*/} - check_kernel "$kver" || return + check_kernel "$kver" || continue run dkms "${DKMS_ACTION[$nvk]}" "$mod" -k "$kver" done }
