The following commit has been merged in the master branch:
commit 0d14f3e030af54596fb6635944b63be031741d69
Author: Giuseppe Iuculano <[email protected]>
Date: Fri Apr 17 23:20:07 2009 +0200
Update dkms to check for /etc/modprobe.d/dkms.conf, dh_installmodules now
give files in /etc/modprobe.d a .conf syntax, as required by new
module-init-tools.
diff --git a/debian/patches/14_new_module-init-tools.patch
b/debian/patches/14_new_module-init-tools.patch
new file mode 100644
index 0000000..faa6b11
--- /dev/null
+++ b/debian/patches/14_new_module-init-tools.patch
@@ -0,0 +1,19 @@
+Update dkms to check for /etc/modprobe.d/dkms.conf, dh_installmodules now give
files in /etc/modprobe.d a .conf syntax, as required by new module-init-tools.
+--- a/dkms
++++ b/dkms
+@@ -735,6 +735,7 @@ function moduleconfig_add ()
+
+ local temp_dir_name=`mktemp -d $tmp_location/dkms.XXXXXX`
+ modconfig_files=""
++ [ -e /etc/modprobe.d/dkms.conf ] &&
modconfig_files="/etc/modprobe.d/dkms.conf"
+ [ -e /etc/modprobe.d/dkms ] && modconfig_files="/etc/modprobe.d/dkms"
+ [ -e /etc/modules.conf ] && modconfig_files="$modconfig_files
/etc/modules.conf"
+ [ -e /etc/modprobe.conf ] && modconfig_files="$modconfig_files
/etc/modprobe.conf"
+@@ -804,6 +805,7 @@ function moduleconfig_remove ()
+
+ local temp_dir_name=`mktemp -d $tmp_location/dkms.XXXXXX`
+ modconfig_files=""
++ [ -e /etc/modprobe.d/dkms.conf ] &&
modconfig_files="/etc/modprobe.d/dkms.conf"
+ [ -e /etc/modprobe.d/dkms ] && modconfig_files="/etc/modprobe.d/dkms"
+ [ -e /etc/modules.conf ] && modconfig_files="$modconfig_files
/etc/modules.conf"
+ [ -e /etc/modprobe.conf ] && modconfig_files="$modconfig_files
/etc/modprobe.conf"
diff --git a/debian/patches/series b/debian/patches/series
index 093fbf7..d9762cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
11-bash-completion.patch
12-use_invoke-rc.d.patch
13-template.patch
+14_new_module-init-tools.patch
--
Maintainance of the dkms package
_______________________________________________
Pkg-dkms-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-dkms-commits
