summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-11-26 21:47:36 +0000
committerArchzfs Buildbot2018-11-26 21:47:36 +0000
commit505078c9d95ffb11e20bdad1dd814ebebdab4544 (patch)
tree6bb5e56325b397eb6cd9fdfd8a3d43b42fe86bdf /PKGBUILD
parentc32655b6602fe132d43a69d581c43efc25d2fa99 (diff)
downloadaur-505078c9d95ffb11e20bdad1dd814ebebdab4544.tar.gz
Semi-automated update for kernel 4.19.4.zen1-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 102c022ca9ed..e364b56e4fef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,7 @@ package_zfs-linux-zen() {
install=zfs.install
provides=("zfs")
groups=("archzfs-linux-zen")
- conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-zen-git')
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-zen-git')
cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install
cp -r "${pkgdir}"/{lib,usr}
@@ -59,7 +59,7 @@ package_zfs-linux-zen() {
package_zfs-linux-zen-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"