[kernel] r18871 - in dists/trunk/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Tue Mar 20 16:14:10 2012
New Revision: 18871

Log:
Remove all use of module-init-tools at build time

I already changed the 'real' module installation step to avoid
creating and then removing an unknown set of module index files, using
a script as a replacement for depmod.  However, we use modules_install
a second time when building debug packages.  Change that similarly, and
remove the build-dependency.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.source.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Mar 20 16:08:41 2012	(r18870)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Mar 20 16:14:10 2012	(r18871)
@@ -6,6 +6,7 @@
   * [x86] crypto: Enable CRYPTO_SERPENT_SSE2_586, CRYPTO_SERPENT_SSE2_X86_64
   * aufs: Update to aufs3.x-rcN-20120312
   * IB: Enable INFINIBAND_SRPT as module (Closes: #663041)
+  * Remove all use of module-init-tools at build time
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 09 Mar 2012 05:27:29 +0000
 

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Tue Mar 20 16:08:41 2012	(r18870)
+++ dists/trunk/linux-2.6/debian/rules.real	Tue Mar 20 16:14:10 2012	(r18871)
@@ -455,7 +455,8 @@
 	  > $(PACKAGE_DIR)/usr/share/lintian/overrides/$(PACKAGE_NAME)
 	install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION)
 ifeq ($(MODULES),True)
-	+$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
+	chmod a+x $(CURDIR)/debian/bin/no-depmod
+	+$(MAKE_CLEAN) -C $(DIR) modules_install DEPMOD='$(CURDIR)/debian/bin/no-depmod' INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
 	find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+
 	rm $(DEBUG_DIR)/lib/firmware -rf
 endif

Modified: dists/trunk/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in	Tue Mar 20 16:08:41 2012	(r18870)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in	Tue Mar 20 16:14:10 2012	(r18871)
@@ -3,7 +3,7 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83)
+Build-Depends: debhelper (>> 7), cpio, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83)
 Build-Depends-Indep: bzip2, xmlto
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-2.6/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-2.6/