summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD8
2 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2859889b8f5e..60883c00e005 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
# Generated by mksrcinfo v8
-# Fri Jul 28 18:51:23 UTC 2017
+# Sun Jul 30 23:19:47 UTC 2017
pkgbase = spl-linux-git
- pkgver = 0.7.0_r0_g1f2671b_4.12.3_1
- pkgrel = 1
+ pkgver = 0.7.0_r1_geed143d_4.12.3_1
+ pkgrel = 2
url = http://zfsonlinux.org/
arch = x86_64
license = GPL
makedepends = linux-headers=4.12.3-1
makedepends = git
- depends = spl-utils-common-git
+ depends = spl-utils-common-git>=0.7.0_r1_geed143d
depends = kmod
depends = linux=4.12.3-1
source = git+https://github.com/zfsonlinux/spl.git
@@ -24,9 +24,10 @@ pkgname = spl-linux-git
pkgname = spl-linux-git-headers
pkgdesc = Solaris Porting Layer kernel headers.
- conflicts = spl-linux-headers
- conflicts = spl-linux-lts-headers
- conflicts = spl-linux-lts-git-headers
+ conflicts = spl-archiso-linux-headers
conflicts = spl-linux-hardened-headers
conflicts = spl-linux-hardened-git-headers
+ conflicts = spl-linux-lts-headers
+ conflicts = spl-linux-lts-git-headers
+ conflicts = spl-linux-headers
diff --git a/PKGBUILD b/PKGBUILD
index e5f8b514a3d1..c8e4d3a85710 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,15 +16,15 @@
#
pkgbase="spl-linux-git"
pkgname=("spl-linux-git" "spl-linux-git-headers")
-pkgver=0.7.0_r0_g1f2671b_4.12.3_1
-pkgrel=1
+pkgver=0.7.0_r1_geed143d_4.12.3_1
+pkgrel=2
makedepends=("linux-headers=4.12.3-1" "git")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/spl.git")
sha256sums=("SKIP")
license=("GPL")
-depends=("spl-utils-common-git" "kmod" "linux=4.12.3-1")
+depends=("spl-utils-common-git>=0.7.0_r1_geed143d" "kmod" "linux=4.12.3-1")
build() {
cd "${srcdir}/spl"
@@ -52,7 +52,7 @@ package_spl-linux-git() {
package_spl-linux-git-headers() {
pkgdesc="Solaris Porting Layer kernel headers."
- conflicts=('spl-linux-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers')
+ conflicts=('spl-archiso-linux-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' )
cd "${srcdir}/spl"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"