Skip to content

Commit

Permalink
Fixup BORE Scheduler option
Browse files Browse the repository at this point in the history 
Signed-off-by: Peter Jung <[email protected]>
  • Loading branch information
@ptr1337
ptr1337 committed Jan 8, 2024
1 parent f07f5d7 commit a30a091
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 21 deletions.
2 changes: 1 addition & 1 deletion linux-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down
4 changes: 2 additions & 2 deletions linux-cachyos-bore/.SRCINFO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ pkgbase = linux-cachyos-bore
source = config
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/sched/0001-bore.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/sched/0001-bore-cachy.patch
b2sums = cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e
b2sums = c7c3eef86b0aefc7ce7c8cc48b4efbb0bfecffc675c63a9e684ed152adf8370e7cfcd9d7b7899d73a6a76c643cf9138472e73fbdd2ac0b453733fcad139a5954
b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
b2sums = 0f091f924fa2f23991bddba283deff215cd4f3df85f780130a6a481868b5d36134605b895793a258cc536f9be678f9bea49cc9a644676e0164eb578cc625daa0
b2sums = b8322875ab6fa428b827456b531247fc39b2969227a4bd6d42bccd5c0928a13ff68207f9b1c95add831b3ef0e379be73dfe357cd2ea86422bbaadd28bc792038
b2sums = 784371c03cce8d01eff2b94d55d084f73deedbad8724dba394c7a5b354d338f31c3114e16937afcaf40ec3e39608e0a905c4724c910bc85195a0fb985f62a626

pkgname = linux-cachyos-bore
pkgdesc = The Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
Expand Down
4 changes: 2 additions & 2 deletions linux-cachyos-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down Expand Up @@ -824,4 +824,4 @@ b2sums=('cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1c
'c7c3eef86b0aefc7ce7c8cc48b4efbb0bfecffc675c63a9e684ed152adf8370e7cfcd9d7b7899d73a6a76c643cf9138472e73fbdd2ac0b453733fcad139a5954'
'43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
'0f091f924fa2f23991bddba283deff215cd4f3df85f780130a6a481868b5d36134605b895793a258cc536f9be678f9bea49cc9a644676e0164eb578cc625daa0'
'b8322875ab6fa428b827456b531247fc39b2969227a4bd6d42bccd5c0928a13ff68207f9b1c95add831b3ef0e379be73dfe357cd2ea86422bbaadd28bc792038')
'784371c03cce8d01eff2b94d55d084f73deedbad8724dba394c7a5b354d338f31c3114e16937afcaf40ec3e39608e0a905c4724c910bc85195a0fb985f62a626')
2 changes: 1 addition & 1 deletion linux-cachyos-eevdf/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down
4 changes: 2 additions & 2 deletions linux-cachyos-hardened/.SRCINFO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ pkgbase = linux-cachyos-hardened
source = config
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/misc/0001-hardened.patch
b2sums = c71e651438216e86e436af032cb529c029351b72b460568bd75858f835212360d646bae27caeb3140a4234f4155553aceec3aa94d761e3a634be7c164eee86a4
b2sums = 20f42891e01b248b0df74e0f395e58314052af1d0f364e93a67180cdae63d13299316d37f61002f13ab11b73f8cf52de91a4f49a3038c965a3cd120625d461e3
b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
b2sums = a5e5c6ad326c2e3522ff6d6208e87c06a1d545dfecc47cd50dc1176dc5409cc8a2ae380e7bc0f2a191d835558fb5c7d5b7de1b2e250b019b7f45088a60bac0cf
b2sums = c3a229fb84489864f0cca5bef47833494af334cca0a69433b8be98e8529d3404ba3186eae3f77331a6464b6981e118872e3f5e596f5151873c17708f07446fbd
b2sums = 0c71a752ea50d5606af54aac3569baa371f88896aad98dd34d405227cd0890d76b71bec4e000bfb2b6d38021303281399c4632952cafde1cc3a6e2c876ced9ce
b2sums = 4122b04145b0b13143ddd878ead159f8c23fa9c086908cc32524ab7c94d17da07e65c5b8dbc25b22dd0309471613e01d381e93c848a59663908420a4fe319dea

pkgname = linux-cachyos-hardened
Expand Down
6 changes: 3 additions & 3 deletions linux-cachyos-hardened/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand All @@ -236,7 +236,7 @@ case "$_cpusched" in
"${_patchsource}/sched/0001-bore-cachy-rt.patch"
linux-cachyos-rt.install);;
hardened) ## Hardened Patches with BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch"
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
"${_patchsource}/misc/0001-hardened.patch");;
sched-ext) ## Sched-ext with BORE
source+=("${_patchsource}/sched/0001-sched-ext.patch"
Expand Down Expand Up @@ -827,5 +827,5 @@ b2sums=('c71e651438216e86e436af032cb529c029351b72b460568bd75858f835212360d646bae
'20f42891e01b248b0df74e0f395e58314052af1d0f364e93a67180cdae63d13299316d37f61002f13ab11b73f8cf52de91a4f49a3038c965a3cd120625d461e3'
'43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
'a5e5c6ad326c2e3522ff6d6208e87c06a1d545dfecc47cd50dc1176dc5409cc8a2ae380e7bc0f2a191d835558fb5c7d5b7de1b2e250b019b7f45088a60bac0cf'
'c3a229fb84489864f0cca5bef47833494af334cca0a69433b8be98e8529d3404ba3186eae3f77331a6464b6981e118872e3f5e596f5151873c17708f07446fbd'
'0c71a752ea50d5606af54aac3569baa371f88896aad98dd34d405227cd0890d76b71bec4e000bfb2b6d38021303281399c4632952cafde1cc3a6e2c876ced9ce'
'4122b04145b0b13143ddd878ead159f8c23fa9c086908cc32524ab7c94d17da07e65c5b8dbc25b22dd0309471613e01d381e93c848a59663908420a4fe319dea')
4 changes: 2 additions & 2 deletions linux-cachyos-lts/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand All @@ -234,7 +234,7 @@ case "$_cpusched" in
"${_patchsource}/sched/0001-bore-cachy-rt.patch"
linux-cachyos-rt.install);;
hardened) ## Hardened Patches with BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch"
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
"${_patchsource}/misc/0001-hardened.patch");;
sched-ext) ## Sched-ext with BORE
source+=("${_patchsource}/sched/0001-sched-ext.patch"
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-rc/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-rt-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-rt/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down
2 changes: 0 additions & 2 deletions linux-cachyos-sched-ext/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Generated by makepkg 6.0.2
# Mon Jan 8 17:53:04 UTC 2024
pkgbase = linux-cachyos-sched-ext
pkgdesc = Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.7.0
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-sched-ext/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-server/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore.patch");;
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch"
linux-cachyos-rt.install);;
Expand Down

3 comments on commit a30a091

@ventureoo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we then remove linux-cachyos-bore if there is no difference between _cpusched=bore and _cpusched=cachyos?

@Shendisx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should since both are now based on 6.7

@ptr1337
Copy link
Member Author

@ptr1337 ptr1337 commented on a30a091 Jan 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think so, since I consider to move sched-ext to cachyos

Please sign in to comment.