[ptxdist] [PATCH] kernel: fix download url for release candidates

[ptxdist] [PATCH] kernel: fix download url for release candidates

[Michael Tretter]

The check, if the release candidate needs to be downloaded from the git
url, compares major and minor version numbers. It fails for Linux 5.0,
because the minor is smaller than the minor of 4.12.

Check for the minor version only if the major version is 4.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/pre/kernel.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make
index dc42a212c..f051718f8 100644
--- a/rules/pre/kernel.make
+++ b/rules/pre/kernel.make
@@ -38,10 +38,10 @@ endif
 # by cgit.
 #
 ifneq ($(findstring -rc,$(KERNEL_VERSION)),)
-KERNEL_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_VERSION_MAJOR) -ge 4 -a $(KERNEL_VERSION_MINOR) -ge 12 && echo y)
+KERNEL_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_VERSION_MAJOR) -ge 5 -o \( $(KERNEL_VERSION_MAJOR) -eq 4 -a $(KERNEL_VERSION_MINOR) -ge 12 \) && echo y)
 endif
 ifneq ($(findstring -rc,$(KERNEL_HEADER_VERSION)),)
-KERNEL_HEADER_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_HEADER_VERSION_MAJOR) -ge 4 -a $(KERNEL_HEADER_VERSION_MINOR) -ge 12 && echo y)
+KERNEL_HEADER_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_HEADER_VERSION_MAJOR) -ge 5 -o \( $(KERNEL_HEADER_VERSION_MAJOR) -eq 4 -a $(KERNEL_HEADER_VERSION_MINOR) -ge 12 \) && echo y)
 endif
 
 KERNEL_HEADERS_DIR	:= $(PTXDIST_SYSROOT_TARGET)/kernel-headers
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de