Author: rmilecki
Date: 2014-10-26 14:26:59 +0100 (Sun, 26 Oct 2014)
New Revision: 43066

Modified:
   branches/barrier_breaker/include/kernel-version.mk
Log:
kernel: allow targets to specify KERNEL_PATCHVER instead of LINUX_VERSION

Signed-off-by: Felix Fietkau <[email protected]>
Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]>

Backport of r43043


Modified: branches/barrier_breaker/include/kernel-version.mk
===================================================================
--- branches/barrier_breaker/include/kernel-version.mk  2014-10-26 11:27:15 UTC 
(rev 43065)
+++ branches/barrier_breaker/include/kernel-version.mk  2014-10-26 13:26:59 UTC 
(rev 43066)
@@ -2,20 +2,20 @@
 
 LINUX_RELEASE?=1
 
-ifeq ($(LINUX_VERSION),3.10.49)
-  LINUX_KERNEL_MD5SUM:=9774e12764e740d49c80eda77d0ef3eb
+LINUX_VERSION-3.10 = .49
+
+LINUX_KERNEL_MD5SUM-3.10.49 = 9774e12764e740d49c80eda77d0ef3eb
+
+ifdef KERNEL_PATCHVER
+  LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
 endif
 
-# disable the md5sum check for unknown kernel versions
-LINUX_KERNEL_MD5SUM?=x
-
 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
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to