From 8bf826c2b651a800ef6668c576951a9f6be7eb89 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 21 Jul 2020 10:26:14 -0400 Subject: [PATCH] zfs: remove unused init scripts and add zed service --- srcpkgs/zfs/files/zed/run | 3 +++ srcpkgs/zfs/template | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 srcpkgs/zfs/files/zed/run diff --git a/srcpkgs/zfs/files/zed/run b/srcpkgs/zfs/files/zed/run new file mode 100755 index 00000000000..0e3c1a4f53d --- /dev/null +++ b/srcpkgs/zfs/files/zed/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ -r conf ] && . conf +exec zed -F $OPTS diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 0bcec381467..daf46b88531 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,7 +1,7 @@ # Template file for 'zfs' pkgname=zfs version=0.8.4 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d @@ -37,6 +37,8 @@ post_install() { vlicense LICENSE vlicense NOTICE + vsv zed + vmkdir usr/src/${pkgname}-${version} tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version} scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs @@ -44,8 +46,11 @@ post_install() { -e 's/test "${PYTHON_VERSION:0:2}" = "2."/test "${PYTHON_VERSION##2.*}" = ""/' \ ${DESTDIR}/usr/src/${pkgname}-${version}/configure # This is necessary because of https://github.com/zfsonlinux/zfs/issues/8827 + # Remove init and service control pieces not used in Void rm -rf ${DESTDIR}/usr/lib/systemd rm -rf ${DESTDIR}/usr/share/initramfs-tools + rm -rf ${DESTDIR}/etc/init.d + rm -rf ${DESTDIR}/etc/default # Contains ELF binaries. Remove it until upstream has a way to move this # into /usr/libexec or similiar.