summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2019-05-24 16:05:00 +0000
committerArchzfs Buildbot2019-05-24 16:05:00 +0000
commit84afe999f49f8f032e8c0423231dc6df391fa35a (patch)
tree9b058013fe85974b76116110f4becef064ce7f7f
parentdf175666df4452fc9d3ad885989e47d44d7cf129 (diff)
downloadaur-84afe999f49f8f032e8c0423231dc6df391fa35a.tar.gz
Semi-automated update for kernel 5.1.4.arch1-1 + zfs 0.8.0
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD18
2 files changed, 23 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ea22169a9b..1372bcf8764 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,42 @@
pkgbase = zfs-linux
- pkgver = 0.7.13_5.1.4.arch1.1
+ pkgver = 0.8.0_5.1.4.arch1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
+ makedepends = python
makedepends = linux-headers=5.1.4.arch1-1
- makedepends = spl-linux-headers
depends = kmod
- depends = spl-linux
- depends = zfs-utils=0.7.13
+ depends = zfs-utils=0.8.0
depends = linux=5.1.4.arch1-1
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz
- sha256sums = d23f0d292049b1bc636d2300277292b60248c0bde6a0f4ba707c0cb5df3f8c8d
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0/zfs-0.8.0.tar.gz
+ sha256sums = 0fd92e87f4b9df9686f18e2ac707c16b2eeaf00f682d41c20ea519f3a0fe4705
pkgname = zfs-linux
pkgdesc = Kernel modules for the Zettabyte File System.
install = zfs.install
groups = archzfs-linux
provides = zfs
+ provides = spl
conflicts = zfs-dkms
conflicts = zfs-dkms-git
conflicts = zfs-dkms-rc
+ conflicts = spl-dkms
+ conflicts = spl-dkms-git
conflicts = zfs-linux-git
conflicts = zfs-linux-rc
- replaces = zfs-git
+ conflicts = spl-linux
+ replaces = spl-linux
pkgname = zfs-linux-headers
pkgdesc = Kernel headers for the Zettabyte File System.
provides = zfs-headers
+ provides = spl-headers
conflicts = zfs-headers
conflicts = zfs-dkms
conflicts = zfs-dkms-git
conflicts = zfs-dkms-rc
+ conflicts = spl-dkms
+ conflicts = spl-dkms-git
+ conflicts = spl-headers
diff --git a/PKGBUILD b/PKGBUILD
index 83559bf8772..623d790300d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,19 +17,19 @@
#
pkgbase="zfs-linux"
pkgname=("zfs-linux" "zfs-linux-headers")
-_zfsver="0.7.13"
+_zfsver="0.8.0"
_kernelver="5.1.4.arch1-1"
_extramodules="5.1.4-arch1-1-ARCH"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
pkgrel=1
-makedepends=("linux-headers=${_kernelver}" "spl-linux-headers")
+makedepends=("python" "linux-headers=${_kernelver}")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz")
-sha256sums=("d23f0d292049b1bc636d2300277292b60248c0bde6a0f4ba707c0cb5df3f8c8d")
+sha256sums=("0fd92e87f4b9df9686f18e2ac707c16b2eeaf00f682d41c20ea519f3a0fe4705")
license=("CDDL")
-depends=("kmod" 'spl-linux' "zfs-utils=${_zfsver}" "linux=${_kernelver}")
+depends=("kmod" "zfs-utils=${_zfsver}" "linux=${_kernelver}")
build() {
cd "${srcdir}/zfs-${_zfsver}"
@@ -45,10 +45,10 @@ build() {
package_zfs-linux() {
pkgdesc="Kernel modules for the Zettabyte File System."
install=zfs.install
- provides=("zfs")
+ provides=("zfs" "spl")
groups=("archzfs-linux")
- conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-git' 'zfs-linux-rc')
- replaces=("zfs-git")
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" 'zfs-linux-git' 'zfs-linux-rc' 'spl-linux')
+ replaces=("spl-linux")
cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install
cp -r "${pkgdir}"/{lib,usr}
@@ -59,8 +59,8 @@ package_zfs-linux() {
package_zfs-linux-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
- provides=("zfs-headers")
- conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc")
+ provides=("zfs-headers" "spl-headers")
+ conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" "spl-headers")
cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"