diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-05-16 22:44:51 +0300 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-05-16 22:44:51 +0300 |
| commit | f059361f2c2544d87e94bfa48d8d83b298b8c6f7 (patch) | |
| tree | 0518902b80b8308c693329ad3238ba26f6cc6d6c | |
| parent | Update .SRCINFO (diff) | |
| download | zfs-utils-f059361f2c2544d87e94bfa48d8d83b298b8c6f7.tar.xz | |
Update to 0.8.4
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | zfs-functions.patch | 17 |
2 files changed, 6 insertions, 29 deletions
@@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-utils -pkgver=0.8.3 +pkgver=0.8.4 pkgrel=1 pkgdesc="Userspace utilities for the Zettabyte File System." arch=("i686" "x86_64") @@ -13,18 +13,15 @@ license=('CDDL') optdepends=('python: for arcstat/arc_summary/dbufstat') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "zfs.initcpio.install" - "zfs.initcpio.hook" - "zfs-functions.patch") -sha256sums=('545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd' + "zfs.initcpio.hook") +sha256sums=('2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb' 'SKIP' 'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d' - 'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e' - 'd0fe6b0c8a03e7e7bd7681a3cc82366b9349d3426ecf2c6945e37bde26595d7d') -b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958' + 'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e') +b2sums=('776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569' 'SKIP' '570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3' - '491a7f20b0c6b4ce4fcedab617b2d7a4f2a01f1bc8f1ae57efde2fb22c2ab09a1107a8f4877b95c27576fe4216d01f181936787f51ce532bb13c5806badf7519' - 'e649ef8d002c045551e2d064186a297d7d253ad01d95f6b714ba7c830a8572675d666dec2f61b57573acfdd5e34ece4126a047a7fca21baa50b4f25dc9aa9f31') + '491a7f20b0c6b4ce4fcedab617b2d7a4f2a01f1bc8f1ae57efde2fb22c2ab09a1107a8f4877b95c27576fe4216d01f181936787f51ce532bb13c5806badf7519') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov> @@ -70,7 +67,4 @@ package() { install -D -m644 "${srcdir}"/zfs.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs install -D -m644 "${srcdir}"/zfs.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs - - # workaround for https://github.com/zfsonlinux/zfs/issues/9443 - patch -u "${pkgdir}"/etc/zfs/zfs-functions -i "${srcdir}"/zfs-functions.patch } diff --git a/zfs-functions.patch b/zfs-functions.patch deleted file mode 100644 index 45bd32b..0000000 --- a/zfs-functions.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/etc/zfs/zfs-functions -+++ b/etc/zfs/zfs-functions -@@ -88,10 +88,10 @@ - fi - - # Paths to what we need --ZFS="/usr/local/sbin/zfs" --ZED="/usr/local/sbin/zed" --ZPOOL="/usr/local/sbin/zpool" --ZPOOL_CACHE="/usr/local/etc/zfs/zpool.cache" -+ZFS="/usr/bin/zfs" -+ZED="/usr/bin/zed" -+ZPOOL="/usr/bin/zpool" -+ZPOOL_CACHE="/etc/zfs/zpool.cache" - - # Sensible defaults - ZFS_MOUNT='yes' |