[kernel] r18281 - dists/sid/linux-latest-2.6/debian

[Ben Hutchings]

Author: benh
Date: Mon Nov 14 06:52:22 2011
New Revision: 18281

Log:
Remove dependency on module makefiles in linux-support package

Copy the rules and definitions that were removed in linux-2.6 3.1.1-1.
Fix or remove references to __MODULES_DIR.

Modified:
   dists/sid/linux-latest-2.6/debian/changelog
   dists/sid/linux-latest-2.6/debian/rules
   dists/sid/linux-latest-2.6/debian/rules.defs

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	Mon Nov 14 06:24:11 2011	(r18280)
+++ dists/sid/linux-latest-2.6/debian/changelog	Mon Nov 14 06:52:22 2011	(r18281)
@@ -1,3 +1,9 @@
+linux-latest-2.6 (41) UNRELEASED; urgency=low
+
+  * Remove dependency on module makefiles in linux-support package
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 14 Nov 2011 06:28:47 +0000
+
 linux-latest-2.6 (40) unstable; urgency=low
 
   * Add debconf template translations:

Modified: dists/sid/linux-latest-2.6/debian/rules
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules	Mon Nov 14 06:24:11 2011	(r18280)
+++ dists/sid/linux-latest-2.6/debian/rules	Mon Nov 14 06:52:22 2011	(r18281)
@@ -2,7 +2,63 @@
 SHELL := sh -e
 
 include debian/rules.defs
-include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
+
+DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+__BINNMU := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*\+b([0-9]+)$$,\1,p')
+
+BUILD_STAMP = $(STAMPS_DIR)/build-base
+
+build: debian/control $(BUILD_STAMP)
+$(BUILD_STAMP): $(BUILD_DIR) $(STAMPS_DIR)
+	dh_testdir
+	$(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
+	touch $@
+
+$(BUILD_DIR) $(STAMPS_DIR):
+	@[ -d $@ ] || mkdir $@
+
+clean: debian/control
+	dh_testdir
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
+	dh_clean
+
+binary-indep:
+	dh_testdir
+	$(MAKE) -f debian/rules.gen binary-indep
+
+binary-arch:
+	dh_testdir
+	$(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
+
+binary:	binary-indep binary-arch
+
+CONTROL_FILES += debian/changelog $(wildcard debian/templates/control.*) 
+CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
+debian/control debian/rules.gen: $(CONTROL_FILES)
+ifeq ($(wildcard debian/control.md5sum),)
+	$(MAKE) -f debian/rules debian/control-real
+else ifeq ($(__BINNMU),)
+	md5sum --check debian/control.md5sum --status || \
+		$(MAKE) -f debian/rules debian/control-real
+else
+	grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \
+		$(MAKE) -f debian/rules debian/control-real
+endif
+
+debian/control-real: $(CONTROL_FILES)
+	$(GENCONTROL) /usr/src/linux-support-$(KERNELVERSION)
+	md5sum $^ > debian/control.md5sum
+	@echo
+	@echo This target is made to fail intentionally, to make sure
+	@echo that it is NEVER run during the automated build. Please
+	@echo ignore the following error, the debian/control file has
+	@echo been generated SUCCESSFULLY.
+	@echo
+	exit 1
+
+.PHONY: clean build binary-indep binary-arch binary
 
 GENCONTROL = debian/bin/gencontrol.py
 

Modified: dists/sid/linux-latest-2.6/debian/rules.defs
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.defs	Mon Nov 14 06:24:11 2011	(r18280)
+++ dists/sid/linux-latest-2.6/debian/rules.defs	Mon Nov 14 06:52:22 2011	(r18281)
@@ -1 +1,4 @@
+BUILD_DIR = debian/build
+STAMPS_DIR = debian/stamps
+TEMPLATES_DIR = debian/templates
 KERNELVERSION := 3.0.0-2