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
This commit is contained in:
parent
369f4bd8be
commit
bfa25d48b7
|
@ -52,7 +52,7 @@ TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_
|
||||||
|
|
||||||
orig: $(DIR_ORIG)
|
orig: $(DIR_ORIG)
|
||||||
rsync --delete --exclude /debian --exclude .svk --exclude .svn --exclude .git --link-dest=$(DIR_ORIG)/ -a $(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):
|
$(DIR_ORIG):
|
||||||
ifeq ($(TAR_ORIG),)
|
ifeq ($(TAR_ORIG),)
|
||||||
|
|
|
@ -92,12 +92,12 @@ $(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.bz2: $(STAMPS_DIR)/source_no
|
||||||
(rm -f $@; exit 1)
|
(rm -f $@; exit 1)
|
||||||
|
|
||||||
define patch_cmd
|
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
|
endef
|
||||||
|
|
||||||
$(STAMPS_DIR)/source:
|
$(STAMPS_DIR)/source:
|
||||||
test -d .pc
|
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)
|
@$(stamp)
|
||||||
|
|
||||||
$(STAMPS_DIR)/source_%: SOURCE_DIR=$(BUILD_DIR)/source
|
$(STAMPS_DIR)/source_%: SOURCE_DIR=$(BUILD_DIR)/source
|
||||||
|
|
Loading…
Reference in New Issue