Fetch staging branch from remote

2 files changed, 21 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bc7ee16f997..55569709f42c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = zfs-dkms-staging-git
 	pkgdesc = Kernel modules for the Zettabyte File System (release staging branch).
-	pkgver = 2.2.2_r27_gac592318b8
+	pkgver = 2.2.2.r27.gac592318b8
 	pkgrel = 1
 	url = https://zfsonlinux.org/
 	arch = any
 	license = CDDL-1.0
+	makedepends = git
 	provides = ZFS-MODULE
 	provides = SPL-MODULE
 	provides = zfs-dkms
@@ -17,5 +18,6 @@ pkgbase = zfs-dkms-staging-git
 	b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791
 
 pkgname = zfs-dkms-staging-git
-	depends = zfs-utils=2.2.2
+	depends = zfs-utils>=2.2.2
+	depends = zfs-utils<=2.2.3
 	depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index b30f59b82937..4a62c653cffe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,14 @@
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
 _pkgname=zfs
-pkgname=zfs-dkms-staging-git
-_pkgver=2.2.3
-pkgver=2.2.2_r27_gac592318b8
+_git_repo=https://github.com/openzfs/zfs.git
+_git_branch="$(/usr/bin/git ls-remote -h --sort=v:refname "${_git_repo}" 'zfs-*-staging' | tail -n 1)"
+_git_branch=${_git_branch##*/}
+_target_ver=${_git_branch#zfs-}
+_target_ver=${_target_ver%-staging}
+
+pkgname=${_pkgname}-dkms-staging-git
+pkgver=2.2.2.r27.gac592318b8
 pkgrel=1
 pkgdesc="Kernel modules for the Zettabyte File System (release staging branch)."
 arch=('any')
@@ -14,7 +19,8 @@ url="https://zfsonlinux.org/"
 license=('CDDL-1.0')
 provides=("ZFS-MODULE" "SPL-MODULE" "zfs-dkms")
 conflicts=("zfs-dkms")
-source=("${_pkgname}::git+https://github.com/openzfs/zfs.git#branch=zfs-${_pkgver}-staging"
+makedepends=("git")
+source=("${_pkgname}::git+${_git_repo}#branch=${_git_branch}"
         "0001-only-build-the-module-in-dkms.conf.patch")
 sha256sums=('SKIP'
             '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
@@ -31,12 +37,14 @@ metaver() {
 pkgver() {
     cd "${srcdir}/${_pkgname}"
 
-    printf "%s_r%s_g%s" "$(metaver)" "$(git rev-list zfs-$(metaver)..HEAD --count)" "$(git rev-parse --short HEAD)"
+    printf "%s.r%s.g%s" "$(metaver)" "$(git rev-list zfs-$(metaver)..HEAD --count)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
     cd "${srcdir}/${_pkgname}"
 
+    msg2 "Staging branch set to ${_git_branch}"
+
     patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
 
     # remove unneeded sections from module build
@@ -54,14 +62,16 @@ build() {
 
     ./scripts/dkms.mkconf -n ${_pkgname} -v $(metaver) -f dkms.conf
     ./scripts/make_gitrev.sh include/zfs_gitrev.h
+    _meta_release=${pkgver#*.r}
+    sed -i -e "s/Release:[[:print:]]*/Release:       ${_meta_release/./_}/" META
 }
 
 package() {
-    depends=("zfs-utils=$(metaver)" 'dkms')
+    depends=("zfs-utils>=$(metaver)" "zfs-utils<=${_target_ver}" 'dkms')
 
     cd "${srcdir}/${_pkgname}"
 
-    dkmsdir="${pkgdir}/usr/src/${_pkgname}-$(metaver)"
+    dkmsdir="${pkgdir}/usr/src/${_pkgname}-${pkgver}"
     install -d "${dkmsdir}"/{config,scripts}
     cp -a configure dkms.conf Makefile.in META ${_pkgname}_config.h.in ${_pkgname}.release.in include/ module/ "${dkmsdir}"/
     cp config/compile config/config.* config/missing config/*sh "${dkmsdir}"/config/