From 676bbb5a738c61465b085c434834e79bb4adbadc Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 4 Apr 2007 13:28:37 +0000 Subject: [PATCH] linux-rpm.mk: Add support for .diff extension of patch files --- make/linux-rpm.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 3e6a727b..f967efe0 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -121,7 +121,8 @@ clean-patch-%: patches/%-$(KERNEL_VERSION).patch: unpack.done export LANG=en_US ;\ - diff --exclude=CVS --unidirectional-new-file -aur linux-$(KERNEL_VERSION) linux-$(KERNEL_VERSION)-$* | \ + diff --exclude=CVS --unidirectional-new-file -aur \ + linux-$(KERNEL_VERSION) linux-$(KERNEL_VERSION)-$* | \ grep -vie "^Nur in \|Only in " > $@.part; exit 0 mv $@.part $@ @@ -132,7 +133,16 @@ patches.done: unpack.done $(addsuffix .done,$(notdir $(PATCHES))) patch -d linux-$(KERNEL_VERSION) -p1 < $< touch $@ +%.diff.done: %.diff + patch -d linux-$(KERNEL_VERSION) -p1 < $< + touch $@ + %.patch: + make $(filter %/$@,$(PATCHES)) + cp $(filter %/$@,$(PATCHES)) $@ + +%.diff: + make $(filter %/$@,$(PATCHES)) cp $(filter %/$@,$(PATCHES)) $@ unpack: unpack.done