Skip to content

Commit

Permalink
linux-cachyos-bore: auto updated to 6.9.0-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilacbot
lilacbot committed May 14, 2024
1 parent ac92bf9 commit 8cfaa0d
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 90 deletions.
67 changes: 17 additions & 50 deletions archlinuxcn/linux-cachyos-bore/PKGBUILD
View file
Expand Up @@ -13,7 +13,7 @@ _cachy_config=${_cachy_config-y}
# ATTENTION - only one of the following values can be selected:
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
# 'cachyos' - select 'EEVDF-BORE Variant Scheduler'
# 'cachyos' - select 'Sched-Ext Scheduler Framework Variant Scheduler with BORE Scheduler'
# 'eevdf' - select 'EEVDF Scheduler'
# 'rt' - select EEVDF, but includes a series of realtime patches
# 'rt-bore' - select Burst-Oriented Response Enhancer, but includes a series of realtime patches
Expand Down Expand Up @@ -82,20 +82,6 @@ _tickrate=${_tickrate-full}
## Choose between full(low-latency), voluntary or server
_preempt=${_preempt-full}

### Enable multigenerational LRU
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
_lru_config=${_lru_config-standard}

### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
_vma_config=${_vma_config-standard}

### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
# 'always' - always enable THP
Expand All @@ -115,9 +101,9 @@ _damon=${_damon-}
# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
#
# Or use the _use_auto_optimization with _use_auto_optimization=y
_processor_opt=${_processor_opt-}

# This does automatically detect your supported CPU and optimizes for it
_use_auto_optimization=${_use_auto_optimization-y}

# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
Expand Down Expand Up @@ -158,18 +144,18 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then
pkgsuffix=cachyos-${_cpusched}
pkgbase=linux-$pkgsuffix
fi
_major=6.8
_minor=9
_major=6.9
_minor=0
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
_stable=${_major}.${_minor}
#_stable=${_major}
#_stable=${_major}.${_minor}
_stable=${_major}
#_stablerc=${_major}-${_rcver}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=4
pkgdesc='Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
Expand Down Expand Up @@ -210,12 +196,13 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
"${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch")
"${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch"
"${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
fi

## List of CachyOS schedulers
case "$_cpusched" in
cachyos) ## SCHED-EXT + BORE Scheduler
cachyos) # CachyOS Scheduler (Sched-ext + BORE + Cachy Sauce)
source+=("${_patchsource}/sched/0001-sched-ext.patch"
"${_patchsource}/sched/0001-bore-cachy-ext.patch");;
bore) ## BORE Scheduler
Expand Down Expand Up @@ -256,6 +243,7 @@ prepare() {
src="${src##*/}"
src="${src%.zst}"
[[ $src = make-modeset-fbdev-default.patch ]] && continue
[[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
Expand Down Expand Up @@ -420,29 +408,7 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr
fi

### Select LRU config
[ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."

case "$_lru_config" in
standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
none) scripts/config -d LRU_GEN;;
*) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
esac

echo "Selecting '$_lru_config' LRU_GEN config..."

### Select VMA config
[ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."

case "$_vma_config" in
standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
none) scripts/config -d PER_VMA_LOCK;;
*) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
esac

echo "Selecting '$_vma_config' PER_VMA_LOCK config..."

### Select THP
[ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
Expand Down Expand Up @@ -530,6 +496,7 @@ prepare() {

# Use fbdev and modeset as default
patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}"
patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}

Expand Down Expand Up @@ -715,8 +682,8 @@ for _p in "${pkgname[@]}"; do
}"
done

b2sums=('0305b6636a4e382855a2804cedc3984f1e891b26b24412e3533b1f29a07459d39be5121d4618da20098623290e922d502b7ac1b774f39e732f23a778a4b5b5be'
'68991dfe372201a6dad87e1f7d1f154708a35e8340f3ad37b490e51860badc3dda3d870b7cf5b30182d0e36a9e3585eaa307cb9a3d9577b9bbc09f58b9b09f23'
b2sums=('4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e'
'541228216bba29398cdb391b88fed7e8a34c8f1192cf73fd07c90bc8bb06e537d935ea940261541322acf2c492479990cf7ff42f017c6e719ecf4e29284324ec'
'653926532b58b6ff84397496c8b247cae8f2fe48b5867ef85096522f9405daf9a32a2ba7cfe4230bf2f01d9ae5951322e96ef9a9e9ba04d4f050aedace1c48c7'
'6a282541219ff38300c1e382161715d3a1bcc8cdca08eb306a007be2166e5c89d420b4ab0f9ec3b4a20f7598f6bb5cc0fffd501d0919d5010ba4276d9154629f'
'b768b9ceae2eb07964e4cde7a6894744a14eb6f5f2ebd68353035085020c1cdbc4151a8d28d6c70f27a780f31297589d00bf0fdf7faca00b436dfe631608419c')
'2a5d72807eb08aefee0e7ee35a617c1dc87a99b2f41857b8687dce0e106910b5bae07e2995784df9c14e37c63afb860f3f3a8b422ac29d83d3cdff87b176758e'
'4e57dfcf72b57fb049b6ff3b3b842704b0025df3f816ac9c01d6a6fc68e31813bcc400bbd6a713c5fdd939657e35fde074ef3234848f15c7e58651e46d285d7e')

0 comments on commit 8cfaa0d

Please sign in to comment.