From: Michael Tremer Date: Sun, 7 Feb 2010 14:47:38 +0000 (+0100) Subject: naoki: Change handling of patches. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd461114de8791c7a36c9a2101971c3dd916f080;p=ipfire-3.x.git naoki: Change handling of patches. From now on, there will be a special directory where we put in our patches. All files with the *.patch extension will be applied to the sources. If you want to temporarily disable a patch you can easy rename it to something like "mypatch.patch.off". --- diff --git a/pkgs/Constants b/pkgs/Constants index 1f47d818f..473f12620 100644 --- a/pkgs/Constants +++ b/pkgs/Constants @@ -13,7 +13,7 @@ THISAPP = $(PKG_NAME)-$(PKG_VER) DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_DL = $(BASEDIR)/cache/tarballs -DIR_PATCHES = $(DIR_DL)/../patches +DIR_PATCHES = $(DIR_SOURCE)/patches DIR_SRC = $(ROOT)/usr/src DIR_TMP = /tmp DIR_SOURCE = $(CURDIR) @@ -23,10 +23,11 @@ DIR_LOGS = $(BASEDIR)/logs BUILD_HOST ?= $(shell cat /proc/sys/kernel/hostname) -VPATH = $(DIR_DL):$(DIR_PATCHES) +VPATH = $(DIR_DL) PKG_OBJECTS = $(PKG_TARBALL) -OBJECTS = $(PKG_OBJECTS) $(PKG_PATCHES) +PKG_PATCHES = $(foreach patch,$(wildcard $(DIR_SOURCE)/patches/*.patch),$(notdir $(patch))) +OBJECTS = $(PKG_OBJECTS) PKG_NAME_REAL = $(notdir $(CURDIR)) PKG_PACKAGES = $(PKG_NAME_REAL)