From 67bc7bcb1567ab0c2e6efc9669de5a196d042518 Mon Sep 17 00:00:00 2001 From: Eric Naim Date: Mon, 18 Nov 2024 19:14:22 +0800 Subject: [PATCH] PKGBUILD: Use ;;& when sourcing BORE This makes it possible to merge `hardened` with the other options that source BORE (cachyos, bore, rt-bore) while also keeping a separate pattern that sources the hardened patchset. Signed-off-by: Eric Naim --- linux-cachyos-autofdo/PKGBUILD | 9 ++++----- linux-cachyos-bmq/PKGBUILD | 9 ++++----- linux-cachyos-bore/PKGBUILD | 9 ++++----- linux-cachyos-deckify/PKGBUILD | 11 ++++------- linux-cachyos-eevdf/PKGBUILD | 9 ++++----- linux-cachyos-rc/PKGBUILD | 9 ++++----- linux-cachyos-rt-bore/PKGBUILD | 9 ++++----- linux-cachyos-server/PKGBUILD | 9 ++++----- linux-cachyos/PKGBUILD | 9 ++++----- 9 files changed, 36 insertions(+), 47 deletions(-) diff --git a/linux-cachyos-autofdo/PKGBUILD b/linux-cachyos-autofdo/PKGBUILD index a5c0ae45..db786a78 100644 --- a/linux-cachyos-autofdo/PKGBUILD +++ b/linux-cachyos-autofdo/PKGBUILD @@ -260,13 +260,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index 61a36b9d..533d0c3c 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -243,13 +243,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index 2b42be20..7e3005f7 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -243,13 +243,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index 88281739..2ec64965 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -245,15 +245,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # 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");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 2d71017f..c58265ba 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -243,13 +243,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 901e223d..c6e2b641 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -244,13 +244,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 544d1550..ea335984 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -243,13 +243,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index d569778f..3b0ac118 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -244,13 +244,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 3ee2b5ff..6e01b3b3 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -242,13 +242,12 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|bore|rt-bore) # CachyOS Scheduler (BORE) - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE) + source+=("${_patchsource}/sched/0001-bore-cachy.patch");;& bmq) ## Project C Scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; - hardened) ## Hardened Patches with BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch" - "${_patchsource}/misc/0001-hardened.patch");; + hardened) ## Hardened Patches + source+=("${_patchsource}/misc/0001-hardened.patch");; esac export KBUILD_BUILD_HOST=cachyos