Skip to content

Commit 0bc3e27

Browse files
ptr1337ptr1337
committed
Reapply "6.7: Update cpu scheduler flags (#218)"
This reverts commit 7e2bdfb Signed-off-by: Peter Jung <[email protected]>
1 parent 4494067 commit 0bc3e27

File tree

8 files changed

+24
-56
lines changed

8 files changed

+24
-56
lines changed

‎linux-bore/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

‎linux-cachyos-bore/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

‎linux-cachyos-eevdf/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

‎linux-cachyos-rt-bore/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

‎linux-cachyos-rt/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

‎linux-cachyos-sched-ext/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

‎linux-cachyos-server/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

‎linux-cachyos/PKGBUILD

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,8 @@ fi
224224

225225
## List of CachyOS schedulers
226226
case "$_cpusched" in
227-
cachyos) # CachyOS Scheduler (BORE + SCHED-EXT)
228-
source+=("${_patchsource}/sched/0001-sched-ext.patch"
229-
"${_patchsource}/sched/0001-bore-cachy.patch");;
227+
cachyos|sched-ext) ## SCHED-EXT
228+
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
230229
bore) ## BORE Scheduler
231230
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
232231
rt) ## EEVDF with RT patches
@@ -239,8 +238,6 @@ case "$_cpusched" in
239238
hardened) ## Hardened Patches with BORE Scheduler
240239
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
241240
"${_patchsource}/misc/0001-hardened.patch");;
242-
sched-ext) ## SCHED-EXT
243-
source+=("${_patchsource}/sched/0001-sched-ext.patch");;
244241
esac
245242

246243
## lrng patchset
@@ -299,12 +296,11 @@ prepare() {
299296
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
300297

301298
case "$_cpusched" in
302-
cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
299+
cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;;
303300
bore|hardened) scripts/config -e SCHED_BORE;;
304301
eevdf) ;;
305302
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
306303
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
307-
sched-ext) scripts/config -e SCHED_CLASS_EXT;;
308304
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
309305
esac
310306

0 commit comments

Comments
 (0)