summaryrefslogtreecommitdiffstats
path: root/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch
diff options
context:
space:
mode:
authorMatt Weber <matthew.weber@rockwellcollins.com>2018-05-09 13:41:16 -0500
committerPeter Korsgaard <peter@korsgaard.com>2018-05-27 19:31:07 +0200
commit4da86cd4be7606015d0bb9bb2540ca62b2630369 (patch)
treeffbac1a7d22fd444964f8b47c077ce3f8fdc7826 /package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch
parent775929c988db0197363a3c6f693fc3928bdb43de (diff)
downloadbuildroot-4da86cd4be7606015d0bb9bb2540ca62b2630369.tar.gz
buildroot-4da86cd4be7606015d0bb9bb2540ca62b2630369.zip
xfsprogs: bump to 4.16.1
Resolves build failures like: http://autobuild.buildroot.net/results/953/95307f0f56c7ead1bd1f0ab0049aeb8b30fdc11c/ libunistring to libicu conversion required modifications to 0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch and the libicu usage doesn't require the 0005-xfs_scrub-fix-cross-compile-with-libunistring.patch patch. I verified that the configuration time setup of the LIBICU library works correctly and doesn't require us to remove it. Upstream has reworked/included the following: 0003-workqueue-add-missing-pthreads-header.patch 0004-xfs_scrub-add-missing-paths-header.patch 0006-xfs_scrub-fix-build-with-older-kernel-headers.patch Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch')
-rw-r--r--package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch b/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch
deleted file mode 100644
index 9e1300d0cd..0000000000
--- a/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7ea1df02d0f2549b6249c8bee1f6ae02bf1251a9 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Sun, 25 Mar 2018 00:01:23 +0300
-Subject: [PATCH] xfs_scrub: fix build with older kernel headers
-
-The OVERRIDE_SYSTEM_FSXATTR macro in include/linux.h is meant to
-override the linux/fs.h kernel header provided struct fsxattr for
-kernels older than v4.7. A few source files include linux/fs.h before
-the local linux.h, making this override ineffective. Remove these header
-includes from the source files, and rely on the linux.h include alone.
-
-This fixes the following build failures:
-
-In file included from ../include/xfs.h:37:0,
- from disk.c:40:
-../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr'
- struct fsxattr {
- ^~~~~~~
-
-In file included from ../include/xfs.h:37:0,
- from ../include/project.h:22,
- from ../include/input.h:24,
- from phase1.c:38:
-../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr'
- struct fsxattr {
- ^~~~~~~
-
-Cc: Darrick J. Wong <darrick.wong@oracle.com>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: https://patchwork.kernel.org/patch/10306419/
-
- scrub/disk.c | 1 -
- scrub/phase1.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/scrub/disk.c b/scrub/disk.c
-index e12175c8656c..54d7a2a77c45 100644
---- a/scrub/disk.c
-+++ b/scrub/disk.c
-@@ -28,7 +28,6 @@
- #include <sys/ioctl.h>
- #include <sys/statvfs.h>
- #include <sys/vfs.h>
--#include <linux/fs.h>
- #ifdef HAVE_SG_IO
- # include <scsi/sg.h>
- #endif
-diff --git a/scrub/phase1.c b/scrub/phase1.c
-index 6cd544233c94..d15689e1b544 100644
---- a/scrub/phase1.c
-+++ b/scrub/phase1.c
-@@ -32,7 +32,6 @@
- #include <stdbool.h>
- #include <pthread.h>
- #include <errno.h>
--#include <linux/fs.h>
- #include "libfrog.h"
- #include "workqueue.h"
- #include "input.h"
---
-2.16.2
-
OpenPOWER on IntegriCloud