[openwrt/openwrt] kernel: Fix patch folders setting for test kernel

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 23 01:29:26 PDT 2025


nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/2c8fb6fa9ff67bdc4cc4ce3c38f372d23ba4377f

commit 2c8fb6fa9ff67bdc4cc4ce3c38f372d23ba4377f
Author: Mieczyslaw Nalewaj <namiltd at yahoo.com>
AuthorDate: Tue Apr 22 22:59:58 2025 +0200

    kernel: Fix patch folders setting for test kernel
    
    Move kernel-version.mk include to proper place to properly set patch folders for test kernel.
    
    Fixes: 8865dadea7b94e7859b416d3b1931b897ea43c48
    
    Signed-off-by: Mieczyslaw Nalewaj <namiltd at yahoo.com>
---
 include/target.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/target.mk b/include/target.mk
index f0c8dad15e..6eae23d5f6 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -156,15 +156,16 @@ ifeq ($(TARGET_BUILD),1)
 endif
 
 GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
-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)")
 
 ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
   include $(INCLUDE_DIR)/kernel-version.mk
 endif
 
+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)")
+
 __config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
 __config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
 find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))




More information about the lede-commits mailing list