Date: Sunday, March 6, 2016 @ 14:22:06
Author: seblu
Revision: 261109
upgpkg: dkms 2.2.0.3+git151023-6
- fix FS#48355
Modified:
dkms/trunk/PKGBUILD
dkms/trunk/hook.sh
----------+
PKGBUILD | 4 ++--
hook.sh | 14 ++++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-03-06 13:16:59 UTC (rev 261108)
+++ PKGBUILD 2016-03-06 13:22:06 UTC (rev 261109)
@@ -4,7 +4,7 @@
pkgname=dkms
pkgver=2.2.0.3+git151023
-pkgrel=5
+pkgrel=6
pkgdesc='Dynamic Kernel Modules System'
arch=('any')
url='http://linux.dell.com/dkms/'
@@ -24,7 +24,7 @@
'82d520c39c99c34977e48b313a189c6c'
'8fe2064106958bcfd386e83494c8959a'
'41fcecb1c2dfc59a4b648fddcd8b462f'
- '7fdc44f8ecdd0ac0dc5e6bcf02901681')
+ '22f9fc3633b13e548e78bcc48192d817')
prepare() {
cd dkms
Modified: hook.sh
===================================================================
--- hook.sh 2016-03-06 13:16:59 UTC (rev 261108)
+++ hook.sh 2016-03-06 13:22:06 UTC (rev 261109)
@@ -32,7 +32,6 @@
# dkms path from framework config
# note: the alpm hooks which trigger this script use static path
source_tree='/usr/src'
-dkms_tree='/var/lib/dkms'
install_tree='/usr/lib/modules'
source /etc/dkms/framework.conf
@@ -48,13 +47,16 @@
done
popd >/dev/null
elif [[ "/$path" =~ ^$install_tree/([^/]+)/ ]]; then
- # do $@ once for each registered dkms module
- pushd "$dkms_tree" >/dev/null
- for mod in */*/source; do
- dkms "$@" -m "${mod%/source}" -k "${BASH_REMATCH[1]}"
+ kver="${BASH_REMATCH[1]}"
+ # do $@ once for each dkms module in $source_tree
+ for path in "$source_tree"/*-*/dkms.conf; do
+ if [[ "$path" =~
^$source_tree/([^/]+)-([^/]+)/dkms\.conf$ ]]; then
+ dkms "$@" -m "${BASH_REMATCH[1]}" -v
"${BASH_REMATCH[2]}" -k "$kver"
+ fi
done
- popd >/dev/null
else
echo "Skipping invalid path: $path" >&2
fi
done
+
+true
