Update to 5.18.12.pf4-1

- New upstream release based on 5.18.12
- Switch to Git Codeberg source instead of tarball plus Github compare

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

3 files changed, 42 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f81d38e94b0..af93eda85ac1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jul  9 15:59:41 UTC 2022
+# Mon Jul 25 02:56:40 UTC 2022
 pkgbase = linux-pf
 	pkgdesc = Linux with the pf-kernel patch (uksm, ZSTD, FSGSBASE and more)
-	pkgver = 5.18.10.pf3
+	pkgver = 5.18.12.pf4
 	pkgrel = 1
 	url = https://codeberg.org/pf-kernel/linux/wiki/README
 	arch = i686
@@ -19,12 +19,11 @@ pkgbase = linux-pf
 	makedepends = pahole
 	makedepends = cpio
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+	source = linux-pf::git+https://codeberg.org/pf-kernel/linux.git#tag=v5.18-pf4
 	source = config.x86_64
 	source = config.i686
 	source = pf_defconfig
 	source = linux.preset
-	source = https://github.com/pfactum/pf-kernel/compare/v5.18...c68ab8d1beb301a8934c27210f21a2751628b0cb.diff
 	source = 90-linux.hook
 	source = 60-linux.hook
 	source = 0002-ZEN-Add-VHBA-driver.patch
@@ -55,12 +54,11 @@ pkgbase = linux-pf
 	source = 0030-ZEN-dm-crypt-Disable-workqueues-for-crypto-operation.patch
 	source = 0015-ZEN-Tune-mgLRU-to-protect-cache-used-in-the-last-sec.patch
 	source = asus_zenith_ii_map.patch::https://bugzilla.kernel.org/attachment.cgi?id=294489
-	sha256sums = 51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee
+	sha256sums = SKIP
 	sha256sums = 5770ad7cc2d34367193cfbeb2a8a37e46c73470b3f6ec7ad63a1cadab4245fbc
 	sha256sums = 93ebf63c9e95a9b8a7ae325ce11508334ca83fd00db9677c483216a6bdef3c68
 	sha256sums = 30566498a4f549e972fcd430d2fc44b2bd643c55bae20096f083f8837d8c43e4
 	sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864
-	sha256sums = 6abad8da0c89385d60703938d348c8e0e0b90b4c98306bbfb0a74c2b02c1e647
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 7ef319249df009695b5477e30536e3edb07bcc93a58a76a63e58b012bb7debb1
@@ -123,7 +121,7 @@ pkgname = linux-pf-headers
 pkgname = linux-pf-preset-default
 	pkgdesc = Linux-pf default preset
 	install = linux.install
-	depends = linux-pf=5.18.10.pf3
-	provides = linux-pf-preset=5.18.10.pf3
+	depends = linux-pf=5.18.12.pf4
+	provides = linux-pf-preset=5.18.12.pf4
 	backup = etc/mkinitcpio.d/linux-pf.preset
 
diff --git a/PKGBUILD b/PKGBUILD
index 781f71e1aadd..66bdab20dffc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -60,14 +60,11 @@ _minor=18
 #_patchlevel=0
 #_subversion=1
 _basekernel=${_major}.${_minor}
-_srcname=linux-${_basekernel}
+_srcname=linux-pf
 pkgbase=linux-pf
-_unpatched_sublevel=10
-_pfrel=3
+_unpatched_sublevel=12
+_pfrel=4
 _kernelname=pf
