[kernel] r19243 - dists/sid/linux/debian

[Ben Hutchings]

Author: benh
Date: Mon Jul  9 13:42:47 2012
New Revision: 19243

Log:
Explicitly set QUILT_PC when invoking quilt

Derived packages (e.g. for extra featuresets) may be maintained using
yet another patch series (touching the debian directory).  This will
require an additional status directory, specified by setting QUILT_PC.
Override this when we invoke quilt to apply the main and featureset
patch series.  (Thanks to Yves-Alexis Perez.)

Modified:
   dists/sid/linux/debian/rules
   dists/sid/linux/debian/rules.real

Modified: dists/sid/linux/debian/rules
==============================================================================
--- dists/sid/linux/debian/rules	Mon Jul  9 13:28:07 2012	(r19242)
+++ dists/sid/linux/debian/rules	Mon Jul  9 13:42:47 2012	(r19243)
@@ -52,7 +52,7 @@
 
 orig: $(DIR_ORIG)
 	rsync --delete --exclude /debian --exclude .svk --exclude .svn --exclude .git --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
-	QUILT_PATCHES='$(CURDIR)/debian/patches' quilt push --quiltrc - -a -q --fuzz=0
+	QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
 
 $(DIR_ORIG):
 ifeq ($(TAR_ORIG),)

Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real	Mon Jul  9 13:28:07 2012	(r19242)
+++ dists/sid/linux/debian/rules.real	Mon Jul  9 13:42:47 2012	(r19243)
@@ -92,12 +92,12 @@
 	(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
+cd '$(DIR)' && QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_SERIES=series-$(1) QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
 endef
 
 $(STAMPS_DIR)/source:
 	test -d .pc
-	set +e; quilt unapplied --quiltrc - >/dev/null && echo 'Patch series not fully applied'; test $$? -eq 1
+	set +e; QUILT_PC=.pc quilt unapplied --quiltrc - >/dev/null && echo 'Patch series not fully applied'; test $$? -eq 1
 	@$(stamp)
 
 $(STAMPS_DIR)/source_%: SOURCE_DIR=$(BUILD_DIR)/source