From 6d71dce2f7ff1fd07c24adf22c89c05c578b8192 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 31 Jan 2019 22:01:44 -0300 Subject: upgpkg: nonsystemd/util-linux 2.33-2.nonsystemd1 Signed-off-by: David P --- .../util-linux/0001-fstrim-cleanup-uncludes.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch (limited to 'nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch') diff --git a/nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch b/nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch deleted file mode 100644 index 74078555f..000000000 --- a/nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 22 Mar 2018 13:17:10 +0100 -Subject: fstrim: cleanup includes - -* HAVE_SYS_FS_H is incorrect (should be HAVE_LINUX_FS_H) - -* linux/fs.h cannot be included together with sys/mount.h as the both - files define MS_* constants. The libmount.h includes sys/mount.h now. - -Signed-off-by: Karel Zak ---- - sys-utils/fstrim.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c -index ca8cf256d..53ac594c0 100644 ---- a/sys-utils/fstrim.c -+++ b/sys-utils/fstrim.c -@@ -36,10 +36,6 @@ - #include - #include - --#ifdef HAVE_SYS_FS_H --# include --#endif -- - #include "nls.h" - #include "strutils.h" - #include "c.h" -@@ -49,6 +45,10 @@ - - #include - -+ -+/* We cannot include linux/fs.h due to MS_* constants collision with -+ * sys/mount.h (and libmount.h) -+ */ - #ifndef FITRIM - struct fstrim_range { - uint64_t start; -- cgit v1.2.3