upgpkg: zfs-dkms-git 2:2.0.0rc1.r38.gcd80273909-1

switch back to make_gitrev.sh since it got re-added and improved
upstream

bump to -rc1 and make sure the pkgver is correctly generated in line
with pacman/vercmp requirements; requires bumping epoch again

2 files changed, 10 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54cc5bb4dbc8..d04ff23dac5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = zfs-dkms-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 0.8.0.r932.g317dbea17
+	pkgver = 2.0.0rc1.r38.gcd80273909
 	pkgrel = 1
-	epoch = 1
+	epoch = 2
 	url = https://zfsonlinux.org/
 	arch = any
 	license = CDDL
 	makedepends = git
-	provides = ZFS-MODULE=0.8.0.r932.g317dbea17
-	provides = SPL-MODULE=0.8.0.r932.g317dbea17
-	provides = zfs-dkms=0.8.0.r932.g317dbea17
+	provides = ZFS-MODULE=2.0.0rc1.r38.gcd80273909
+	provides = SPL-MODULE=2.0.0rc1.r38.gcd80273909
+	provides = zfs-dkms=2.0.0rc1.r38.gcd80273909
 	provides = spl-dkms
 	provides = zfs
 	conflicts = zfs-dkms
@@ -23,5 +23,5 @@ pkgbase = zfs-dkms-git
 	b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50
 
 pkgname = zfs-dkms-git
-	depends = zfs-utils-git=1:0.8.0.r932.g317dbea17
+	depends = zfs-utils-git=2:2.0.0rc1.r38.gcd80273909
 	depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index 91a7d8a62ff5..d2c0ae4d1112 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
 
 pkgname=zfs-dkms-git
-pkgver=0.8.0.r932.g317dbea17
+pkgver=2.0.0rc1.r38.gcd80273909
 pkgrel=1
-epoch=1
+epoch=2
 pkgdesc="Kernel modules for the Zettabyte File System."
 arch=('any')
 url="https://zfsonlinux.org/"
@@ -27,7 +27,7 @@ b2sums=('SKIP'
 pkgver() {
     cd "${srcdir}"/zfs
 
-    git describe --long | sed 's/^zfs-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    git describe --long | sed 's/^zfs-//;s/-rc/rc/;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -50,8 +50,7 @@ build() {
 
     ./scripts/dkms.mkconf -n zfs -v ${pkgver} -f dkms.conf
     # update metadata
-    printf '#define\tZFS_META_GITREV "%s"\n' "$(git describe --always --long --dirty)" \
-        > include/zfs_gitrev.h
+    ./scripts/make_gitrev.sh
     _meta_release=${pkgver#*.r}
     sed -i -e "s/Release:[[:print:]]*/Release:      ${_meta_release/./_}/" META
 }