diff --git a/2.27-blkid-zfs-raid.patch b/2.27-blkid-zfs-raid.patch deleted file mode 100644 index 14f6926..0000000 --- a/2.27-blkid-zfs-raid.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up util-linux-2.27.1/libblkid/src/probe.c.kzak util-linux-2.27.1/libblkid/src/probe.c -diff -up util-linux-2.27.1/libblkid/src/superblocks/zfs.c.kzak util-linux-2.27.1/libblkid/src/superblocks/zfs.c ---- util-linux-2.27.1/libblkid/src/superblocks/zfs.c.kzak 2015-11-02 10:07:34.567648465 +0100 -+++ util-linux-2.27.1/libblkid/src/superblocks/zfs.c 2015-11-18 12:13:32.716188023 +0100 -@@ -258,7 +258,7 @@ static int probe_zfs(blkid_probe pr, con - const struct blkid_idinfo zfs_idinfo = - { - .name = "zfs_member", -- .usage = BLKID_USAGE_RAID, -+ .usage = BLKID_USAGE_FILESYSTEM, - .probefunc = probe_zfs, - .minsz = 64 * 1024 * 1024, - .magics = BLKID_NONE_MAGIC diff --git a/2.28-libblkid-cdrom.patch b/2.28-libblkid-cdrom.patch deleted file mode 100644 index 2dddbc2..0000000 --- a/2.28-libblkid-cdrom.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 55ad13c26fe5d0e606be5a83937f31b8cf576588 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 28 Apr 2016 13:54:01 +0200 -Subject: [PATCH] libblkid: make I/O errors on CDROMs non-fatal - -It seems too tricky to get a real size of the data track on hybrid -disks with audio+data. It seems overkill to analyze all header in -libblkid and on some disks it's probably possible to get I/O error -almost everywhere due to crazy copy protection etc. - -Signed-off-by: Karel Zak ---- - libblkid/src/probe.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c -index 63baed3..5d9f701 100644 ---- a/libblkid/src/probe.c -+++ b/libblkid/src/probe.c -@@ -615,7 +615,10 @@ static struct blkid_bufinfo *read_buffer(blkid_probe pr, uint64_t real_off, uint - if (ret != (ssize_t) len) { - DBG(LOWPROBE, ul_debug("\tread failed: %m")); - free(bf); -- if (ret >= 0) -+ -+ /* I/O errors on CDROMs are non-fatal to work with hybrid -+ * audio+data disks */ -+ if (ret >= 0 || blkid_probe_is_cdrom(pr)) - errno = 0; - return NULL; - } --- -2.4.11 - diff --git a/libblkid-minix.patch b/libblkid-minix.patch deleted file mode 100644 index c913938..0000000 --- a/libblkid-minix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up util-linux-2.27.1/libblkid/src/superblocks/minix.c.kzak util-linux-2.27.1/libblkid/src/superblocks/minix.c ---- util-linux-2.27.1/libblkid/src/superblocks/minix.c.kzak 2016-01-18 15:02:05.493738910 +0100 -+++ util-linux-2.27.1/libblkid/src/superblocks/minix.c 2016-01-18 15:04:20.020773281 +0100 -@@ -90,7 +90,8 @@ static int probe_minix(blkid_probe pr, c - struct minix_super_block *sb = (struct minix_super_block *) data; - int zones, ninodes, imaps, zmaps, firstz; - -- if (sb->s_imap_blocks == 0 || sb->s_zmap_blocks == 0) -+ if (sb->s_imap_blocks == 0 || sb->s_zmap_blocks == 0 || -+ sb->s_log_zone_size != 0) - return 1; - - zones = version == 2 ? minix_swab32(swabme, sb->s_zones) :