[openwrt/openwrt] kernel: move kernel version files to linux/generic directory

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/8865dadea7b94e7859b416d3b1931b897ea43c48

commit 8865dadea7b94e7859b416d3b1931b897ea43c48
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Sat Apr 19 14:54:23 2025 +0200

    kernel: move kernel version files to linux/generic directory
    
    To further improve cleanup and maintenance usage, move the kernel
    version files to target/linux/generic directory. This permits to self
    contain any change to the specific generic directory instead of having
    to bload the include directory of periodic changes.
    
    In kernel-version.mk we now use GENERIC_PLATFORM_DIR provided by
    target.mk. To make this work, we need to move the inclusion of
    kernel-version.mk in target.mk right after GENERIC_PLATFORM_DIR is
    defined.
    
    This also comes to permit downstream project to provide a custom generic
    directory and specify the kernel version complete of the hash and the
    minor version without having to affect other feeds.
    
    In such case both generic and the target directory are provided as feeds
    and OpenWrt reference these specific one instead of the generic one.
    
    For downstream it's still suggested and preferable to all match the
    shipped generic kernel minor version but this change permits to at least
    enforce good practice instead of having to bloat OpenWrt include file of
    all kind of downstream changes (making porting to OpenWrt mainline even
    more difficult)
    
    Link: https://github.com/openwrt/openwrt/pull/18537
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 include/kernel-version.mk                    | 4 ++--
 include/target.mk                            | 8 ++++----
 {include => target/linux/generic}/kernel-6.6 | 0
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 958ed9be0c..5e2bff4542 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,7 +6,7 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-KERNEL_DETAILS_FILE=$(INCLUDE_DIR)/kernel-$(KERNEL_PATCHVER)
+KERNEL_DETAILS_FILE=$(GENERIC_PLATFORM_DIR)/kernel-$(KERNEL_PATCHVER)
 ifeq ($(wildcard $(KERNEL_DETAILS_FILE)),)
   $(error Missing kernel version/hash file for $(KERNEL_PATCHVER). Please create $(KERNEL_DETAILS_FILE))
 endif
@@ -14,7 +14,7 @@ endif
 include $(KERNEL_DETAILS_FILE)
 
 ifdef KERNEL_TESTING_PATCHVER
-  KERNEL_TESTING_DETAILS_FILE=$(INCLUDE_DIR)/kernel-$(KERNEL_TESTING_PATCHVER)
+  KERNEL_TESTING_DETAILS_FILE=$(GENERIC_PLATFORM_DIR)/kernel-$(KERNEL_TESTING_PATCHVER)
   ifeq ($(wildcard $(KERNEL_TESTING_DETAILS_FILE)),)
     $(error Missing kernel version/hash file for $(KERNEL_TESTING_PATCHVER). Please create $(KERNEL_TESTING_DETAILS_FILE))
   endif
diff --git a/include/target.mk b/include/target.mk
index da7ef5e8a2..f0c8dad15e 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -155,16 +155,16 @@ ifeq ($(TARGET_BUILD),1)
   endif
 endif
 
-ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
-  include $(INCLUDE_DIR)/kernel-version.mk
-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
+
 __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)))
diff --git a/include/kernel-6.6 b/target/linux/generic/kernel-6.6
similarity index 100%
rename from include/kernel-6.6
rename to target/linux/generic/kernel-6.6