summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-28 07:14:22 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-28 07:14:22 +0000
commitea3f18544520a8eee8c1282f9b77ac1e88e328ae (patch)
tree65e81542c6873d56dc65e41dd81254e232aa0f3e
parentaa9a8be2aaa7ff7310695495c016eae219ebf5e4 (diff)
allow packages to override the patch directory using the PATCH_DIR variable
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7750 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/quilt.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/quilt.mk b/include/quilt.mk
index 47195293e..c1f7bacd3 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -8,6 +8,7 @@
ifeq ($(KERNEL_BUILD),1)
PKG_BUILD_DIR:=$(LINUX_DIR)
endif
+PATCH_DIR?=./patches
define Quilt/Patch
@for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
@@ -28,7 +29,7 @@ ifneq ($(QUILT),)
define Build/Patch/Default
rm -rf $(PKG_BUILD_DIR)/patches
mkdir -p $(PKG_BUILD_DIR)/patches
- $(call Quilt/Patch,./patches,)
+ $(call Quilt/Patch,$(PATCH_DIR),)
@echo
touch $(PKG_BUILD_DIR)/.quilt_used
endef
@@ -37,8 +38,8 @@ ifneq ($(QUILT),)
quilt-check: $(STAMP_PATCHED)
else
define Build/Patch/Default
- @if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
- $(PATCH) $(PKG_BUILD_DIR) ./patches; \
+ @if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
+ $(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
fi
endef
endif
@@ -75,7 +76,7 @@ define Quilt/RefreshDir
endef
define Quilt/Refresh/Package
- $(call Quilt/RefreshDir,./patches)
+ $(call Quilt/RefreshDir,$(PATCH_DIR))
endef
define Quilt/Refresh/Kernel