From 4a804b69442fa6f67816818161a0474840c3a0d9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 24 Oct 2014 13:04:08 +0000 Subject: [PATCH] kernel: allow targets to specify KERNEL_PATCHVER instead of LINUX_VERSION Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43043 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 40 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 3afe9532b8..2511e2bb68 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,32 +2,28 @@ LINUX_RELEASE?=1 -ifeq ($(LINUX_VERSION),3.3.8) - LINUX_KERNEL_MD5SUM:=f1058f64eed085deb44f10cee8541d50 -endif -ifeq ($(LINUX_VERSION),3.8.13) - LINUX_KERNEL_MD5SUM:=2af19d06cd47ec459519159cdd10542d -endif -ifeq ($(LINUX_VERSION),3.10.49) - LINUX_KERNEL_MD5SUM:=9774e12764e740d49c80eda77d0ef3eb -endif -ifeq ($(LINUX_VERSION),3.13.7) - LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f -endif -ifeq ($(LINUX_VERSION),3.14.18) - LINUX_KERNEL_MD5SUM:=3b002a06d0964d8101abec768c2d4eef -endif +LINUX_VERSION-3.3 = .8 +LINUX_VERSION-3.8 = .13 +LINUX_VERSION-3.10 = .49 +LINUX_VERSION-3.13 = .7 +LINUX_VERSION-3.14 = .18 -# disable the md5sum check for unknown kernel versions -LINUX_KERNEL_MD5SUM?=x +LINUX_KERNEL_MD5SUM-3.3.8 = f1058f64eed085deb44f10cee8541d50 +LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d +LINUX_KERNEL_MD5SUM-3.10.49 = 9774e12764e740d49c80eda77d0ef3eb +LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f +LINUX_KERNEL_MD5SUM-3.14.18 = 3b002a06d0964d8101abec768c2d4eef + +ifdef KERNEL_PATCHVER + LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) +endif split_version=$(subst ., ,$(1)) merge_version=$(subst $(space),.,$(1)) KERNEL_BASE=$(firstword $(subst -, ,$(LINUX_VERSION))) KERNEL=$(call merge_version,$(wordlist 1,2,$(call split_version,$(KERNEL_BASE)))) -ifeq ($(firstword $(call split_version,$(KERNEL_BASE))),2) - KERNEL_PATCHVER=$(call merge_version,$(wordlist 1,3,$(call split_version,$(KERNEL_BASE)))) -else - KERNEL_PATCHVER=$(KERNEL) -endif +KERNEL_PATCHVER ?= $(KERNEL) +# disable the md5sum check for unknown kernel versions +LINUX_KERNEL_MD5SUM:=$(LINUX_KERNEL_MD5SUM-$(strip $(LINUX_VERSION))) +LINUX_KERNEL_MD5SUM?=x