DKMS v2.0.17.5

[Matt Domsch]

I've posted DKMS v2.0.17.5.  I've pushed this to Fedora 8, Fedora 7
(-testing repo shortly), and have a request into Ubuntu for Gutsy
(2.0.17.4 is in Gutsy right now),
https://bugs.launchpad.net/bugs/151664.


Downloads: http://linux.dell.com/dkms/permalink/
Git repo: http://linux.dell.com/git/dkms.git/

commit 3079856a6bacbdd85c21b212631fabb531be78c3
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Wed Oct 10 16:51:39 2007 -0500

    v2.0.17.5

commit 02468d40c1764dd3806b68d15e30d485c2c6e9ef
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Wed Oct 10 16:41:36 2007 -0500

    Run depmod after uninstall

commit 820fa2937f4f77042f61ac25bea06beb14adcd0b
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Wed Oct 10 15:55:49 2007 -0500

    uninstall from /extra before DEST_MODULE_LOCATION
    
    https://bugzilla.redhat.com/show_bug.cgi?id=264981
    
    It only fails when uninstalling something for which there's already
    one elsewhere in the tree - e.g. in both kernel/fs/fuse and extras/.
    Turns out, this function here was returning the lookup in the wrong
    order, so it would delete the one in kernel/fs/fuse rather than
    deleting the one in extras/ like it should.  It needs to delete from
    extras/ first.

commit feced0867b17bfe7a358b9cadf4f78d992558c40
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Wed Oct 10 15:18:37 2007 -0500

    call udevtrigger if we install a module for the currently running kernel



diff --git a/Makefile b/Makefile
index c0ae43b..13fad76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE_DATE := "19-Sep-2007"
+RELEASE_DATE := "10-Oct-2007"
 RELEASE_MAJOR := 2
 RELEASE_MINOR := 0
 RELEASE_SUBLEVEL := 17
-RELEASE_EXTRALEVEL := .4
+RELEASE_EXTRALEVEL := .5
 RELEASE_NAME := dkms
 RELEASE_VERSION := $(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL)
 RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_VERSION)
diff --git a/dkms b/dkms
index 13dbc54..c9b07c7 100755
--- a/dkms
+++ b/dkms
@@ -1247,6 +1247,11 @@ function install_module()
 	fi
     fi
 
+    # Notify udev if we installed something for the currently running kernel
+    if [ -x /sbin/udevtrigger -a "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$(uname -m)" ]; then
+	/sbin/udevtrigger
+    fi
+
     echo $""
     echo $"DKMS: install Completed."
 }
@@ -1451,9 +1456,9 @@ function possible_dest_module_locations()
     # override_dest_module_location() is what controls whether or not they're the same.
 
     local location
-    location[0]="${DEST_MODULE_LOCATION[$count]}"
-    [ "${location[0]}" != "${dest_module_location[$count]}" ] && \
-	location[1]="${dest_module_location[$count]}"
+    location[0]="${dest_module_location[$count]}"
+    [ "${DEST_MODULE_LOCATION[$count]}" != "${dest_module_location[$count]}" ] && \
+	location[1]="${DEST_MODULE_LOCATION[$count]}"
 
     echo "${location[0]} ${location[1]}"
 }
@@ -1581,6 +1586,9 @@ function do_uninstall()
     # But only do this if it was just ACTIVE on the kernel we just uninstalled from
     [ -n "$was_active" ] && [ -n "$remake_initrd" ] && $0 status -m $module -v $module_version | grep -q "installed" && moduleconfig_add "$1"
 
+    # Run depmod because we changed /lib/modules
+    invoke_command "depmod -a ${kernelver_array[0]}" "depmod" background
+
     echo $""
     echo $"DKMS: uninstall Completed."
 }
diff --git a/dkms_autoinstaller b/dkms_autoinstaller
index e06c7c1..b204e72 100755
--- a/dkms_autoinstaller
+++ b/dkms_autoinstaller
@@ -148,3 +148,5 @@ case "$1" in
   *)
 	echo $"Usage: $0 {start|stop}"
 esac
+
+exit 0
diff --git a/pkg/debian/changelog b/pkg/debian/changelog
index cbb7f20..4b18c28 100644
--- a/pkg/debian/changelog
+++ b/pkg/debian/changelog
@@ -1,3 +1,11 @@
+dkms (2.0.17.5-0ubuntu1) gutsy; urgency=low
+	
+  * call udevtrigger if we install a module for the currently running kernel
+  * uninstall from /extra before DEST_MODULE_LOCATION
+  * Run depmod after uninstall
+
+ -- Matt Domsch <Matt_Domsch at dell.com>  Mon, 10 Oct 2007 16:50:00 -0500
+
 dkms (2.0.17.4-0ubuntu1) gutsy; urgency=low
 
   * initial debian packaging for Ubuntu (LP: #121676)

-- 
Matt Domsch
Linux Technology Strategist, Dell Office of the CTO
linux.dell.com & www.dell.com/linux