xfsprogs: bump to 4.16.1

index 74636c2..9030a2a 100644
@@ -14,6 +14,8 @@ Signed-off-by: Vicente Olivert Riera <[email protected]>
 [Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html]
 [baruch: update for v4.15.1; extend to include scrub]
 Signed-off-by: Baruch Siach <[email protected]>
+[matt: update for v4.16.1; adjusted libunistring -> libicu]
+Signed-off-by: Matt Weber <[email protected]>
 ---
  mdrestore/Makefile | 2 +-
  scrub/Makefile     | 2 +-

@@ -38,8 +40,8 @@ index 063279400262..949f6fd8ba94 100644
 +++ b/scrub/Makefile
 @@ -70,7 +70,7 @@ xfs_scrub.c
  
- LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUNISTRING) $(LIBRT)
- LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBUNISTRING) $(LIBRT)
+ LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBICU_LIBS) $(LIBRT)
+ LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG)
 -LLDFLAGS = -static
 +LLDFLAGS = -static-libtool-libs
  

41 lines not on this page · raw message

deleted file mode 100644
index 7695cf3..0000000
@@ -1,37 +0,0 @@
-From 27747dcbfbde8a767b1a873716fce1d3aaf17c2f Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Fri, 16 Mar 2018 07:16:19 +0200
-Subject: [PATCH] xfs_scrub: add missing paths header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix the following build failure with musl libc:
-
-xfs_scrub.c: In function ?main?:
-xfs_scrub.c:670:11: error: ?_PATH_MOUNTED? undeclared (first use in this function)
-    mtab = _PATH_MOUNTED;
-           ^~~~~~~~~~~~~
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: https://marc.info/?l=linux-xfs&m=152117771313566&w=2
-
- scrub/xfs_scrub.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
-index ab26e6335948..eedbe34ec7b3 100644
---- a/scrub/xfs_scrub.c
-+++ b/scrub/xfs_scrub.c
-@@ -21,6 +21,7 @@
- #include <pthread.h>
- #include <stdbool.h>
- #include <stdlib.h>
-+#include <paths.h>
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/statvfs.h>
--- 
-2.16.2
-

deleted file mode 100644
index dfb66c6..0000000
@@ -1,37 +0,0 @@
-From 45d9ba0f01cceb75f72d157a9e4d9aaeb753a9c4 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Tue, 20 Mar 2018 14:13:28 +0200
-Subject: [PATCH] xfs_scrub: fix cross compile with libunistring
-
-Commit 4bbed4ecc2a (xfs_scrub: warn about normalized Unicode name collisions)
-added -lunistring to the list of the xfs_scrub dependencies. When cross
-compiling make fails to find the library on the target sysroot:
-
-make[3]: *** No rule to make target `-lunistring', needed by `xfs_scrub'.  Stop.
-
-Remove -lunistring from make dependencies of xfs_scrub to fix that.
-
-Cc: Darrick J. Wong <[email protected]>
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: https://patchwork.kernel.org/patch/10296957/
-
- scrub/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scrub/Makefile b/scrub/Makefile
-index 949f6fd8ba94..979603f524ff 100644
---- a/scrub/Makefile
-+++ b/scrub/Makefile
-@@ -69,7 +69,7 @@ vfs.c \
- xfs_scrub.c
- 
- LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUNISTRING) $(LIBRT)
--LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBUNISTRING) $(LIBRT)
-+LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBRT)
- LLDFLAGS = -static-libtool-libs
- 
- ifeq ($(HAVE_MALLINFO),yes)
--- 
-2.16.2
-

63 lines not on this page · raw message

index c58dbb0..4df2e8d 100644
@@ -1,3 +1,3 @@
 # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc
-sha256 27c36de9346a274143ad06c65b2fdbafd2806f3f37fa2c1235a08ed920d2bf3c  xfsprogs-4.15.1.tar.xz
+sha256 3d5c2da46112b86cbd967fee43cea731d38a1b2aaf601b57674ed34e808652df  xfsprogs-4.16.1.tar.xz
 sha256 ee304b1b1da08b261f1d1f31d229fc70d2d0c552c7429e9e84c0fac878d94209  doc/COPYING

index dffcc28..814e0cf 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFSPROGS_VERSION = 4.15.1
+XFSPROGS_VERSION = 4.16.1
 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
 XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
 XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers)

@@ -20,8 +20,11 @@ XFSPROGS_CONF_OPTS = \
 	INSTALL_GROUP=root \
 	--enable-static
 
-ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
-XFSPROGS_DEPENDENCIES += libunistring
+ifeq ($(BR2_PACKAGE_ICU),y)
+XFSPROGS_DEPENDENCIES += icu
+XFSPROGS_CONF_OPTS += --enable-libicu
+else
+XFSPROGS_CONF_OPTS += --disable-libicu
 endif
 
 XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install