debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

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.

svn path=/dists/trunk/linux-2.6/; revision=18871
This commit is contained in:
Ben Hutchings 2012-03-20 16:14:10 +00:00
parent 296fb7c8c7
commit d42114a0ff
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -6,6 +6,7 @@ linux-2.6 (3.3-1~experimental.1) UNRELEASED; urgency=low
* [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@decadent.org.uk> Fri, 09 Mar 2012 05:27:29 +0000

3
debian/rules.real vendored
View File

@ -455,7 +455,8 @@ install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_
> $(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

2
debian/templates/control.source.in vendored
View File

@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@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/