[kernel] r19114 - in dists/sid/linux/debian: . lib/python/debian_linux templates

[Ben Hutchings]

Author: benh
Date: Sun Jun 10 02:14:51 2012
New Revision: 19114

Log:
linux-source: Add single patch for each featureset

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py
   dists/sid/linux/debian/rules.real
   dists/sid/linux/debian/templates/control.source.in

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Jun 10 00:33:40 2012	(r19113)
+++ dists/sid/linux/debian/changelog	Sun Jun 10 02:14:51 2012	(r19114)
@@ -27,6 +27,7 @@
   * NFSv4: Reduce the footprint of the idmapper (Closes: #657078)
   * [i386] thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE
     (Closes: #676360)
+  * linux-source: Add single patch for each featureset
 
   [ Bastian Blank ]
   * [s390/s390x,s390x/s390x] Build debugging symbols.

Modified: dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py	Sun Jun 10 00:33:40 2012	(r19113)
+++ dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py	Sun Jun 10 02:14:51 2012	(r19114)
@@ -114,6 +114,8 @@
         pass
 
     def do_main_makefile(self, makefile, makeflags, extra):
+        makeflags = makeflags.copy()
+        makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets'])
         makefile.add('binary-indep', cmds=["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
 
     def do_main_packages(self, packages, vars, makeflags, extra):

Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real	Sun Jun 10 00:33:40 2012	(r19113)
+++ dists/sid/linux/debian/rules.real	Sun Jun 10 02:14:51 2012	(r19114)
@@ -73,6 +73,16 @@
 	cd '$(BUILD_DIR)'; tar -cjf 'linux-source-$(UPSTREAMVERSION).tar.bz2' 'linux-source-$(UPSTREAMVERSION)'
 	rm -rf '$(DIR)'
 
+$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.bz2: $(STAMPS_DIR)/source_none $(STAMPS_DIR)/source_%
+	set -o pipefail;						\
+	(cd '$(BUILD_DIR)';						\
+	 set +e;							\
+         diff -urN -p -x debian -x .pc -x .svk -x .svn source_none source_$*; \
+	 test $$? -eq 1) |						\
+	filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \
+	bzip2 -c >$@ ||							\
+	(rm -f $@; exit 1)
+
 define patch_cmd
 cd '$(DIR)' && QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_SERIES=series-$(1) quilt push --quiltrc - -a -q --fuzz=0
 endef
@@ -82,17 +92,20 @@
 	set +e; quilt unapplied --quiltrc - >/dev/null && echo 'Patch series not fully applied'; test $$? -eq 1
 	@$(stamp)
 
-$(STAMPS_DIR)/source_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
-$(STAMPS_DIR)/source_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(FEATURESET)
-$(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source
+$(STAMPS_DIR)/source_%: SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source_%: DIR=$(BUILD_DIR)/source_$*
+$(STAMPS_DIR)/source_%: $(STAMPS_DIR)/source
 	mkdir -p '$(BUILD_DIR)'
 	rm -rf '$(DIR)'
-ifeq ($(FEATURESET),none)
-	ln -s '$(CURDIR)' '$(DIR)'
-else
 	$(call copy_source,$(DIR))
-	$(call patch_cmd,$(FEATURESET))
-endif
+	$(call patch_cmd,$*)
+	@$(stamp)
+.PRECIOUS: $(STAMPS_DIR)/source_%
+
+$(STAMPS_DIR)/source_none: DIR=$(BUILD_DIR)/source_none
+$(STAMPS_DIR)/source_none: $(STAMPS_DIR)/source
+	rm -f '$(DIR)'
+	ln -s '$(CURDIR)' '$(DIR)'
 	@$(stamp)
 
 $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
@@ -474,10 +487,10 @@
 	dh_builddeb
 
 install-source: DH_OPTIONS = -plinux-source-$(VERSION)
-install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2
+install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 $(foreach FEATURESET,$(filter-out none,$(ALL_FEATURESETS)),$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-$(FEATURESET).patch.bz2)
 	dh_testdir
 	dh_testroot
-	dh_install '$<' /usr/src
+	dh_install '$^' /usr/src
 	+$(MAKE_SELF) install-base
 
 # vim: filetype=make

Modified: dists/sid/linux/debian/templates/control.source.in
==============================================================================
--- dists/sid/linux/debian/templates/control.source.in	Sun Jun 10 00:33:40 2012	(r19113)
+++ dists/sid/linux/debian/templates/control.source.in	Sun Jun 10 02:14:51 2012	(r19114)
@@ -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, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.84), quilt
+Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.84), quilt, patchutils
 Build-Depends-Indep: bzip2, xmlto
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/