From: Michael Tretter <m.tretter@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: [ptxdist] [PATCH] kernel: fix download url for release candidates
Date: Wed, 9 Jan 2019 13:02:31 +0100 [thread overview]
Message-ID: <20190109120231.1397-1-m.tretter@pengutronix.de> (raw)
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
reply other threads:[~2019-01-09 12:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190109120231.1397-1-m.tretter@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox