5.3.11-2 (clr 5.3.10-867) comment out applied patches, TSX auto

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3dad56b2251a..5fe3c1c5dfdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-clear
 	pkgdesc = Clear Linux
 	pkgver = 5.3.11
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/clearlinux-pkgs/linux
 	arch = x86_64
 	license = GPL2
@@ -16,7 +16,7 @@ pkgbase = linux-clear
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.sign
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.3.11.xz
-	source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.3.10-865
+	source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.3.10-867
 	source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
 	source = add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
diff --git a/PKGBUILD b/PKGBUILD
index b82b9e08f0e4..9f7a6f9c1f58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,10 +65,10 @@ _enable_acs_override="y"
 _major=5.3
 _minor=11
 _srcname=linux-${_major}
-_clr=${_major}.10-865
+_clr=${_major}.10-867
 pkgbase=linux-clear
 pkgver=${_major}.${_minor}
-pkgrel=1
+pkgrel=2
 pkgdesc='Clear Linux'
 arch=('x86_64')
 url="https://github.com/clearlinux-pkgs/linux"
@@ -103,6 +103,7 @@ prepare() {
         echo "${pkgbase#linux}" > localversion.20-pkgname
 
     ### Add Clearlinux patches
+        sed -i '35,52 {s/^/#/}' ${srcdir}/clearlinux/linux.spec
         for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0123|^Patch0130' | sed -n 's/.*: //p'); do
         msg2 "Applying patch ${i}..."
         patch -Np1 -i "$srcdir/clearlinux/${i}"
@@ -201,7 +202,7 @@ prepare() {
 
     ### Save configuration for later reuse
 
-        cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${_kernelname}"
+        cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
 }
 
 build() {