From bd63be881d3d8c7498eb7307b3ac9e2038ad599f Mon Sep 17 00:00:00 2001
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
Date: Fri, 28 Oct 2022 18:10:34 +0200
Subject: [PATCH] Sync with Github

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
---
 .SRCINFO |  6 +++---
 PKGBUILD | 32 ++++++++++++++++----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d21e19a..f4036a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,15 +26,15 @@ pkgbase = linux-cachyos
 	source = config-rt
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/all/0001-cachyos-base-all.patch
-	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/sched/0001-bore.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/misc/0001-Add-latency-priority-for-CFS-class.patch
+	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/sched/0001-bore-cachy.patch
 	sha256sums = 61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e
 	sha256sums = 6c0d6bc4d2978b5ff6da3854c0938e5bbf9a9171202d87c6f43fb7f7ce1cc5bd
 	sha256sums = 06d408a1dad0a31aff812a81725acd1c5d8cb70b34eb2eb5b695c8d426d895da
 	sha256sums = e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e
 	sha256sums = 8cb3cd165819a2624bc7d4724e9a6a64b6e8a0938909acb7b10a5432c04d67d6
-	sha256sums = 4300c9a28206f0cf8f84a248859e65e25107677de35ca0202ea9d3d8dd5586b3
-	sha256sums = 827599a03f551c6c940efd4cfa3a02451f1fdcda5771f95a659f3bfeb8221604
+	sha256sums = 306b5e7de9b644a8249a5eec1c5376be8848d9ff7dd33fcb93dddf7c50ee4595
+	sha256sums = 7f4b6158eb6cb61143bc959b8cbb29ff9a267d551b363ec94382f76259e9c5aa
 
 pkgname = linux-cachyos
 	pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index e0a7510..f152984 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -237,6 +237,18 @@ source=(
 if [ -n "$_build_zfs" ]; then
     source+=("git+https://github.com/cachyos/zfs.git#commit=2eb7f7629a9b1507a8b06ae7efacabea7e394387")
 fi
+## Latency NICE Support
+if [ -n "$_latency_nice" ]; then
+    if [[ "$_cpusched" = "bore"  || "$_cpusched" = "cfs" || "$_cpusched" = "hardened" ]]; then
+         source+=("${_patchsource}/misc/0001-Add-latency-priority-for-CFS-class.patch")
+    fi
+fi
+## NEST Support
+if [ -n "$_nest" ]; then
+    if [[ "$_cpusched" = "bore"  || "$_cpusched" = "cfs" || "$_cpusched" = "hardened" ]]; then
+         source+=("${_patchsource}/sched/0001-NEST.patch")
+    fi
+fi
 ## BMQ Scheduler
 if [ "$_cpusched" = "bmq" ]; then
     source+=("${_patchsource}/sched/0001-prjc-cachy.patch")
@@ -247,7 +259,7 @@ if [ "$_cpusched" = "pds" ]; then
 fi
 ## BORE Scheduler
 if [ "$_cpusched" = "bore" ]; then
-    source+=("${_patchsource}/sched/0001-bore.patch")
+    source+=("${_patchsource}/sched/0001-bore-cachy.patch")
 fi
 ## CacULE Scheduler
 if [ "$_cpusched" = "cacule" ]; then
@@ -282,19 +294,7 @@ if [ -n "$_bcachefs" ]; then
 fi
 ## rt kernel
 if [ -n "$_rtkernel" ]; then
-    source+=("${_patchsource}/misc/0001-rt-rc.patch")
-fi
-## NEST Support
-if [ -n "$_nest" ]; then
-    if [[ "$_cpusched" = "bore"  || "$_cpusched" = "cfs" || "$_cpusched" = "hardened" ]]; then
-         source+=("${_patchsource}/sched/0001-NEST.patch")
-    fi
-fi
-## Latency NICE Support
-if [ -n "$_latency_nice" ]; then
-    if [[ "$_cpusched" = "bore"  || "$_cpusched" = "cfs" || "$_cpusched" = "hardened" ]]; then
-         source+=("${_patchsource}/misc/0001-Add-latency-priority-for-CFS-class.patch")
-    fi
+    source+=("${_patchsource}/misc/0001-rt.patch")
 fi
 
 export KBUILD_BUILD_HOST=cachyos
@@ -1033,5 +1033,5 @@ sha256sums=('61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e'
             '06d408a1dad0a31aff812a81725acd1c5d8cb70b34eb2eb5b695c8d426d895da'
             'e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e'
             '8cb3cd165819a2624bc7d4724e9a6a64b6e8a0938909acb7b10a5432c04d67d6'
-            '4300c9a28206f0cf8f84a248859e65e25107677de35ca0202ea9d3d8dd5586b3'
-            '827599a03f551c6c940efd4cfa3a02451f1fdcda5771f95a659f3bfeb8221604')
+            '306b5e7de9b644a8249a5eec1c5376be8848d9ff7dd33fcb93dddf7c50ee4595'
+            '7f4b6158eb6cb61143bc959b8cbb29ff9a267d551b363ec94382f76259e9c5aa')