From bfa25d48b7033c02828079c3713736ceac9f3f30 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 9 Jul 2012 13:42:47 +0000 Subject: [PATCH] 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.) svn path=/dists/sid/linux/; revision=19243 --- debian/rules | 2 +- debian/rules.real | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 435d2e1f8..cb885511d 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,7 @@ TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ 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),) diff --git a/debian/rules.real b/debian/rules.real index dabb62ae7..8445e5c67 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -92,12 +92,12 @@ $(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.bz2: $(STAMPS_DIR)/source_no (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