[openwrt/openwrt] kernel: split kernel version to dedicated files

LEDE Commits lede-commits at lists.infradead.org
Sun Dec 4 08:28:28 PST 2022


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/cbce6c6d9519ab86e11c9752910a4c72dd52cb58

commit cbce6c6d9519ab86e11c9752910a4c72dd52cb58
Author: Ansuel Smith <ansuelsmth at gmail.com>
AuthorDate: Mon Jan 10 17:02:30 2022 +0100

    kernel: split kernel version to dedicated files
    
    Move the kernel versions and hash to dedicated files.
    This makes kernel bump quicker and fix some annoying
    problem with rebasing when multiple kernel bump are proposed.
    
    Signed-off-by: Ansuel Smith <ansuelsmth at gmail.com>
    [Rebased on top of current master]
    Signed-off-by: Rui Salvaterra <rsalvaterra at gmail.com>
    (cherry picked from commit 0765466a42f46f7357e260866a4284ed567bb7ad)
    Signed-off-by: Josef Schlehofer <pepe.schlehofer at gmail.com>
    [Rebased on top of current openwrt-21.02]
---
 include/kernel-5.4        | 2 ++
 include/kernel-version.mk | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/kernel-5.4 b/include/kernel-5.4
new file mode 100644
index 0000000000..cd7de7b8fc
--- /dev/null
+++ b/include/kernel-5.4
@@ -0,0 +1,2 @@
+LINUX_VERSION-5.4 = .225
+LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 7480663923..1edb01df27 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,12 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .225
+KERNEL_DETAILS_FILE=$(INCLUDE_DIR)/kernel-$(KERNEL_PATCHVER)
+ifeq ($(wildcard $(KERNEL_DETAILS_FILE)),)
+  $(error Missing kernel version/hash file for $(KERNEL_PATCHVER). Please create $(KERNEL_DETAILS_FILE))
+endif
 
-LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa
+include $(KERNEL_DETAILS_FILE)
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))




More information about the lede-commits mailing list