Do not include `git am`-ed patches in pkgver

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbdd77444a1c..9604bb3db78e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = k3s-git
 	pkgdesc = Lightweight Kubernetes
-	pkgver = 1.29.1+k3s2+r33+g7b2cd609e5
+	pkgver = 1.29.1+k3s2+r27+gde825845b2
 	pkgrel = 1
 	url = https://k3s.io
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index f908979d6d75..ad599bbf3257 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ivan Shapovalov <intelfx@intelfx.name>
 
 pkgname=k3s-git
-pkgver=1.29.1+k3s2+r33+g7b2cd609e5
+pkgver=1.29.1+k3s2+r27+gde825845b2
 pkgrel=1
 pkgdesc='Lightweight Kubernetes'
 arch=(x86_64)
@@ -45,12 +45,13 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd k3s
-  git describe --long --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
+  git describe --long --tags orig_head | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd k3s
 
+  git branch -f orig_head
   # fix #8293, #9089, sanitize buildsystem, moar compression
   for p in "${source[@]}"; do
     if [[ $p == *.patch ]]; then