summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index ff30508baba8..fd5384d7ebf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@
#
pkgbase="zfs-linux-hardened-git"
pkgname=("zfs-linux-hardened-git" "zfs-linux-hardened-git-headers")
-_commit='8005ca4f749f71397197292452ca539a25286b89'
-_zfsver="2018.11.20.r4835.g8005ca4f7"
+_commit='62ee31adcebe64a1b7cdf1225356108a924c595a'
+_zfsver="2018.11.26.r4836.g62ee31adc"
_kernelver="4.19.4.a-1"
_extramodules="4.19.4.a-1-hardened"
@@ -48,7 +48,7 @@ package_zfs-linux-hardened-git() {
install=zfs.install
provides=("zfs" "spl")
groups=("archzfs-linux-hardened-git")
- conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-hardened' "spl-dkms" "spl-dkms-git")
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-hardened' "spl-dkms" "spl-dkms-git")
replaces=("spl-linux-hardened-git")
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
@@ -61,7 +61,7 @@ package_zfs-linux-hardened-git() {
package_zfs-linux-hardened-git-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
provides=("zfs-headers" "spl-headers")
- conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "spl-dkms" "spl-dkms-git" "spl-headers")
+ conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" "spl-headers")
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"