summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-11-26 21:47:50 +0000
committerArchzfs Buildbot2018-11-26 21:47:50 +0000
commit7eaef55fba8e9b386bcd2257de1bb37f764a5e52 (patch)
tree6ad06acb7bac6d494c089521b7b11f196888f0b1 /PKGBUILD
parent2407ef201c75e4c4c29515273a5e3fd669f8fea3 (diff)
downloadaur-7eaef55fba8e9b386bcd2257de1bb37f764a5e52.tar.gz
Semi-automated update for kernel 4.18.5.arch1-1 + zfs 0.7.12
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 25f7ac4d185b..902bb456520f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,7 @@ package_zfs-linux-vfio() {
install=zfs.install
provides=("zfs")
groups=("archzfs-linux-vfio")
- conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-vfio-git')
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-vfio-git')
cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install
cp -r "${pkgdir}"/{lib,usr}
@@ -59,7 +59,7 @@ package_zfs-linux-vfio() {
package_zfs-linux-vfio-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"