From 99f22cd922dca92db18b94c7aadfd647c7d4d9d5 Mon Sep 17 00:00:00 2001 From: Archzfs Buildbot <34833957+archzfs-bot@users.noreply.github.com> Date: Mon, 26 Nov 2018 21:47:23 +0000 Subject: [PATCH] Semi-automated update for kernel 4.19.4.a-1 + zfs 0.7.12 --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index ea81f99..1a50d61 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -47,7 +47,7 @@ package_zfs-linux-hardened() { install=zfs.install provides=("zfs") groups=("archzfs-linux-hardened") - conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-hardened-git') + conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-hardened-git') cd "${srcdir}/zfs-${_zfsver}" make DESTDIR="${pkgdir}" install cp -r "${pkgdir}"/{lib,usr} @@ -59,7 +59,7 @@ package_zfs-linux-hardened() { package_zfs-linux-hardened-headers() { pkgdesc="Kernel headers for the Zettabyte File System." provides=("zfs-headers") - conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git") + conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc") cd "${srcdir}/zfs-${_zfsver}" make DESTDIR="${pkgdir}" install rm -r "${pkgdir}/lib"