summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-12-01 22:05:13 +0000
committerArchzfs Buildbot2018-12-01 22:05:13 +0000
commit00d235df7174fa55fdf61d023d7f3277404e0eeb (patch)
treea901677f119bb27291f8126d6e7e6f97201d134d
parent1cdc8d95ba4d6115be5ab238172c0b81625fff49 (diff)
downloadaur-00d235df7174fa55fdf61d023d7f3277404e0eeb.tar.gz
Semi-automated update for kernel 4.19.4.arch1-1 + zfs 0.7.12
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD10
2 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1d35b0a69a38..6d2a707f0a9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
pkgbase = zfs-archiso-linux
- pkgver = 0.7.11_4.18.16.arch1.1
+ pkgver = 0.7.12_4.19.4.arch1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-headers=4.18.16.arch1-1
+ makedepends = linux-headers=4.19.4.arch1-1
makedepends = spl-archiso-linux-headers
depends = kmod
depends = spl-archiso-linux
- depends = zfs-utils=0.7.11
- depends = linux=4.18.16.arch1-1
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.11/zfs-0.7.11.tar.gz
- sha256sums = 4dff9ecce6e02061242d9435febe88c1250de83b96d392b712bccf31c459517a
+ depends = zfs-utils=0.7.12
+ depends = linux=4.19.4.arch1-1
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/zfs-0.7.12.tar.gz
+ sha256sums = 720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848
pkgname = zfs-archiso-linux
pkgdesc = Kernel modules for the Zettabyte File System.
@@ -20,6 +20,7 @@ pkgname = zfs-archiso-linux
provides = zfs
conflicts = zfs-dkms
conflicts = zfs-dkms-git
+ conflicts = zfs-dkms-rc
pkgname = zfs-archiso-linux-headers
pkgdesc = Kernel headers for the Zettabyte File System.
@@ -27,4 +28,5 @@ pkgname = zfs-archiso-linux-headers
conflicts = zfs-headers
conflicts = zfs-dkms
conflicts = zfs-dkms-git
+ conflicts = zfs-dkms-rc
diff --git a/PKGBUILD b/PKGBUILD
index c7812abac27b..ffd669aef9fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@
#
pkgbase="zfs-archiso-linux"
pkgname=("zfs-archiso-linux" "zfs-archiso-linux-headers")
-_zfsver="0.7.11"
-_kernelver="4.18.16.arch1-1"
+_zfsver="0.7.12"
+_kernelver="4.19.4.arch1-1"
_extramodules="${_kernelver/.arch/-arch}-ARCH"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
@@ -27,7 +27,7 @@ makedepends=("linux-headers=${_kernelver}" "spl-archiso-linux-headers")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz")
-sha256sums=("4dff9ecce6e02061242d9435febe88c1250de83b96d392b712bccf31c459517a")
+sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848")
license=("CDDL")
depends=("kmod" 'spl-archiso-linux' "zfs-utils=${_zfsver}" "linux=${_kernelver}")
@@ -47,7 +47,7 @@ package_zfs-archiso-linux() {
install=zfs.install
provides=("zfs")
groups=("archzfs-archiso-linux")
- conflicts=("zfs-dkms" "zfs-dkms-git")
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc")
cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install
cp -r "${pkgdir}"/{lib,usr}
@@ -59,7 +59,7 @@ package_zfs-archiso-linux() {
package_zfs-archiso-linux-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"