From f792a292d20564ab638cb78e373224eb5ab9dd86 Mon Sep 17 00:00:00 2001
From: Josip Ponjavic <josipponjavic@gmail.com>
Date: Sat, 6 May 2023 19:03:45 +0200
Subject: [PATCH] 6.3.1-1 (clr 6.3.1-1311)

---
 .SRCINFO | 14 +++++++-------
 PKGBUILD | 32 +++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 85b10dd..2eb01e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-clear
 	pkgdesc = Clear Linux
-	pkgver = 6.2.14
+	pkgver = 6.3.1
 	pkgrel = 1
 	url = https://github.com/clearlinux-pkgs/linux
 	arch = x86_64
@@ -12,16 +12,16 @@ pkgbase = linux-clear
 	makedepends = pahole
 	makedepends = xmlto
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.2.14.xz
-	source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.2.13-1304
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.sign
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.3.1.xz
+	source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.3.1-1311
 	source = more-uarches-20230105.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20230105.tar.gz
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
+	sha256sums = ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
 	sha256sums = SKIP
-	sha256sums = d4f34f8438c90dd37b38bc8252a38ce94ba2449bed0a82614162690e05dc5577
+	sha256sums = 49216a8d1d09f2e291b56a0e7cb4ea9bce0869719c7823011b3626e80f22f322
 	sha256sums = SKIP
 	sha256sums = 802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23
 
diff --git a/PKGBUILD b/PKGBUILD
index d80efbd..d29ba16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -81,10 +81,10 @@
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
-_major=6.2
-_minor=14
+_major=6.3
+_minor=1
 _srcname=linux-${_major}
-_clr=${_major}.13-1304
+_clr=${_major}.1-1311
 _gcc_more_v='20230105'
 pkgbase=linux-clear
 pkgver=${_major}.${_minor}
@@ -117,6 +117,11 @@ export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
+_make() {
+  test -s version
+  make KERNELRELEASE="$(<version)" "$@"
+}
+
 prepare() {
     cd ${_srcname}
 
@@ -126,10 +131,13 @@ prepare() {
 
     ### Setting version
     echo "Setting version..."
-    scripts/setlocalversion --save-scmversion
     echo "-$pkgrel" > localversion.10-pkgrel
     echo "${pkgbase#linux}" > localversion.20-pkgname
 
+    make defconfig
+    make -s kernelrelease > version
+    make mrproper
+
     ### Add Clearlinux patches
     for i in $(grep '^Patch' ${srcdir}/$pkgbase/linux.spec |\
      grep -Ev '^Patch0132|^Patch0118|^Patch0113|^Patch0138|^Patch0402' | sed -n 's/.*: //p'); do
@@ -230,7 +238,7 @@ prepare() {
                        -d DEBUG_INFO_BTF_MODULES
     fi
 
-    make ${BUILD_FLAGS[*]} olddefconfig
+    _make ${BUILD_FLAGS[*]} olddefconfig
     diff -u $srcdir/$pkgbase/config .config || :
 
     # https://github.com/graysky2/kernel_compiler_patch
@@ -273,7 +281,6 @@ prepare() {
         fi
     fi
 
-    make ${BUILD_FLAGS[*]} -s kernelrelease > version
     echo "Prepared $pkgbase version $(<version)"
 
     [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
@@ -284,7 +291,7 @@ prepare() {
 
 build() {
     cd ${_srcname}
-    make ${BUILD_FLAGS[*]} all
+    _make ${BUILD_FLAGS[*]} all
 }
 
 _package() {
@@ -298,19 +305,18 @@ _package() {
 
     cd $_srcname
 
-    local kernver="$(<version)"
-    local modulesdir="$pkgdir/usr/lib/modules/$kernver"
+    local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
 
     echo "Installing boot image..."
     # systemd expects to find the kernel here to allow hibernation
     # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-    install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
+    install -Dm644 "$(_make -s image_name)" "$modulesdir/vmlinuz"
 
     # Used by mkinitcpio to name the kernel
     echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
     echo "Installing modules..."
-    make ${BUILD_FLAGS[*]} INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+    _make ${BUILD_FLAGS[*]} INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
         DEPMOD=/doesnt/exist modules_install  # Suppress depmod
 
     # remove build and source links
@@ -409,9 +415,9 @@ for _p in "${pkgname[@]}"; do
   }"
 done
 
-sha256sums=('74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1'
+sha256sums=('ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e'
             'SKIP'
-            'd4f34f8438c90dd37b38bc8252a38ce94ba2449bed0a82614162690e05dc5577'
+            '49216a8d1d09f2e291b56a0e7cb4ea9bce0869719c7823011b3626e80f22f322'
             'SKIP'
             '802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23')