From 2448cb8a1587da880c525f9bd7e8c029bb56f81f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 28 Apr 2008 22:01:14 +0000 Subject: add optional version suffix to kernel files/ directories SVN-Revision: 10972 --- include/quilt.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/quilt.mk') diff --git a/include/quilt.mk b/include/quilt.mk index 95f81e7094..c310fd99ac 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -12,6 +12,7 @@ ifeq ($(TARGET_BUILD),1) PKG_BUILD_DIR:=$(LINUX_DIR) endif PATCH_DIR?=./patches +FILES_DIR?=./files ifeq ($(MAKECMDGOALS),refresh) override QUILT=1 @@ -67,9 +68,9 @@ endef define Kernel/Patch/Default $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches) - if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi - if [ -d ./files ]; then \ - $(CP) ./files/* $(LINUX_DIR)/; \ + if [ -d $(GENERIC_FILES_DIR) ]; then $(CP) $(GENERIC_FILES_DIR)/* $(LINUX_DIR)/; fi + if [ -d $(FILES_DIR) ]; then \ + $(CP) $(FILES_DIR)/* $(LINUX_DIR)/; \ find $(LINUX_DIR)/ -name \*.rej | xargs rm -f; \ fi $(call PatchDir,$(GENERIC_PATCH_DIR),generic/) -- cgit v1.2.3