mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-23 15:12:50 +00:00
allow packages to override the patch directory using the PATCH_DIR variable
SVN-Revision: 7750
This commit is contained in:
parent
7e79cae090
commit
68d6dcf7c4
@ -8,6 +8,7 @@
|
|||||||
ifeq ($(KERNEL_BUILD),1)
|
ifeq ($(KERNEL_BUILD),1)
|
||||||
PKG_BUILD_DIR:=$(LINUX_DIR)
|
PKG_BUILD_DIR:=$(LINUX_DIR)
|
||||||
endif
|
endif
|
||||||
|
PATCH_DIR?=./patches
|
||||||
|
|
||||||
define Quilt/Patch
|
define Quilt/Patch
|
||||||
@for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
|
@for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
|
||||||
@ -28,7 +29,7 @@ ifneq ($(QUILT),)
|
|||||||
define Build/Patch/Default
|
define Build/Patch/Default
|
||||||
rm -rf $(PKG_BUILD_DIR)/patches
|
rm -rf $(PKG_BUILD_DIR)/patches
|
||||||
mkdir -p $(PKG_BUILD_DIR)/patches
|
mkdir -p $(PKG_BUILD_DIR)/patches
|
||||||
$(call Quilt/Patch,./patches,)
|
$(call Quilt/Patch,$(PATCH_DIR),)
|
||||||
@echo
|
@echo
|
||||||
touch $(PKG_BUILD_DIR)/.quilt_used
|
touch $(PKG_BUILD_DIR)/.quilt_used
|
||||||
endef
|
endef
|
||||||
@ -37,8 +38,8 @@ ifneq ($(QUILT),)
|
|||||||
quilt-check: $(STAMP_PATCHED)
|
quilt-check: $(STAMP_PATCHED)
|
||||||
else
|
else
|
||||||
define Build/Patch/Default
|
define Build/Patch/Default
|
||||||
@if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
|
@if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
|
||||||
$(PATCH) $(PKG_BUILD_DIR) ./patches; \
|
$(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
|
||||||
fi
|
fi
|
||||||
endef
|
endef
|
||||||
endif
|
endif
|
||||||
@ -75,7 +76,7 @@ define Quilt/RefreshDir
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define Quilt/Refresh/Package
|
define Quilt/Refresh/Package
|
||||||
$(call Quilt/RefreshDir,./patches)
|
$(call Quilt/RefreshDir,$(PATCH_DIR))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Quilt/Refresh/Kernel
|
define Quilt/Refresh/Kernel
|
||||||
|
Loading…
Reference in New Issue
Block a user