From d495d2cbe63bbb627dd7f5eeb121fff3357834b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 26 Oct 2014 13:26:59 +0000 Subject: [PATCH] kernel: allow targets to specify KERNEL_PATCHVER instead of LINUX_VERSION MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Fietkau Signed-off-by: Rafał Miłecki Backport of r43043 SVN-Revision: 43066 --- include/kernel-version.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b49033e8cc..514e095339 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,20 +2,20 @@ LINUX_RELEASE?=1 -ifeq ($(LINUX_VERSION),3.10.49) - LINUX_KERNEL_MD5SUM:=9774e12764e740d49c80eda77d0ef3eb -endif +LINUX_VERSION-3.10 = .49 -# disable the md5sum check for unknown kernel versions -LINUX_KERNEL_MD5SUM?=x +LINUX_KERNEL_MD5SUM-3.10.49 = 9774e12764e740d49c80eda77d0ef3eb + +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 -- 2.30.2