aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-10-26 13:26:59 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-10-26 13:26:59 +0000
commit94387043b9d9b0289531415001211840f494af07 (patch)
tree57c5b983629410decb6d47caa3bf3b77fdfa5bc1
parent6be5dfbcddc339b9405e67a8b80329617232c58d (diff)
downloadupstream-94387043b9d9b0289531415001211840f494af07.tar.gz
upstream-94387043b9d9b0289531415001211840f494af07.tar.bz2
upstream-94387043b9d9b0289531415001211840f494af07.zip
kernel: allow targets to specify KERNEL_PATCHVER instead of LINUX_VERSION
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r43043 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@43066 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel-version.mk20
1 files 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