diff --git a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch deleted file mode 100644 index 77bdc19127..0000000000 --- a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 94ae5db7d017480e103aa6f07cc86648b613d114 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 18 Dec 2016 15:37:27 +0100 -Subject: [PATCH] libxfs: do not try to run the crc32selftest - -Even though the crc32selftest is natively compiled (because it is to be -executed), it fails in cross-compilation as the host may lack the -required headers, like uuid/uuid.h (e.g. in a minimal environment). - -Moreover, running the crc32selftest natively is completely wrong, -because it passing on the host does not mean it would still pass n the -target (because endianness or bitness or alignment differences). - -So, just disable running the crc32selftest altogether. - -Note that there's a remaining bug-in-hiding, because the crc32 table -generator is natively built, but with the target CFLAGS. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: "Fabrice Fontaine" -[Update for 4.18.0: crc32 has been moved from libxfs to libfrog] -[Julien: rebased on v6.4.0] -Signed-off-by: Julien Olivain -Upstream: patch to be superseded by https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e51b89e657af7843d8c7aea3df49fe1f0f1d4ac2 ---- - libfrog/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfrog/Makefile b/libfrog/Makefile -index f292afe3..1d0d2083 100644 ---- a/libfrog/Makefile -+++ b/libfrog/Makefile -@@ -57,9 +57,9 @@ ifeq ($(HAVE_GETMNTENT),yes) - LCFLAGS += -DHAVE_GETMNTENT - endif - --LDIRT = gen_crc32table crc32table.h crc32selftest -+LDIRT = gen_crc32table crc32table.h - --default: crc32selftest ltdepend $(LTLIBRARY) -+default: ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c crc32defs.h - @echo " [CC] gen_crc32table" --- -2.45.2 - diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 8c73e14905..a86693419d 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 c31868418bfbf49a3a9c47fc70cdffde9d96f4ff0051bd04a0881e6654648104 xfsprogs-6.4.0.tar.xz +sha256 dae3bb432196f7b183b2e6bd5dc44bf33edbd7d0e85bd37d25c235df81b8100a xfsprogs-6.11.0.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index e657c8086d..0234b91d09 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 6.4.0 +XFSPROGS_VERSION = 6.11.0 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)