[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.2-2-1-gb41a5f1

[Michael Gilbert]

The following commit has been merged in the master branch:
commit b41a5f1c5c5785deb50cca3ec757a4ce4a13f2cf
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sun May 16 20:39:33 2010 -0400

    improved kernel postinst messages

diff --git a/debian/changelog b/debian/changelog
index 6201d9a..73d3149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dkms (2.1.1.2-3) UNRELEASED; urgency=low
+
+  [ Michael Gilbert ]
+  * Add missing depends on python (needed by dkms.py).
+  * Update to source format 3 (quilt) for better patch management/handling.
+  * Improve the status info displayed during the kernel postinst, and
+    provide informative/useful messages when things go awry.
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 16 May 2010 18:59:38 -0400
+
 dkms (2.1.1.2-2) unstable; urgency=low
 
   * [67fb76a] Do not remove /etc/header_postinst.d/dkms in preinst. Hopefully
diff --git a/debian/control b/debian/control
index 78fa130..3212de6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,9 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/dkms.git
 
 Package: dkms
 Architecture: all
-Depends: ${misc:Depends}, module-init-tools,
+Depends: ${misc:Depends},
+ module-init-tools,
+ python,
  gcc,
  make | build-essential | dpkg-dev
 Recommends: patch,
diff --git a/debian/patches/improved-error-messages.patch b/debian/patches/improved-error-messages.patch
new file mode 100644
index 0000000..60ec539
--- /dev/null
+++ b/debian/patches/improved-error-messages.patch
@@ -0,0 +1,58 @@
+Description: Improve kernel postinst status information.
+Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+--- dkms-2.1.1.2.orig/kernel_postinst.d_dkms
++++ dkms-2.1.1.2/kernel_postinst.d_dkms
+@@ -4,5 +4,10 @@
+ inst_kern=$1
+ 
+ if [ -x /usr/lib/dkms/dkms_autoinstaller ]; then
+-    exec /usr/lib/dkms/dkms_autoinstaller start $inst_kern > /dev/null
++    /usr/lib/dkms/dkms_autoinstaller start $inst_kern >&2
++fi
++
++if [ ! -e /lib/modules/$inst_kern/build/include ] ; then
++    echo "dkms: WARNING: linux headers are missing, which may explain the above failures." >&2
++    echo "      please install the linux-headers-$inst_kern package to fix this." >&2
+ fi
+--- dkms-2.1.1.2.orig/kernel_prerm.d_dkms
++++ dkms-2.1.1.2/kernel_prerm.d_dkms
+@@ -8,7 +8,7 @@ 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 "Uninstalling: $name $vers ($inst_kern) ($arch)"
++   echo "dkms: uninstalling: $name $vers ($inst_kern) ($arch)" >&2
+    dkms uninstall -m $name -v $vers -k $inst_kern -a $arch
+ done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
+ fi
+--- dkms-2.1.1.2.orig/dkms_autoinstaller
++++ dkms-2.1.1.2/dkms_autoinstaller
+@@ -58,7 +58,8 @@ dkms_tree="/var/lib/dkms"
+ # See how we were called.
+ case "$1" in
+   start)
+-    log_daemon_msg "Running DKMS auto installation service for kernel $kernel"
++    log_daemon_msg "dkms: running auto installation service for kernel $kernel"
++    echo ""
+ 
+     if [ -z "$kernel" ]; then
+         if [ -L /vmlinuz -a -e /vmlinuz ]; then
+@@ -96,7 +97,7 @@ case "$1" in
+             [ "$current_state" = "installed" -o "$current_state" = "installed-weak" ] && already_installed="true" && already_installed_version=$version_in_tree
+         done
+ 
+-        log_action_begin_msg " $module_in_tree ($version_in_tree)"
++        log_action_begin_msg "      $module_in_tree ($version_in_tree)"
+ 
+         # Based on what we know, either do it or not
+         if [ "$current_state" = "broken" ]; then
+@@ -147,9 +148,6 @@ case "$1" in
+             fi
+         fi
+     done
+-    if [ -z "$modules_needing_status" ]; then
+-        log_end_msg 0
+-    fi
+     ;;
+   stop|restart|force-reload|status|reload)
+     # ignore
diff --git a/debian/patches/series b/debian/patches/series
index 1b4d7c4..9191ed9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 # This is empty for now
+improved-error-messages.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Dynamic Kernel Module Support