From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [RFC PATCH 2/3] util-linux-ng: Change regex to allow rc tarballs
Date: Thu, 22 Mar 2018 09:18:37 +0100 [thread overview]
Message-ID: <20180322081838.350-3-ada@thorsis.com> (raw)
In-Reply-To: <20180322081838.350-1-ada@thorsis.com>
The previous sed regex for creating the basename for an intermediate
folder in the download URL failed on rc tarballs. Now URLs like this
work, too:
https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-2.32-rc1.tar.gz
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/util-linux-ng.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 6efbc98416..ed0f85c02e 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -21,7 +21,7 @@ UTIL_LINUX_NG_VERSION := 2.31.1
UTIL_LINUX_NG_MD5 := 7733b583dcb51518944d42aa62ef19ea
UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
UTIL_LINUX_NG_SUFFIX := tar.xz
-UTIL_LINUX_NG_BASENAME := v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
+UTIL_LINUX_NG_BASENAME := v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[^0-9].*\?/\1/g')
UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_NG_BASENAME)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
UTIL_LINUX_NG_SOURCE := $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG)
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2018-03-22 8:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 8:18 [ptxdist] [RFC PATCH 0/3] util-linux-ng improvements Alexander Dahl
2018-03-22 8:18 ` [ptxdist] [RFC PATCH 1/3] util-linux-ng: Add lscpu to installable tools Alexander Dahl
2018-03-22 8:18 ` Alexander Dahl [this message]
2018-03-22 8:18 ` [ptxdist] [RFC PATCH 3/3] util-linux-ng: Upgrade from v2.31.1 to v2.32 Alexander Dahl
2018-03-23 9:02 ` Alexander Dahl
2018-03-26 6:36 ` Michael Olbrich
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=20180322081838.350-3-ada@thorsis.com \
--to=ada@thorsis.com \
--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