init

2 files changed, 18 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1742f73d5094..5e23062dc160 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,29 @@
 pkgbase = zfs-dkms-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 2.1.99.r1271.g1c0c729ab4
+	pkgver = 2.1.99
 	pkgrel = 1
-	epoch = 2
+	epoch = 1
 	url = https://zfsonlinux.org/
 	arch = x86_64
 	groups = zfs-git
 	license = CDDL
 	makedepends = git
-	depends = zfs-utils-git=2:2.1.99.r1271.g1c0c729ab4
+	depends = zfs-utils-git
 	depends = dkms
-	provides = ZFS-MODULE=2.1.99.r1271.g1c0c729ab4
-	provides = SPL-MODULE=2.1.99.r1271.g1c0c729ab4
-	provides = zfs-dkms=2.1.99.r1271.g1c0c729ab4
+	provides = ZFS-MODULE=2.1.99
+	provides = SPL-MODULE=2.1.99
+	provides = zfs-dkms-raidz-expansion=2.1.99
+	provides = zfs-dkms=2.1.99
 	provides = spl-dkms
+	conflicts = zfs-dkms-raidz-expansion
 	conflicts = zfs-dkms
 	conflicts = spl-dkms
 	replaces = spl-dkms-git
-	source = git+https://github.com/zfsonlinux/zfs.git
+	source = git+https://github.com/nicman23/zfs.git#branch=ahrens-raidz-expand
 	source = 0001-only-build-the-module-in-dkms.conf.patch
 	sha256sums = SKIP
 	sha256sums = 539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5
 	b2sums = SKIP
 	b2sums = a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b
 
-pkgname = zfs-dkms-git
+pkgname = zfs-dkms-raidz-expansion-git
diff --git a/PKGBUILD b/PKGBUILD
index 22dc8bc0f106..27ceda9c394f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,33 +4,28 @@
 
 # PRs are welcome: https://github.com/yurikoles-aur/zfs-dkms-git
 
-pkgname=zfs-dkms-git
-pkgver=2.1.99.r1271.g1c0c729ab4
+pkgname=zfs-dkms-raidz-expansion-git
+pkgbase=zfs-dkms-git
+pkgver=2.1.99
 pkgrel=1
-epoch=2
+epoch=1
 pkgdesc='Kernel modules for the Zettabyte File System.'
 arch=('x86_64')
 url='https://zfsonlinux.org/'
 license=('CDDL')
 groups=('zfs-git')
-depends=("zfs-utils-git=${epoch}:${pkgver}" 'dkms')
+depends=(zfs-utils-git 'dkms')
 makedepends=('git')
-provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" "${pkgname%-git}=${pkgver}" 'spl-dkms')
-conflicts=("${pkgname%-git}" 'spl-dkms')
+provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" "${pkgname%-git}=${pkgver}" "${pkgbase%-git}=${pkgver}" 'spl-dkms')
+conflicts=("${pkgname%-git}" "${pkgbase%-git}" 'spl-dkms')
 replaces=('spl-dkms-git')
-source=("git+https://github.com/zfsonlinux/zfs.git"
+source=('git+https://github.com/nicman23/zfs.git#branch=ahrens-raidz-expand'
         "0001-only-build-the-module-in-dkms.conf.patch")
 sha256sums=('SKIP'
             '539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5')
 b2sums=('SKIP'
         'a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b')
 
-pkgver() {
-    cd zfs
-
-    git describe --long | sed 's/^zfs-//;s/-rc/rc/;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
 prepare() {
     cd zfs