Skip to content

Commit

Permalink
PKGBUILD: Use ;;& when sourcing BORE
Browse files Browse the repository at this point in the history 
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 <[email protected]>
  • Loading branch information
@1Naim
1Naim committed Nov 18, 2024
1 parent 2f1b189 commit 67bc7bc
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 47 deletions.
9 changes: 4 additions & 5 deletions linux-cachyos-autofdo/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions linux-cachyos-bmq/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions linux-cachyos-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 4 additions & 7 deletions linux-cachyos-deckify/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions linux-cachyos-eevdf/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions linux-cachyos-rc/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions linux-cachyos-rt-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions linux-cachyos-server/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions linux-cachyos/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 67bc7bc

Please sign in to comment.