0.8.4-2

Fix: /etc/init.d services not working, require openrc

1 files changed, 5 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7e70f28..b9d56a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,12 @@
 
 pkgname=zfs-utils
 pkgver=0.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace utilities for the Zettabyte File System."
 arch=("i686" "x86_64")
 url="https://zfsonlinux.org/"
 license=('CDDL')
+makedepends=('openrc' 'python')
 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"
@@ -25,13 +26,6 @@ b2sums=('776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25e
 validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027'  # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
               'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
 
-prepare() {
-    cd "${srcdir}"/zfs-${pkgver}
-
-    # pyzfs is not built, but build system tries to check for python anyway
-    ln -sf /bin/true python3-fake
-}
-
 build() {
     cd "${srcdir}"/zfs-${pkgver}
 
@@ -43,8 +37,7 @@ build() {
                 --datadir=/usr/share \
                 --includedir=/usr/include \
                 --with-udevdir=/usr/lib/udev \
-                --libexecdir=/usr/lib/zfs \
-                --with-python="$PWD/python3-fake" \
+                --libexecdir=/usr/lib \
                 --enable-pyzfs=no \
                 --with-config=user
     make
@@ -54,11 +47,8 @@ package() {
     cd "${srcdir}"/zfs-${pkgver}
 
     make DESTDIR="${pkgdir}" install
-    install -D -m644 contrib/bash_completion.d/zfs "${pkgdir}"/usr/share/bash-completion/completions/zfs
 
     # Remove uneeded files
-    #rm -r "${pkgdir}"/etc/init.d
-    rm -rf "${pkgdir}"/etc/sudoers.d #???
     # We're experimenting with dracut in [extra], so start installing this.
     #rm -r "${pkgdir}"/usr/lib/dracut
     rm -rf "${pkgdir}"/usr/lib/modules-load.d
@@ -67,4 +57,6 @@ 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
+
+    install -D -m644 contrib/bash_completion.d/zfs "${pkgdir}"/usr/share/bash-completion/completions/zfs
 }