diff --git a/debian/changelog b/debian/changelog index 0ebc0a1c7..cdd886f06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 09 Mar 2012 05:27:29 +0000 diff --git a/debian/rules.real b/debian/rules.real index a7f56c372..e5ceff1e3 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -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 diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index f6524ab19..394df7db7 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Frederik Schüler , maximilian attems , Ben Hutchings 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/