zfs-patches/0004-Expand-zfs-test-and-add-Breaks-Conflicts.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Antonio Russo <antonio.e.russo@gmail.com>
   3 Date: Fri, 18 May 2018 18:04:51 -0400
   4 Subject: [PATCH] Expand zfs-test and add Breaks/Conflicts
   5
   6 ---
   7  debian/control                | 4 ++--
   8  debian/control.in             | 4 ++--
   9  debian/tests/control          | 2 +-
  10  debian/zfs-test.install       | 6 +++++-
  11  debian/zfsutils-linux.install | 5 +----
  12  5 files changed, 11 insertions(+), 10 deletions(-)
  13
  14 diff --git a/debian/control b/debian/control
  15 index 9e4f8fa7..8d85529c 100644
  16 --- a/debian/control
  17 +++ b/debian/control
  18 @@ -180,8 +180,8 @@ Depends: acl,
  19           zfsutils-linux (>=${binary:Version}),
  20           ${misc:Depends},
  21           ${shlibs:Depends}
  22 -Breaks: zfsutils-linux (<= 0.6.5.11-1)
  23 -Replaces: zfsutils-linux (<= 0.6.5.11-1)
  24 +Breaks: zfsutils-linux (<= 0.7.9-2)
  25 +Replaces: zfsutils-linux (<= 0.7.9-2)
  26  Conflicts: zutils
  27  Description: OpenZFS test infrastructure an support scripts
  28   The Z file system is a pooled filesystem designed for maximum data
  29 diff --git a/debian/control.in b/debian/control.in
  30 index e193f017..9970875e 100644
  31 --- a/debian/control.in
  32 +++ b/debian/control.in
  33 @@ -180,8 +180,8 @@ Depends: acl,
  34           zfsutils-linux (>=${binary:Version}),
  35           ${misc:Depends},
  36           ${shlibs:Depends}
  37 -Breaks: zfsutils-linux (<= 0.6.5.11-1)
  38 -Replaces: zfsutils-linux (<= 0.6.5.11-1)
  39 +Breaks: zfsutils-linux (<= 0.7.9-2)
  40 +Replaces: zfsutils-linux (<= 0.7.9-2)
  41  Conflicts: zutils
  42  Description: OpenZFS test infrastructure an support scripts
  43   The Z file system is a pooled filesystem designed for maximum data
  44 diff --git a/debian/tests/control b/debian/tests/control
  45 index 3d704bac..d03b365b 100644
  46 --- a/debian/tests/control
  47 +++ b/debian/tests/control
  48 @@ -1,3 +1,3 @@
  49  Tests: kernel-smoke-test
  50  Restrictions: needs-root
  51 -Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms
  52 +Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms, zfs-test
  53 diff --git a/debian/zfs-test.install b/debian/zfs-test.install
  54 index 225d51fc..ec850df8 100644
  55 --- a/debian/zfs-test.install
  56 +++ b/debian/zfs-test.install
  57 @@ -1,8 +1,12 @@
  58 +sbin/zinject
  59 +sbin/zpios
  60  sbin/ztest
  61  usr/bin/raidz_test
  62 -usr/share/man/man1/ztest.1
  63  usr/share/man/man1/raidz_test.1
  64  usr/share/man/man1/test-runner.1
  65 +usr/share/man/man1/zpios.1
  66 +usr/share/man/man1/ztest.1
  67 +usr/share/man/man8/zinject.8
  68  usr/share/zfs/common.sh
  69  usr/share/zfs/common.sh
  70  usr/share/zfs/common.sh
  71 diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
  72 index 238e00a2..18016822 100644
  73 --- a/debian/zfsutils-linux.install
  74 +++ b/debian/zfsutils-linux.install
  75 @@ -15,8 +15,6 @@ sbin/mount.zfs
  76  sbin/zdb
  77  sbin/zfs
  78  sbin/zhack
  79 -sbin/zinject
  80 -sbin/zpios
  81  sbin/zpool
  82  sbin/zstreamdump
  83  usr/bin/zgenhostid
  84 @@ -25,7 +23,7 @@ usr/lib/zfs-linux/zpool.d/
  85  usr/sbin/arc_summary
  86  usr/sbin/arcstat
  87  usr/sbin/dbufstat
  88 -usr/share/man/man1/
  89 +usr/share/man/man1/zhack.1
  90  usr/share/man/man5/
  91  usr/share/man/man8/fsck.zfs.8
  92  usr/share/man/man8/mount.zfs.8
  93 @@ -33,6 +31,5 @@ usr/share/man/man8/vdev_id.8
  94  usr/share/man/man8/zdb.8
  95  usr/share/man/man8/zfs.8
  96  usr/share/man/man8/zgenhostid.8
  97 -usr/share/man/man8/zinject.8
  98  usr/share/man/man8/zpool.8
  99  usr/share/man/man8/zstreamdump.8
 100 --
 101 2.11.0
 102