summaryrefslogtreecommitdiffstats
path: root/rules/util-linux-ng.make
diff options
context:
space:
mode:
authorAlexander Dahl <ada@thorsis.com>2018-03-22 09:18:37 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-03-24 17:27:07 +0100
commit6197521ab9c2baede7fed9f73dcd896c9c0404e0 (patch)
treeff91213bd1fdb3c562a5d3fe723702673c7c396e /rules/util-linux-ng.make
parentbebbe23f027cb9c9419e77ed7d4b8d55cbeace96 (diff)
downloadptxdist-6197521ab9c2baede7fed9f73dcd896c9c0404e0.tar.gz
ptxdist-6197521ab9c2baede7fed9f73dcd896c9c0404e0.tar.xz
util-linux-ng: Change regex to allow rc tarballs
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> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/util-linux-ng.make')
-rw-r--r--rules/util-linux-ng.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 6efbc9841..ed0f85c02 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)