debian: Use dh_installmodules instead of calling "depmod" wrongly.

Until now, the postinst for kernel modules built by the Debian packaging
has simply run "depmod -a", which is wrong, since this command rebuilds
the dependencies for the *running* kernel, which is not necessarily the
kernel for which modules are being installed.

The dh_installmodules script automatically adds the correct invocation of
depmod to the postinst script, so this commit switches to using that
instead.

This commit moves the kernel modules from /lib/modules/$KVERS into the
"kernel" subdirectory of that directory because dh_installmodules does not
support modules that are directly in the $KVERS directory.

CC: Sajjad Lateef <slateef@nicira.com>

diff --git a/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in b/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in
index 0268300821411881ca8e1b35402eb1be37e0502b..2ed47533a3fdfd8820d3b03275d524cd729048a2 100755 (executable)
--- a/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in
+++ b/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in
@@ -5,8 +5,6 @@
 
 set -e
 
-depmod -a
-
 #DEBHELPER#
 
 # If the switch is running, restart it.  This ensures that we are using the

diff --git a/debian/rules.modules b/debian/rules.modules
index 4f39ceed7767eedecbad43d1c5935dc8f3e76db5..4ca3d928565033b5c203f65b1c79f23d9b73e1ba 100755 (executable)
--- a/debian/rules.modules
+++ b/debian/rules.modules
@@ -20,7 +20,7 @@ kdist_clean:
 kdist_config: prep-deb-files
 
 .PHONY: binary-modules
-binary-modules: DSTDIR = $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)
+binary-modules: DSTDIR = $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel
 binary-modules: prep-deb-files
        dh_testdir
        dh_testroot
@@ -30,6 +30,7 @@ binary-modules: prep-deb-files
        cd openvswitch && $(MAKE) -C datapath/linux-2.6
        install -d -m755 $(DSTDIR)
        install -m644 openvswitch/datapath/linux-2.6/*_mod.ko $(DSTDIR)/
+       dh_installmodules
        dh_installdocs
        dh_installchangelogs
        dh_compress