parted: convert patches to git formatting
PATCH v3 1/2 parted: convert patches to git formatting
---
v3: Don't remove Thomas's Sob (Baruch)
v2: split off git formatting in separate patch.
---
...ted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch | 8 ++++----
.../0002-configure.ac-uclinux-is-also-linux.patch | 4 ++--
...0003-Include-fcntl.h-to-get-loff_t-definition.patch} | 17 ++++++++++++++---
3 files changed, 20 insertions(+), 9 deletions(-)
rename package/parted/{0003-fix-includes-for-musl.patch => 0003-Include-fcntl.h-to-get-loff_t-definition.patch} (41%)package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch +4 -4
@@ -1,4 +1,4 @@ -From 7e87ca3c531228d35e13e802d2622006138b104c Mon Sep 17 00:00:00 2001 +From 141c4309d7164dcd4e09d137fc075c1726fd8dbb Mon Sep 17 00:00:00 2001 From: Felix Janda <[email protected]> Date: Sun, 3 May 2015 10:33:15 +0200 Subject: [PATCH] libparted/arch/linux.c: Compile without ENABLE_DEVICE_MAPPER
@@ -10,7 +10,7 @@ Signed-off-by: Yegor Yefremov <[email protected]> 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 90ab21d..f6141e4 100644 +index 0f18904..cf38c6f 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...)
@@ -57,7 +57,7 @@ index 90ab21d..f6141e4 100644 return result; } -@@ -2958,12 +2968,15 @@ _disk_sync_part_table (PedDisk* disk) +@@ -2945,12 +2955,15 @@ _disk_sync_part_table (PedDisk* disk) unsigned long long *length);
@@ -75,5 +75,5 @@ index 90ab21d..f6141e4 100644 remove_partition = _blkpg_remove_partition; #ifdef BLKPG_RESIZE_PARTITION -- -2.1.4 +2.14.2
package/parted/0002-configure.ac-uclinux-is-also-linux.patch +2 -2
@@ -1,4 +1,4 @@ -From b3958317c5ee2940e7024bec2e7f288b5a6a26c3 Mon Sep 17 00:00:00 2001 +From 7697d9c54e489b32b82c01f17db04f8b51857e51 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias <[email protected]> Date: Mon, 30 Jun 2014 10:09:04 -0300 Subject: [PATCH] configure.ac: uclinux is also linux
@@ -29,5 +29,5 @@ index 436d0e2..50ad478 100644 AC_SUBST([OS]) -- -1.8.5.5 +2.14.2
package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch renamed from package/parted/0003-fix-includes-for-musl.patch +14 -3
@@ -1,13 +1,21 @@ -Include <fcntl.h> to get loff_t definition +From 2078c07d38ee7841b89ac8d81afc5e8bfcd4f703 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sun, 8 Oct 2017 00:58:58 +0200 +Subject: [PATCH] Include <fcntl.h> to get loff_t definition Patch borrowed from Alpine Linux at http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves build with musl. Signed-off-by: Thomas Petazzoni <[email protected]> +--- + libparted/fs/xfs/platform_defs.h | 1 + + 1 file changed, 1 insertion(+) ---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h -+++ parted-3.1/libparted/fs/xfs/platform_defs.h +diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h +index 2b55752..17023dc 100644 +--- a/libparted/fs/xfs/platform_defs.h ++++ b/libparted/fs/xfs/platform_defs.h @@ -35,6 +35,7 @@ #define __XFS_PLATFORM_DEFS_H__
@@ -16,3 +24,6 @@ Signed-off-by: Thomas Petazzoni <[email protected]> #include <stdarg.h> #include <assert.h> #include <endian.h> +-- +2.14.2 +
Signature · 1 line
2.15.0
PATCH v3 2/2 parted: properly link with libiconv
parted uses libiconv but doesn't link with it. Add a patch to add it to LIBADD of the library that uses it. iconv was already checked in configure.ac, but only if i18n is enabled, so the iconv check is also added unconditionally in configure.ac.
Also add an optional dependency on libiconv, so it is reproducible.
This was not detected in the autobuilders, since it only occurs when libiconv exists (otherwise uClibc stubs will be used). libiconv depends on !BR2_ENABLE_LOCALE and parted depends on BR2_USE_WCHAR. We don't have such a configuration in the autobuilders.
Upstream status: sent to mailing list
http://lists.alioth.debian.org/pipermail/parted-devel/2017-November/005131.html
Cc Sjoerd Venema <[email protected]>
---
v3: add link to upstream
v2:
- Add AM_ICONV to configure.ac. Without it, -liconv will be added also if it is already part of libc (e.g. in glibc). (Thomas)
- Explain in the commit message why autobuilders didn't detect this.
Patch sent upstream but hasn't appeared in the mailing list archives yet.
--- ...arted-labels-link-with-libiconv-if-needed.patch | 54 ++++++++++++++++++++++ package/parted/parted.mk | 7 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch
package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch new file +54 -0
@@ -0,0 +1,54 @@ +From dd17f55b2ac189ccd3b8025e4f6509537d00f9d3 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> +Date: Sun, 8 Oct 2017 00:53:31 +0200 +Subject: [PATCH] libparted/labels: link with libiconv if needed + +gpt.c uses iconv so it should link with it. Otherwise, on platforms +where libiconv is a separate library, we get a link failure of parted: + + CCLD parted + ../libparted/.libs/libparted.so: undefined reference to `libiconv' + ../libparted/.libs/libparted.so: undefined reference to `libiconv_open' + ../libparted/.libs/libparted.so: undefined reference to `libiconv_close' + +Since iconv functionality is needed unconditionally (not only when +gettext is enabled), AM_ICONV needs to be added to configure.ac. + +Upstream status: sent to mailing list +http://lists.alioth.debian.org/pipermail/parted-devel/2017-November/005131.html + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> +--- + configure.ac | 2 ++ + libparted/labels/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 50ad478..62f1b4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -288,6 +288,8 @@ fi + AC_PROG_LIBTOOL + LT_INIT + ++AM_ICONV ++ + AM_GNU_GETTEXT_VERSION([0.18]) + AM_GNU_GETTEXT([external]) + if test "$USE_INCLUDED_LIBINTL" = "yes"; then +diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am +index c996f81..b204379 100644 +--- a/libparted/labels/Makefile.am ++++ b/libparted/labels/Makefile.am +@@ -35,7 +35,7 @@ liblabels_la_SOURCES = \ + rdb.c \ + sun.c + +-liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) ++liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV) + + AM_CPPFLAGS = $(partedincludedir) $(INTLINCS) + +-- +2.14.2 +
package/parted/parted.mk +6 -1
@@ -9,7 +9,8 @@ PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux PARTED_INSTALL_STAGING = YES -# For uclinux patch +# 0002-configure.ac-uclinux-is-also-linux.patch +# 0004-libparted-labels-link-with-libiconv-if-needed.patch PARTED_AUTORECONF = YES PARTED_GETTEXTIZE = YES PARTED_LICENSE = GPL-3.0+
@@ -29,6 +30,10 @@ else PARTED_CONF_OPTS += --disable-device-mapper endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +PARTED_DEPENDENCIES += libiconv +endif + ifeq ($(BR2_STATIC_LIBS),y) PARTED_CONF_OPTS += --disable-dynamic-loading endif
Signature · 1 line
2.15.0
PATCH v3 1/2 parted: convert patches to git formatting
In reply to Arnout Vandecappelle (Essensium/Mind)Hello,
Quoted 10 lines · Arnout Vandecappelle (Essensium/Mind)
---
v3: Don't remove Thomas's Sob (Baruch)
v2: split off git formatting in separate patch.--- ...ted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch | 8 ++++---- .../0002-configure.ac-uclinux-is-also-linux.patch | 4 ++-- ...0003-Include-fcntl.h-to-get-loff_t-definition.patch} | 17 ++++++++++++++--- 3 files changed, 20 insertions(+), 9 deletions(-) rename package/parted/{0003-fix-includes-for-musl.patch => 0003-Include-fcntl.h-to-get-loff_t-definition.patch} (41%)
Both patches applied to master. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com