-_pfpatchhome="https://github.com/pfactum/pf-kernel/compare"
-_pfpatchname="v$_major.$_minor...c68ab8d1beb301a8934c27210f21a2751628b0cb.diff"
-#_pfpatchname="v$_major.$_minor...v$_major.$_minor-pf$_pfrel.diff"
 _projectcpatchname=prjc_v5.15-r1.patch
 _CPUSUFFIXES_KBUILD=(
   # AMD
@@ -91,12 +88,11 @@ url="https://codeberg.org/pf-kernel/linux/wiki/README"
 license=('GPL2')
 options=('!strip')
 makedepends=('git' 'xmlto' 'docbook-xsl' 'xz' 'bc' 'kmod' 'elfutils' 'inetutils' 'pahole' 'cpio')
-source=("https://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekernel}.tar.xz"
+source=("linux-pf::git+https://codeberg.org/pf-kernel/linux.git#tag=v${_major}.${_minor}-pf${_pfrel}"
 	      'config.x86_64'
         'config.i686'
         'pf_defconfig'
         'linux.preset'			        # standard config files for mkinitcpio ramdisk
-	      "${_pfpatchhome}/${_pfpatchname}"	# the -pf patchset
         # bmq-scheudler
         # "https://gitlab.com/alfredchen/projectc/raw/master/$_major.$_minor/$_projectcpatchname"
         "90-linux.hook"
@@ -140,9 +136,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekerne
 
 
 prepare() {
-  cd "${srcdir}/linux-${_basekernel}"
-  msg "Applying pf-kernel patch"
-  patch -Np1 < ${srcdir}/${_pfpatchname}
+  cd "${srcdir}/${_srcname}"
 
   patch -p1 -i ${srcdir}/0002-ZEN-Add-VHBA-driver.patch
   patch -p1 -i ${srcdir}/0003-ZEN-Add-OpenRGB-patches.patch
@@ -225,7 +219,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   # enable $_BATCH_MODE if batch_opts is found in $srcdir
   if [[ -e $srcdir/batch_opts ]] ; then
@@ -241,7 +235,7 @@ build() {
         CPU=${LCPU^^}
         sed -e "s|# CONFIG_$CPU is not set|CONFIG_$CPU=y|" \
             -e '/CONFIG_GENERIC_CPU=y/d' \
-            -i "$srcdir/linux-${_basekernel}/.config"
+            -i "$srcdir/${_srcname}/.config"
       fi
       export _PKGOPT=y
     fi
@@ -575,7 +569,7 @@ _package() {
             VHBA-MODULE)
   replaces=('kernel26-pf')
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   _set_variant_appendix "${pkgbase}"
 
@@ -589,7 +583,7 @@ _package() {
 
   ### c/p from linux-ARCH
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   KARCH=x86
 
@@ -840,12 +834,11 @@ eval "package_linux-pf-headers-variant${LCPU+-$LCPU}() {
      _package-headers-variant
      }"
 
-sha256sums=('51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee'
+sha256sums=('SKIP'
             '5770ad7cc2d34367193cfbeb2a8a37e46c73470b3f6ec7ad63a1cadab4245fbc'
             '93ebf63c9e95a9b8a7ae325ce11508334ca83fd00db9677c483216a6bdef3c68'
             '30566498a4f549e972fcd430d2fc44b2bd643c55bae20096f083f8837d8c43e4'
             '82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
-            '6abad8da0c89385d60703938d348c8e0e0b90b4c98306bbfb0a74c2b02c1e647'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '7ef319249df009695b5477e30536e3edb07bcc93a58a76a63e58b012bb7debb1'
diff --git a/build_pkgs b/build_pkgs
index 8c9294634243..e3229e3c2eae 100755
--- a/build_pkgs
+++ b/build_pkgs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # default config
 # default build arches
 DEFAULT_CPU_ARCHES=(generic generic-v2 generic-v3 generic-v4
@@ -20,7 +20,7 @@ if ! git diff-index --quiet HEAD -- ; then
     echo 'exit'
     exit 1
 fi
-    
+
 # load local build script if found to apply gpg settings or alike, if existing
 if [ -e build_pkgs.local ] ; then
     source build_pkgs.local
@@ -32,21 +32,35 @@ for cpu in ${*:-${DEFAULT_CPU_ARCHES[*]}} ; do
     git checkout PKGBUILD
     case $cpu in
         generic)
-            echo : > batch_opts
-            build_pkg
+            cat >> PKGBUILD <<EOF
+pkgname=(linux-pf-$cpu linux-pf-headers-variant-$cpu linux-pf-headers)
+EOF
             ;;
-        *)       
+        *)
             cat >> PKGBUILD <<EOF
-pkgname=(linux-pf-$cpu)         
-eval "package_linux-pf-$cpu() {         
-     \$(declare -f _package)                            
-     _package   
-     }"                 
+pkgname=(linux-pf-$cpu linux-pf-headers-variant-$cpu)
 EOF
-            echo "LCPU=$cpu" > batch_opts
-            build_pkg
             ;;
     esac
+
+    cat >> PKGBUILD <<EOF
+eval "package_linux-pf-headers-variant-$cpu() {
+     \$(declare -f "_package-headers-variant")
+     _package-headers-variant
+     }"
+eval "package_linux-pf-$cpu() {
+     \$(declare -f "_package")
+     _package
+     }"
+EOF
+    echo "LCPU=$cpu" > batch_opts
+
+    build_pkg
+
     git checkout .
 done
 
+# eval "package_linux-pf-$cpu() {
+#      \$(declare -f _package)
+#      _package
+#      }"