From 387b6b3470231772396c6eaf0c52ff03373b2e88 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 26 Apr 2024 17:00:07 +0200 Subject: [PATCH 68/68] include/target: allow placing generic patch folders into the platrom directory Signed-off-by: John Crispin --- include/target.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/target.mk b/include/target.mk index 3b3081a470..38578f60c4 100644 --- a/include/target.mk +++ b/include/target.mk @@ -165,10 +165,10 @@ GENERIC_PATCH_DIR := GENERIC_HACK_DIR := GENERIC_FILES_DIR := else -GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) -GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) -GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) -GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") +GENERIC_BACKPORT_DIR ?= $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) +GENERIC_PATCH_DIR ?= $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) +GENERIC_HACK_DIR ?= $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) +GENERIC_FILES_DIR ?= $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") endif __config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default __config_list = $(firstword $(wildcard $(call __config_name_list,$(1)))) @@ -177,7 +177,7 @@ find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_ ifeq ($(CONFIG_TARGET_ipq95xx),y) GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-5.4-qsdk else -GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR)) +GENERIC_LINUX_CONFIG ?= $(call find_kernel_config,$(GENERIC_PLATFORM_DIR))$(CONFIG_FILE_SUFFIX) endif LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR)) -- 2.34.1