From 89829639327646335291fc3bc43d4620e8d53a23 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 5 Oct 2022 22:47:44 -0500 Subject: [PATCH] update --- zfs-dkms-git/PKGBUILD | 10 ++++------ zfs-utils-git/PKGBUILD | 25 ++++++++++--------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/zfs-dkms-git/PKGBUILD b/zfs-dkms-git/PKGBUILD index 111d8af..9d457ca 100644 --- a/zfs-dkms-git/PKGBUILD +++ b/zfs-dkms-git/PKGBUILD @@ -1,13 +1,11 @@ -# Maintainer: Yurii Kolesnykov +# Maintainer: Nathan +# Contributor: Yurii Kolesnykov # Contributor: Eli Schwartz # Contributor: Iacopo Isimbaldi -# PRs are welcome: https://github.com/yurikoles-aur/zfs-dkms-git - pkgname=zfs-dkms-git -pkgver=2.1.99.r1389.g48cf170d5a +pkgver=2.1.99.r1445.g2ba240f358 pkgrel=1 -epoch=2 pkgdesc='Kernel modules for the Zettabyte File System.' arch=('x86_64') url='https://zfsonlinux.org/' @@ -56,7 +54,7 @@ build() { } package() { - depends=("zfs-utils-git=${epoch}:${pkgver}" 'dkms') + depends=("zfs-utils-git=${pkgver}" 'dkms') dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}" install -d "${dkmsdir}" cp -a zfs/. "${dkmsdir}" diff --git a/zfs-utils-git/PKGBUILD b/zfs-utils-git/PKGBUILD index 5493984..4b481e2 100644 --- a/zfs-utils-git/PKGBUILD +++ b/zfs-utils-git/PKGBUILD @@ -1,13 +1,11 @@ -# Maintainer: Yurii Kolesnykov +# Maintainer: Nathan +# Contributor: Yurii Kolesnykov # Contributor: Eli Schwartz # Contributor: Iacopo Isimbaldi -# PRs are welcome: https://github.com/yurikoles-aur/zfs-utils-git - pkgname=zfs-utils-git -pkgver=2.1.99.r1389.g48cf170d5a +pkgver=2.1.99.r1445.g2ba240f358 pkgrel=1 -epoch=2 pkgdesc="Userspace utilities for the Zettabyte File System." arch=('x86_64') url='https://zfsonlinux.org/' @@ -34,14 +32,12 @@ pkgver() { prepare() { cd zfs - autoreconf -fi } build() { cd zfs - - ./configure \ + local configure_args=( --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ @@ -49,9 +45,11 @@ build() { --with-udevdir=/usr/lib/udev \ --libexecdir=/usr/lib/zfs \ --enable-pyzfs \ - --enable-systemd \ + --disable-systemd \ --with-config=user \ - --with-zfsexecdir=/usr/lib/zfs + --with-zfsexecdir=/usr/lib/zfs) + + ./configure ${configure_args[*]} make } @@ -61,11 +59,8 @@ package() { # Remove uneeded files rm -r "${pkgdir}"/etc/init.d - rm -r "${pkgdir}"/etc/sudoers.d #??? - # We're experimenting with dracut in [extra], so start installing this. - #rm -r "${pkgdir}"/usr/lib/dracut - rm -r "${pkgdir}"/usr/lib/modules-load.d - rm -r "${pkgdir}"/usr/share/initramfs-tools + rm -r "${pkgdir}"/etc/sudoers.d + rm -r "${pkgdir}"/usr/lib/dracut # Install the support files install -D -m644 "${srcdir}"/zfs.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs