From ba57666ae788c5f113cac0d3a4969af21d68f988 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 24 Jan 2021 03:40:23 -0800
Subject: Fix versioning more

---
 PKGBUILD | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 886b803..ce2e0ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -96,13 +96,13 @@ prepare() {
   patch -p1 -i ../0004-HID-wacom-Correct-NULL-dereference-on-AES-pen-proximity.patch
 
 
-  # fix naming schema in EXTRAVERSION of ck patch set
-  sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}"
-
   # ck patch
   echo "Applying ck patch"
   patch -F 3 -Np1 -i ../linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}
 
+  # Remove the -ck EXTRAVERSION
+  sed -re "s/^(.EXTRAVERSION).*$/\1 = /" -i Makefile
+
 
   # graysky gcc patch
   echo "Applying graysky gcc patch"
@@ -118,6 +118,7 @@ prepare() {
   patch -p1 -i ../raid6-default-algo.patch
 
 
+  # Append pkgrel and patchset suffixes
   echo "Setting version..."
   scripts/setlocalversion --save-scmversion
   echo "-$pkgrel" > localversion.10-pkgrel
-- 
cgit v1.2.1