On Thu, Dec 15, 2016 at 02:52:21PM +0100, Clemens Gruber wrote:
> Using sed instead of basename allows us to keep the _URL line as is, for
> both the two- and three-part version numbers and not switch between
> using and not using the basename command every release.
>
> Signed-off-by: Clemens Gruber <[email protected]>
> ---
> .../0001-__progname-redefinition-fix.patch | 0
> patches/{util-linux-2.28.2 => util-linux-2.29}/series | 0
> rules/util-linux-ng.make | 11
> +++++++----
> 3 files changed, 7 insertions(+), 4 deletions(-)
> rename patches/{util-linux-2.28.2 =>
> util-linux-2.29}/0001-__progname-redefinition-fix.patch (100%)
> rename patches/{util-linux-2.28.2 => util-linux-2.29}/series (100%)
>
> diff --git a/patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch
> b/patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
> similarity index 100%
> rename from patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch
> rename to patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
> diff --git a/patches/util-linux-2.28.2/series b/patches/util-linux-2.29/series
> similarity index 100%
> rename from patches/util-linux-2.28.2/series
> rename to patches/util-linux-2.29/series
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index e1c86c2..44cc04e 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -17,11 +17,12 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
> #
> # Paths and names
> #
> -UTIL_LINUX_NG_VERSION := 2.28.2
> -UTIL_LINUX_NG_MD5 := 46a232a37bce45371a86d19300edc47a
> +UTIL_LINUX_NG_VERSION := 2.29
> +UTIL_LINUX_NG_MD5 := 07b6845f48a421ad5844aa9d58edb837
> UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
> UTIL_LINUX_NG_SUFFIX := tar.xz
> -UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL,
> utils/util-linux/v$(basename
> $(UTIL_LINUX_NG_VERSION))/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
> +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)
> UTIL_LINUX_NG_LICENSE := GPL-2.0, GPL-2.0+, GPL-3.0+, LGPL-2.0+,
> BSD-3-Clause, BSD-4-Clause, public_domain
> @@ -59,10 +60,10 @@ UTIL_LINUX_NG_CONF_OPT := \
> --disable-static-programs \
> --enable-all-programs=undefined \
> --enable-tls \
> + --disable-widechar \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
> - --enable-libmount-force-mountinfo \
--disable-libmount-support-mtab
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)-libsmartcols \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBFDISK)-libfdisk \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
> @@ -78,6 +79,7 @@ UTIL_LINUX_NG_CONF_OPT := \
> --disable-setpriv \
> --disable-eject \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
> + --disable-plymouth_support \
> --disable-cramfs \
> --disable-bfs \
> --disable-minix \
--disable-pg
> @@ -132,6 +134,7 @@ UTIL_LINUX_NG_CONF_OPT := \
> --without-audit \
> --without-udev \
> --$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
> + --without-ncursesw \
order!
Michael
> --without-slang \
> --without-tinfo \
> --without-readline \
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
[email protected]
