summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-11-26 21:47:23 +0000
committerArchzfs Buildbot2018-11-26 21:47:23 +0000
commit99f22cd922dca92db18b94c7aadfd647c7d4d9d5 (patch)
tree0a368d99706041d676f89b1b84b2617964adaf9d
parent04ffbaaeaf7adc8f65d15f3fbef4fec1ab535836 (diff)
downloadaur-99f22cd922dca92db18b94c7aadfd647c7d4d9d5.tar.gz
Semi-automated update for kernel 4.19.4.a-1 + zfs 0.7.12
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index ea81f99043b5..1a50d61fae7c 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"