From 0c700127da16e15be6d0428281509bc17eeff1d4 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sat, 19 Apr 2025 14:54:23 +0200 Subject: [PATCH] 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) (cherry picked from commit 8865dadea7b94e7859b416d3b1931b897ea43c48) [ rebased on top of openwrt-23.04 ] Signed-off-by: Christian Marangi --- include/kernel-version.mk | 4 ++-- {include => target/linux/generic}/kernel-5.15 | 0 {include => target/linux/generic}/kernel-5.4 | 0 {include => target/linux/generic}/kernel-6.1 | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {include => target/linux/generic}/kernel-5.15 (100%) rename {include => target/linux/generic}/kernel-5.4 (100%) rename {include => target/linux/generic}/kernel-6.1 (100%) 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/kernel-5.15 b/target/linux/generic/kernel-5.15 similarity index 100% rename from include/kernel-5.15 rename to target/linux/generic/kernel-5.15 diff --git a/include/kernel-5.4 b/target/linux/generic/kernel-5.4 similarity index 100% rename from include/kernel-5.4 rename to target/linux/generic/kernel-5.4 diff --git a/include/kernel-6.1 b/target/linux/generic/kernel-6.1 similarity index 100% rename from include/kernel-6.1 rename to target/linux/generic/kernel-6.1