From d1cc98eeec0291a507b29cfa75eff412397d3208 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 18 May 2005 13:17:08 +0000 Subject: [PATCH] linux-rpm.mk: Move patch-% creation targets up because of clash with more general %.patch target --- make/linux-rpm.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 1521c922..12211c09 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -107,6 +107,19 @@ version: cvs commit -m "$(KERNEL_VERSION)" RELEASE-$(KERNEL_VERSION) exit 1 +patch-%: + make patches/$*-$(KERNEL_VERSION).patch + +clean-patch-%: + rm -f patches/$*-$(KERNEL_VERSION).patch + make patches/$*-$(KERNEL_VERSION).patch + +patches/%-$(KERNEL_VERSION).patch: unpack.done + export LANG=en_US ;\ + diff --exclude=CVS --unidirectional-new-file -aur linux-$(KERNEL_VERSION) linux-$(KERNEL_VERSION)-$* | \ + grep -vie "^Nur in \|Only in " > $@.part; exit 0 + mv $@.part $@ + patches.done: unpack.done $(addsuffix .done,$(notdir $(PATCHES))) touch $@ @@ -117,17 +130,6 @@ patches.done: unpack.done $(addsuffix .done,$(notdir $(PATCHES))) %.patch: cp $(filter %/$@,$(PATCHES)) $@ -patch-%: - make patches/$*-$(KERNEL_VERSION).patch - -clean-patch-%: - rm -f patches/$*-$(KERNEL_VERSION).patch - make patches/$*-$(KERNEL_VERSION).patch - -patches/%-$(KERNEL_VERSION).patch: unpack.done - diff -Naur linux-$(KERNEL_VERSION) linux-$(KERNEL_VERSION)-$* > $@.part; exit 0 - mv $@.part $@ - unpack: unpack.done patch: patches.done prepare: unpack patch EXTRAVERSION COMPLETE_VERSION