5.4.153-1 (clr 5.4.151-144)

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3a1486f8167..f0ce3eb62427 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-clear-lts2019
 	pkgdesc = Clear Linux lts2019
-	pkgver = 5.4.152
+	pkgver = 5.4.153
 	pkgrel = 1
 	url = https://github.com/clearlinux-pkgs/linux-lts2019
 	arch = x86_64
@@ -14,14 +14,14 @@ pkgbase = linux-clear-lts2019
 	options = !strip
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.152.xz
-	source = clearlinux-lts2019::git+https://github.com/clearlinux-pkgs/linux-lts2019.git#tag=5.4.151-144
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.153.xz
+	source = linux-clear-lts2019::git+https://github.com/clearlinux-pkgs/linux-lts2019.git#tag=5.4.151-144
 	source = more-uarches-20210914.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20210914.tar.gz
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
 	sha256sums = SKIP
-	sha256sums = 493ed821c4e85cafb04c1c4f780d1ef5901e3d0a11d9de6eda0029df39054c4e
+	sha256sums = 8d0587b56ebe715f17c9fac26b1de2e9e9ec355f05c6aa9e2c6bc005bd4e171e
 	sha256sums = SKIP
 	sha256sums = b70720e7537a0b6455edaeb198d52151fb3b3c3a91631b8f43d2e71b694da611
 
diff --git a/PKGBUILD b/PKGBUILD
index 99de2cbb8d05..02d5f4da0412 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -74,7 +74,7 @@ _use_current=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 _major=5.4
-_minor=152
+_minor=153
 _srcname=linux-${_major}
 _clr=${_major}.151-144
 pkgbase=linux-clear-lts2019
@@ -91,7 +91,7 @@ source=(
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign"
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
-  "clearlinux-lts2019::git+https://github.com/clearlinux-pkgs/linux-lts2019.git#tag=${_clr}"
+  "$pkgbase::git+https://github.com/clearlinux-pkgs/linux-lts2019.git#tag=${_clr}"
   "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz"
 )
 
@@ -113,15 +113,15 @@ prepare() {
     echo "${pkgbase#linux}" > localversion.20-pkgname
 
     ### Add Clearlinux patches
-    for i in $(grep '^Patch' ${srcdir}/clearlinux-lts2019/linux-lts2019.spec |\
+    for i in $(grep '^Patch' ${srcdir}/$pkgbase/linux-lts2019.spec |\
         grep -Ev '^Patch0123' | sed -n 's/.*: //p'); do
         echo "Applying patch ${i}..."
-        patch -Np1 -i "$srcdir/clearlinux-lts2019/${i}"
+        patch -Np1 -i "$srcdir/$pkgbase/${i}"
     done
 
     ### Setting config
     echo "Setting config..."
-    cp -Tf $srcdir/clearlinux-lts2019/config ./.config
+    cp -Tf $srcdir/$pkgbase/config ./.config
 
     ### Enable extra stuff from arch kernel
     echo "Enable extra stuff from arch kernel..."
@@ -173,6 +173,7 @@ prepare() {
     scripts/config --enable FONT_TER16x32
 
     make olddefconfig
+    diff -u $srcdir/$pkgbase/config .config || :
 
     # https://github.com/graysky2/kernel_compiler_patch
     # make sure to apply after olddefconfig to allow the next section
@@ -345,7 +346,7 @@ done
 
 sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
             'SKIP'
-            '493ed821c4e85cafb04c1c4f780d1ef5901e3d0a11d9de6eda0029df39054c4e'
+            '8d0587b56ebe715f17c9fac26b1de2e9e9ec355f05c6aa9e2c6bc005bd4e171e'
             'SKIP'
             'b70720e7537a0b6455edaeb198d52151fb3b3c3a91631b8f43d2e71b694da611')