Skip to content

Commit 225d811

Browse files
committed
PKGBUILD: Remove global hardened option from $_cpusched
Like the default and handheld kernel, the hardened kernel differs from the other generic cachyos kernels in that it uses its own special config[1]. This means that you can't reproduce a "proper" hardened kernel by simply choosing the `hardened` $_cpusched option. Instead, we should source the patch directly in the main source array, like what we currently do with the handheld patches. This will be addressed in the coming 6.13 stable sync, where no functional changes are intended so even if hardened still stays on 6.12, it should be fine. [1] https://gitlab.archlinux.org/archlinux/packaging/packages/linux-hardened/-/blob/main/config Signed-off-by: Eric Naim <dnaim@cachyos.org>
1 parent fd701cc commit 225d811

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

linux-cachyos-rc/PKGBUILD

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ _cachy_config=${_cachy_config-y}
1515
# ATTENTION - only one of the following values can be selected:
1616
# 'bore' - select 'Burst-Oriented Response Enhancer'
1717
# 'bmq' - select 'BMQ Scheduler'
18-
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
1918
# 'eevdf' - select 'EEVDF Scheduler'
2019
_cpusched=${_cpusched-bore}
2120

@@ -262,12 +261,10 @@ fi
262261

263262
## List of CachyOS schedulers
264263
case "$_cpusched" in
265-
bore|hardened) # CachyOS Scheduler (BORE)
266-
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;&
264+
bore) # CachyOS Scheduler (BORE)
265+
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
267266
bmq) ## Project C Scheduler
268267
source+=("${_patchsource}/sched/0001-prjc-cachy.patch");;
269-
hardened) ## Hardened Patches
270-
source+=("${_patchsource}/misc/0001-hardened.patch");;
271268
esac
272269

273270
export KBUILD_BUILD_HOST=cachyos
@@ -328,7 +325,7 @@ prepare() {
328325
[ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
329326

330327
case "$_cpusched" in
331-
cachyos|bore|hardened) scripts/config -e SCHED_BORE;;
328+
cachyos|bore) scripts/config -e SCHED_BORE;;
332329
bmq) scripts/config -e SCHED_ALT -e SCHED_BMQ;;
333330
eevdf) ;;
334331
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;

0 commit comments

Comments
 (0)