Bump to 5.18.13-1

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 42 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05706e251cc1..d00fc1563f0f 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cacule
 	pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
-	pkgver = 5.18.12
-	pkgrel = 4
+	pkgver = 5.18.13
+	pkgrel = 1
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	arch = x86_64_v3
@@ -21,15 +21,15 @@ pkgbase = linux-cacule
 	makedepends = make
 	makedepends = patch
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.12.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.13.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-cacULE-5.18-migrate.patch
-	sha256sums = 40b74d0942f255da07481710e1083412d06e37e45b8f9d9e34ae856db37b9527
-	sha256sums = 290cfc52f209df028b8693fcbeed276564ca1d1c13023ebed3faa3d56d6d6ede
+	sha256sums = 430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda
+	sha256sums = b275b38abee79f05cd8f03d1284dd1faf498867e9ecf54ea9a7784afb36efe20
 	sha256sums = ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f
-	sha256sums = 37763b7f098fadd029923dafb952f9c9485ff3527e48087b6c5e557e043fa324
+	sha256sums = 6578c745064c71ba0fb9d59fd4b4d224516368607241f5613fad05c44f2ae842
 	sha256sums = 767e142a3f0af19ee8a50287c453f34657fdf93451d5c94a4a8190b56715feb6
 
 pkgname = linux-cacule
diff --git a/PKGBUILD b/PKGBUILD
index 09fdadda5428..dfd4a54fc3cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -125,7 +125,7 @@ else
     pkgbase=linux-$pkgsuffix
 fi
 _major=5.18
-_minor=12
+_minor=13
 #_minorc=$((_minor+1))
 #_rcver=rc8
 pkgver=${_major}.${_minor}
@@ -135,7 +135,7 @@ _stable=${_major}.${_minor}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 pkgdesc='Linux cacULE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=4
+pkgrel=1
 _kernver=$pkgver-$pkgrel
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/CachyOS/linux-cachyos"
@@ -338,8 +338,10 @@ prepare() {
         scripts/config --disable HZ_300 \
             --enable HZ_500 \
             --set-val HZ 500
-    elif [ "$_HZ_ticks" = "300" ]; then
+    else
         echo "Setting tick rate to 300Hz..."
+        scripts/config --enable HZ_300 \
+            --set-val HZ 300
     fi
 
     ### Disable NUMA
@@ -382,7 +384,7 @@ prepare() {
     fi
 
     ### Select tick type
-    if [ "$_tickrate" = "perodic" ]; then
+    if [ "$_tickrate" = "periodic" ]; then
         echo "Enabling periodic ticks..."
         scripts/config --disable NO_HZ_IDLE \
             --disable NO_HZ_FULL \
@@ -390,14 +392,14 @@ prepare() {
             --disable NO_HZ_COMMON \
             --enable HZ_PERIODIC
     elif [ "$_tickrate" = "idle" ]; then
-        echo "Enabling tickless idle..."
+        echo "Enabling idle ticks.."
         scripts/config --disable HZ_PERIODIC \
             --disable NO_HZ_FULL \
             --enable NO_HZ_IDLE \
             --enable NO_HZ \
             --enable NO_HZ_COMMON
     elif [ "$_tickrate" = "full" ]; then
-        echo "Enabling tickless idle..."
+        echo "Enabling full ticks..."
         scripts/config --disable HZ_PERIODIC \
             --disable NO_HZ_IDLE \
             --disable CONTEXT_TRACKING_FORCE \
@@ -406,6 +408,14 @@ prepare() {
             --enable NO_HZ \
             --enable NO_HZ_COMMON \
             --enable CONTEXT_TRACKING
+    else
+        if [ -n "$_tickrate" ]; then
+            error "The value $_tickrate is invalid. Choose the correct one again."
+        else
+            error "The value is empty. Choose the correct one again."
+        fi
+        error "Selecting the tick rate failed!"
+        exit
     fi
 
     ### Select preempt type
@@ -419,7 +429,7 @@ prepare() {
             --enable PREEMPTION \
             --enable PREEMPT_DYNAMIC
     elif [ "$_preempt" = "voluntary" ]; then
-        echo "Enabling tickless idle..."
+        echo "Enabling voluntary preempt..."
         scripts/config --enable PREEMPT_BUILD \
             --disable PREEMPT_NONE \
             --enable PREEMPT_VOLUNTARY \
@@ -427,8 +437,8 @@ prepare() {
             --enable PREEMPT_COUNT \
             --enable PREEMPTION \
             --disable PREEMPT_DYNAMIC
-    elif [ "$_tickrate" = "server" ]; then
-        echo "Enabling tickless idle..."
+    elif [ "$_preempt" = "server" ]; then
+        echo "Enabling server preempt..."
         scripts/config --enable PREEMPT_NONE_BUILD \
             --enable PREEMPT_NONE \
             --disable PREEMPT_VOLUNTARY \
@@ -436,6 +446,14 @@ prepare() {
             --disable PREEMPT_COUNT \
             --disable PREEMPTION \
             --disable PREEMPT_DYNAMIC
+    else
+        if [ -n "$_preempt" ]; then
+            error "The value $_preempt is invalid. Choose the correct one again."
+        else
+            error "The value is empty. Choose the correct one again."
+        fi
+        error "Selecting PREEMPT failed!"
+        exit
     fi
 
     ### Enable O3
@@ -839,8 +857,8 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-sha256sums=('40b74d0942f255da07481710e1083412d06e37e45b8f9d9e34ae856db37b9527'
-            '290cfc52f209df028b8693fcbeed276564ca1d1c13023ebed3faa3d56d6d6ede'
+sha256sums=('430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda'
+            'b275b38abee79f05cd8f03d1284dd1faf498867e9ecf54ea9a7784afb36efe20'
             'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f'
-            '37763b7f098fadd029923dafb952f9c9485ff3527e48087b6c5e557e043fa324'
+            '6578c745064c71ba0fb9d59fd4b4d224516368607241f5613fad05c44f2ae842'
             '767e142a3f0af19ee8a50287c453f34657fdf93451d5c94a4a8190b56715feb6')
diff --git a/config b/config
index 6e0c95df60f3..b6a3e3fbf6fe 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.12 Kernel Configuration
+# Linux/x86 5.18.13 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
@@ -373,7 +373,7 @@ CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
 CONFIG_RETPOLINE=y
 CONFIG_CC_HAS_SLS=y
-CONFIG_SLS=y
+# CONFIG_SLS is not set
 CONFIG_X86_CPU_RESCTRL=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -1239,7 +1239,7 @@ CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IP_TUNNEL=y
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE_COMMON=y
@@ -1249,7 +1249,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_UDP_TUNNEL=y
 CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
@@ -1266,7 +1266,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_CUBIC=m
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -3084,6 +3084,7 @@ CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_WIREGUARD=m
 # CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_OVPN_DCO=y
 CONFIG_EQUALIZER=m
 CONFIG_NET_FC=y
 CONFIG_IFB=m