moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

zfs: remove unused init scripts and add zed service

Browse source
This commit is contained in:
Andrew J. Hesford 2020-07-21 10:26:14 -04:00 • committed by Andrew J. Hesford
parent cb6aa62ebe
commit ba2dd95346
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
srcpkgs/zfs/files/zed/run Executable file
View file

@ -0,0 +1,3 @@
#!/bin/sh
[ -r conf ] && . conf
exec zed -F $OPTS

8
srcpkgs/zfs/template
View file

@ -1,7 +1,7 @@
# Template file for 'zfs' # Template file for 'zfs'
pkgname=zfs pkgname=zfs
version=0.8.4 version=0.8.4
revision=4 revision=5
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin configure_args="--with-config=user --with-mounthelperdir=/usr/bin
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@ -37,6 +37,8 @@ post_install() {
vlicense LICENSE vlicense LICENSE
vlicense NOTICE vlicense NOTICE
vsv zed
vmkdir usr/src/${pkgname}-${version} vmkdir usr/src/${pkgname}-${version}
tar xf ../clean.tar.gz -C ${DESTDIR}/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 scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs
@ -44,8 +46,12 @@ post_install() {
-e 's/test "${PYTHON_VERSION:0:2}" = "2."/test "${PYTHON_VERSION##2.*}" = ""/' \ -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 ${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/lib/systemd
rm -rf ${DESTDIR}/usr/share/initramfs-tools rm -rf ${DESTDIR}/usr/share/initramfs-tools
rm -rf ${DESTDIR}/etc/init.d
rm -rf ${DESTDIR}/etc/default
rm -f ${DESTDIR}/etc/zfs/zfs-functions
# Contains ELF binaries. Remove it until upstream has a way to move this # Contains ELF binaries. Remove it until upstream has a way to move this
# into /usr/libexec or similiar. # into /usr/libexec or similiar.