On Thu, Feb 13, 2020 at 06:22:04PM +0100, Matthias Schiffer wrote:
> Fixes build against recent glibc.
>
> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com>
> Signed-off-by: Matthias Schiffer <matthias.schif...@ew.tq-group.com>
> ---
> rules/parted.in | 13 ++++++++-----
> rules/parted.make | 10 +++++-----
> 2 files changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/rules/parted.in b/rules/parted.in
> index 2e9f54a31..10371dd73 100644
> --- a/rules/parted.in
> +++ b/rules/parted.in
> @@ -1,18 +1,21 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=shell_and_console
> +## SECTION=shell_and_console
> config PARTED
> tristate
> prompt "parted"
> + select HOST_GETTEXT
> select GETTEXT
> select READLINE
> + select ICONV
I don't think, this is necessary. ICONV is provided by the libc these days
and this switch is only there for packages with optional iconv support.
> + select UTIL_LINUX_NG
> + select UTIL_LINUX_NG_LIBUUID
use
select LIBUUID
instead.
Michael
> select E2FSPROGS
> select NCURSES
> + depends on !BUSYBOX_PARTPROBE || ALLYES
> help
> The GNU Parted program allows you to create, destroy, resize, move,
> and copy hard disk partitions. Parted can be used for creating space
> for new operating systems, reorganizing disk usage, and copying data
> to new hard disks.
>
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that need to be updated. Fails to build with glibc-2.28.
> +comment "busybox' partprobe is selected!"
> + depends on BUSYBOX_PARTPROBE
> diff --git a/rules/parted.make b/rules/parted.make
> index 6b994f372..eca3f9eee 100644
> --- a/rules/parted.make
> +++ b/rules/parted.make
> @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
> #
> # Paths and names
> #
> -PARTED_VERSION := 2.3
> -PARTED_MD5 := 30ceb6df7e8681891e865e2fe5a7903d
> +PARTED_VERSION := 3.3
> +PARTED_MD5 := 090655d05f3c471aa8e15a27536889ec
> PARTED := parted-$(PARTED_VERSION)
> -PARTED_SUFFIX := tar.gz
> +PARTED_SUFFIX := tar.xz
> PARTED_URL := $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
> PARTED_SOURCE := $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
> PARTED_DIR := $(BUILDDIR)/$(PARTED)
> @@ -29,8 +29,8 @@ PARTED_LICENSE := GPL-3.0-only
> PARTED_CONF_TOOL := autoconf
> PARTED_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> - --disable-device-mapper \
> - --disable-Werror
> + --without-readline \
> + --disable-device-mapper
>
> #
> ----------------------------------------------------------------------------
> # Target-Install
> --
> 2.17.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
