From 7539f65e1a4cac4cae65bd55e636afca01b7bb2b Mon Sep 17 00:00:00 2001 From: Eric Naim Date: Sun, 17 Nov 2024 22:34:37 +0800 Subject: [PATCH] PKGBUILD: Merge patch `rt-bore` patch sourcing with `cachyos` and `bore` We don't need `bore-cachy-rt` anymore. This can be reverted if we want to pull out of tree rt patches *only* for the rt kernel, however I much prefer including the rt patchset thats from https://github.com/CachyOS/linux/tree/6.12/rt as one of our base patchsets instead. Signed-off-by: Eric Naim --- linux-cachyos-autofdo/PKGBUILD | 4 +--- linux-cachyos-bmq/PKGBUILD | 4 +--- linux-cachyos-bore/PKGBUILD | 4 +--- linux-cachyos-eevdf/PKGBUILD | 4 +--- linux-cachyos-rc/PKGBUILD | 4 +--- linux-cachyos-rt-bore/PKGBUILD | 4 +--- linux-cachyos-server/PKGBUILD | 4 +--- linux-cachyos/PKGBUILD | 4 +--- 8 files changed, 8 insertions(+), 24 deletions(-) diff --git a/linux-cachyos-autofdo/PKGBUILD b/linux-cachyos-autofdo/PKGBUILD index ca6e72f6..a5c0ae45 100644 --- a/linux-cachyos-autofdo/PKGBUILD +++ b/linux-cachyos-autofdo/PKGBUILD @@ -260,12 +260,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index b72c2b46..61a36b9d 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -243,12 +243,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index c80f46a7..2b42be20 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -243,12 +243,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 5cd3df52..2d71017f 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -243,12 +243,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index c7feebbe..901e223d 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -244,12 +244,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (Sched-ext + BORE + Cachy Sauce) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 17cc4cd6..544d1550 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -243,12 +243,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index ad305bad..d569778f 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -244,12 +244,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 1e81d353..3ee2b5ff 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -242,12 +242,10 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) + cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - rt-bore) ## RT with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");;