diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
| commit | 11271540bfe6adafbc133caf6b5b902a816f5f02 (patch) | |
| tree | 48df469d4e88c7e6efc0a8f4f8d5a386468ed72b /package/xfsprogs | |
| parent | 24d6c5258ee38c38f0156b057cecd3cfe7ed7b1d (diff) | |
| parent | 8e5eef6c323c6a928ccea7279b3d9848419b99d9 (diff) | |
| download | buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.tar.gz buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/xfsprogs')
| -rw-r--r-- | package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch | 38 | ||||
| -rw-r--r-- | package/xfsprogs/xfsprogs.hash | 5 | ||||
| -rw-r--r-- | package/xfsprogs/xfsprogs.mk | 2 |
3 files changed, 3 insertions, 42 deletions
diff --git a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch b/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch deleted file mode 100644 index 36896b5b95..0000000000 --- a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b981adb6769f6b7d80f6c98627391398a007a25b Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Tue, 15 Dec 2015 20:51:35 -0300 -Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC - -When cross-compiling CFLAGS might not be suitable for the host -(BUILD_CC) compiler since it might contain arch-specific options. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> ---- - libxfs/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index e021625..ad76a04 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -118,7 +118,7 @@ default: ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" -- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< -+ $(Q) $(BUILD_CC) -o gen_crc32table $< - @echo " [GENERATE] $@" - $(Q) ./gen_crc32table > crc32table.h - -@@ -129,7 +129,7 @@ crc32table.h: gen_crc32table.c - # disk. - crc32selftest: gen_crc32table.c crc32table.h crc32.c - @echo " [TEST] CRC32" -- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ -+ $(Q) $(BUILD_CC) -D CRC32_SELFTEST=1 crc32.c -o $@ - $(Q) ./$@ - - # set up include/xfs header directory --- -2.7.4 - diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index e990b78d77..edb2933c36 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,3 +1,2 @@ -# Locally calculated after checking pgp signature: -# https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.sign -sha256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 xfsprogs-4.8.0.tar.xz +# From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc +sha256 c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 xfsprogs-4.11.0.tar.xz diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index c110733c83..ed56d3484e 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 4.8.0 +XFSPROGS_VERSION = 4.11.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz |
