From 16b38063d48d970b6910bc8bc3294870a86eeeba Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Tue, 6 Mar 2018 21:42:15 -0800 Subject: [PATCH] Semi-automated update for 4.15.7.a.1-2 --- .SRCINFO | 4 +++- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 70adaf2..2655a4e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = zfs-linux-hardened pkgver = 0.7.6_4.15.7.a.1 - pkgrel = 1 + pkgrel = 2 url = http://zfsonlinux.org/ arch = x86_64 license = CDDL @@ -29,6 +29,8 @@ pkgname = zfs-linux-hardened-headers conflicts = zfs-linux-lts-git-headers conflicts = zfs-linux-headers conflicts = zfs-linux-git-headers + conflicts = zfs-linux-threadripper-headers + conflicts = zfs-linux-threadripper-git-headers conflicts = zfs-linux-vfio-headers conflicts = zfs-linux-vfio-git-headers conflicts = zfs-linux-zen-headers diff --git a/PKGBUILD b/PKGBUILD index c2004c0..432b82e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,7 @@ pkgbase="zfs-linux-hardened" pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers") pkgver=0.7.6_4.15.7.a.1 -pkgrel=1 +pkgrel=2 makedepends=("linux-hardened-headers=4.15.7.a-1" "spl-linux-hardened-headers") arch=("x86_64") url="http://zfsonlinux.org/" @@ -55,7 +55,7 @@ package_zfs-linux-hardened() { package_zfs-linux-hardened-headers() { pkgdesc="Kernel headers for the Zettabyte File System." - conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' ) + conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-threadripper-headers' 'zfs-linux-threadripper-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' ) cd "${srcdir}/zfs-0.7.6" make DESTDIR="${pkgdir}" install rm -r "${pkgdir}/lib"