From 62b693930876ba8d929632e1ba0ae5dc48a85001 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 25 Jul 2014 12:22:45 -0700
Subject: [PATCH] Remove patches directory

Support for ZFS has now been merged in to both blkid and grub.
Therefore, there is no longer a need to carry these stale
patches in the ZFS source tree.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
---
 ...e2fsprogs-1.41.4-zfs-probe-uberblock.patch | 32 -------------------
 patches/grub-mkconfig-zfs-support.diff        | 31 ------------------
 2 files changed, 63 deletions(-)
 delete mode 100644 patches/e2fsprogs-1.41.4-zfs-probe-uberblock.patch
 delete mode 100644 patches/grub-mkconfig-zfs-support.diff

diff --git a/patches/e2fsprogs-1.41.4-zfs-probe-uberblock.patch b/patches/e2fsprogs-1.41.4-zfs-probe-uberblock.patch
deleted file mode 100644
index bf50df4315..0000000000
--- a/patches/e2fsprogs-1.41.4-zfs-probe-uberblock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Detect a ZFS filesystem by looking for valid uberblocks.
-
-This support will appear in an upstream version of e2fsprogs.  For the
-moment however you will still need to locally patch you e2fsprogs packages.
-This patch applies cleanly to fc11's e2fsprogs-*-1.41.4-10 and should
-apply easily enough to the e2fsprogs from other distros.
-
---- e2fsprogs.orig/lib/blkid/probe.c	2009-01-20 09:06:31.000000000 -0800
-+++ e2fsprogs/lib/blkid/probe.c	2009-10-06 10:16:37.000000000 -0700
-@@ -1359,10 +1361,18 @@
-   { "iso9660",	32,	 1,  5, "CD001",		probe_iso9660 },
-   { "iso9660",	32,	 9,  5, "CDROM",		probe_iso9660 },
-   { "jfs",	32,	 0,  4, "JFS1",			probe_jfs },
--  { "zfs",       8,	 0,  8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", probe_zfs },
--  { "zfs",       8,	 0,  8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
--  { "zfs",     264,	 0,  8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", probe_zfs },
--  { "zfs",     264,	 0,  8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
-+  { "zfs",     128,	 0,  8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
-+  { "zfs",     132,	 0,  8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
-+  { "zfs",     136,	 0,  8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
-+  { "zfs",     128,	 0,  8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
-+  { "zfs",     132,	 0,  8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
-+  { "zfs",     136,	 0,  8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
-+  { "zfs",     384,	 0,  8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
-+  { "zfs",     388,	 0,  8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
-+  { "zfs",     392,	 0,  8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
-+  { "zfs",     384,	 0,  8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
-+  { "zfs",     388,	 0,  8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
-+  { "zfs",     392,	 0,  8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
-   { "hfsplus",	 1,	 0,  2, "BD",			probe_hfsplus },
-   { "hfsplus",	 1,	 0,  2, "H+",			probe_hfsplus },
-   { "hfsplus",	 1,	 0,  2, "HX",			probe_hfsplus },
diff --git a/patches/grub-mkconfig-zfs-support.diff b/patches/grub-mkconfig-zfs-support.diff
deleted file mode 100644
index ab5362c8fb..0000000000
--- a/patches/grub-mkconfig-zfs-support.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up ./util/grub-mkconfig.in.original ./util/grub-mkconfig.in
---- ./util/grub-mkconfig.in.original	2012-03-27 13:03:49.475388000 -0700
-+++ ./util/grub-mkconfig.in	2012-03-27 13:06:38.948080000 -0700
-@@ -140,9 +140,24 @@ if test -e ${GRUB_PREFIX}/device.map ; t
-   ${grub_mkdevicemap}
- fi
- 
--# Device containing our userland.  Typically used for root= parameter.
--GRUB_DEVICE="`${grub_probe} --target=device /`"
--GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
-+# Attempt to detect if the root file system is in ZFS first
-+unset GRUB_DEVICE
-+unset GRUB_DEVICE_BOOT
-+getzfsgrubdevice() {
-+    mount | while read dev dummy mntpnt dummy2 fstype rest ; do
-+        if [ -n "$GRUB_DEVICE" ] ; then break ; fi
-+        if [ "$fstype" != "zfs" ] ; then continue ; fi
-+        if [ "$mntpnt" != "/" ] ; then continue ; fi
-+        GRUB_DEVICE=`fstab-decode echo "$dev"`
-+        GRUB_DEVICE="ZFS=$GRUB_DEVICE" ; echo "$GRUB_DEVICE" ; break
-+    done
-+}
-+GRUB_DEVICE=`getzfsgrubdevice`
-+if [ -z "$GRUB_DEVICE" ] ; then
-+    # Device containing our userland.  Typically used for root= parameter.
-+    GRUB_DEVICE="`${grub_probe} --target=device /`"
-+    GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
-+fi
- 
- # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.
- GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"