summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-04-28 22:01:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-04-28 22:01:14 +0000
commit2448cb8a1587da880c525f9bd7e8c029bb56f81f (patch)
tree7503cac1d598858ea363c10317735a914074ec25
parent19cb0b369307d45b9fc49ca1e6ad3762e95109d8 (diff)
downloadmtk-20170518-2448cb8a1587da880c525f9bd7e8c029bb56f81f.zip
mtk-20170518-2448cb8a1587da880c525f9bd7e8c029bb56f81f.tar.gz
mtk-20170518-2448cb8a1587da880c525f9bd7e8c029bb56f81f.tar.bz2
add optional version suffix to kernel files/ directories
SVN-Revision: 10972
-rw-r--r--include/kernel.mk1
-rw-r--r--include/quilt.mk7
-rw-r--r--include/target.mk1
3 files changed, 6 insertions, 3 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index b413d84..52355dc 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -31,6 +31,7 @@ else
endif
PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+ FILES_DIR ?= ./files$(shell [ -d "./files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git a/include/quilt.mk b/include/quilt.mk
index 95f81e7..c310fd9 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/)
diff --git a/include/target.mk b/include/target.mk
index ce842da..7010424 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -106,6 +106,7 @@ include $(INCLUDE_DIR)/kernel-version.mk
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+GENERIC_FILES_DIR := $(GENERIC_PLATFORM_DIR)/files$(shell [ -d "$(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
GENERIC_LINUX_CONFIG?=$(firstword $(wildcard $(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER) $(GENERIC_PLATFORM_DIR)/config-default))
LINUX_CONFIG?=$(firstword $(wildcard $(foreach subdir,$(PLATFORM_DIR) $(PLATFORM_SUBDIR),$(subdir)/config-$(KERNEL_PATCHVER) $(subdir)/config-default)))