[lilac] updated to 5.14.8.zen1-2

2 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7f984b77970..d59aec3c1101 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-zen-g14
 	pkgdesc = Linux ZEN
-	pkgver = 5.14.7.zen1
+	pkgver = 5.14.8.zen1
 	pkgrel = 2
-	url = https://github.com/zen-kernel/zen-kernel/commits/v5.14.7-zen1
+	url = https://github.com/zen-kernel/zen-kernel/commits/v5.14.8-zen1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -20,11 +20,11 @@ pkgbase = linux-zen-g14
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel#tag=v5.14.7-zen1
+	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel#tag=v5.14.8-zen1
 	source = config::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux-zen/trunk/config
 	source = git+https://gitlab.com/asus-linux/fedora-kernel.git#branch=rog-5.14
 	sha256sums = SKIP
-	sha256sums = e4dafc832ab5c7401d06a4758048e40e9a3ba7db6e764061708c9bf063e05bff
+	sha256sums = c4fb5934f76a4ca1721e184fb7a8a64d7e1494773586094b16304bcde1435663
 	sha256sums = SKIP
 
 pkgname = linux-zen-g14
diff --git a/PKGBUILD b/PKGBUILD
index 9fdfafdebbc7..2e19549994b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=linux-zen-g14
 _pkgbase=linux-zen
-pkgver=5.14.7.zen1
+pkgver=5.14.8.zen1
 pkgrel=2
 pkgdesc='Linux ZEN'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -23,7 +23,7 @@ source=(
   "git+https://gitlab.com/asus-linux/fedora-kernel.git#branch=rog-5.14"
 )
 sha256sums=('SKIP'
-            'e4dafc832ab5c7401d06a4758048e40e9a3ba7db6e764061708c9bf063e05bff'
+            'c4fb5934f76a4ca1721e184fb7a8a64d7e1494773586094b16304bcde1435663'
             'SKIP')
 
 export KBUILD_BUILD_HOST=archlinux
@@ -31,9 +31,11 @@ export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 prepare() {
+  sed -i 's/CONFIG_AMD_PMC=m/CONFIG_AMD_PMC=y/g' $srcdir/config
   cd $_srcname
 
   cp ../fedora-kernel/0*.patch $srcdir
+  cp ../fedora-kernel/kernel.spec $srcdir
 
   echo "Setting version..."
   scripts/setlocalversion --save-scmversion
@@ -41,17 +43,19 @@ prepare() {
   echo "${pkgbase#linux}" > localversion.20-pkgname
   
   
-  patch -Np1 < ../0002-asus-wmi-Add-dgpu-disable-method.patch
-  rm ../0002-asus-wmi-Add-dgpu-disable-method.patch
-  patch -Np1 <../0003-asus-wmi-Add-egpu-enable-method.patch
-  rm ../0003-asus-wmi-Add-egpu-enable-method.patch
-  patch -Np1 <../0001-asus-wmi-Add-panel-overdrive-functionality.patch
-  rm ../0001-asus-wmi-Add-panel-overdrive-functionality.patch
-  patch -Np1 <../0001-asus-wmi-Add-support-for-platform_profile.patch
-  rm ../0001-asus-wmi-Add-support-for-platform_profile.patch
+  #patch -Np1 < ../0002-asus-wmi-Add-dgpu-disable-method.patch
+  #rm ../0002-asus-wmi-Add-dgpu-disable-method.patch
+  #patch -Np1 <../0003-asus-wmi-Add-egpu-enable-method.patch
+  #rm ../0003-asus-wmi-Add-egpu-enable-method.patch
+  #patch -Np1 <../0001-asus-wmi-Add-panel-overdrive-functionality.patch
+  #rm ../0001-asus-wmi-Add-panel-overdrive-functionality.patch
+  #patch -Np1 <../0001-asus-wmi-Add-support-for-platform_profile.patch
+  #rm ../0001-asus-wmi-Add-support-for-platform_profile.patch
+  #patch -Np1 <../0999-v2-platform-x86-amd-pmc-Export-Idlemask-values-based-on-the-APU.patch
+  #rm ../0999-v2-platform-x86-amd-pmc-Export-Idlemask-values-based-on-the-APU.patch
   cd $srcdir
 
-  for src in $(ls -1 *.patch); do
+  for src in $(cat kernel.spec | grep "ApplyOptionalPatch 0" | sed -e 's/ApplyOptionalPatch //g'); do
     cd $_srcname
     echo "Applying patch $src..."
     patch -Np1 < "../$src"