From c36c4776e5c11571f54cdc41d3cd3c0ba844c983 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Oct 28 2016 05:16:27 +0000 Subject: Remove ioctl fix patch, different fix upstream --- diff --git a/btrfs-ioctl-fix.patch b/btrfs-ioctl-fix.patch deleted file mode 100644 index 4979f48..0000000 --- a/btrfs-ioctl-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ - - -This was reported when docker failed to build against -btrfs-progs v4.8.1. - -It includes ioctl.h which now calls BUILD_ASSERT(), which -is defined in kerncompat.h, which was not included in the -ioctl.h header file. - -Signed-off-by: Eric Sandeen ---- - -diff --git a/ioctl.h b/ioctl.h -index a7235c0..abea7ed 100644 ---- a/ioctl.h -+++ b/ioctl.h -@@ -26,6 +26,12 @@ extern "C" { - #include - #include - -+#if BTRFS_FLAT_INCLUDES -+#include "kerncompat.h" -+#else -+#include -+#endif /* BTRFS_FLAT_INCLUDES */ -+ - #ifndef __user - #define __user - #endif - --- -To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - - diff --git a/btrfs-progs.spec b/btrfs-progs.spec index aa9408f..5a499d5 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,6 +1,6 @@ Name: btrfs-progs Version: 4.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Userspace programs for btrfs Group: System Environment/Base @@ -12,7 +12,6 @@ Source0: https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v% # Still must reverse-engineer fixes in there and get upstream Patch0: btrfs-progs-valgrind.patch Patch1: btrfs-init-dev-list.patch -Patch2: btrfs-ioctl-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,7 +40,6 @@ btrfs filesystem-specific programs. %prep %setup -q -n %{name}-v%{version} -%patch2 -p1 %build ./autogen.sh @@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libbtrfs.so %changelog +* Fri Oct 28 2016 Eric Sandeen 4.8.2-2 +- Remove ioctl patch, different fix upstream + * Thu Oct 27 2016 Eric Sandeen 4.8.2-1 - New upstream release