Skip to content

Commit

Permalink
Prepare for 6.7 && 6.6 LTS Release
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Jung <[email protected]>
  • Loading branch information
ptr1337 committed Jan 6, 2024
1 parent a34063a commit 08f8f9c
Show file tree
Hide file tree
Showing 20 changed files with 1,756 additions and 838 deletions.
25 changes: 9 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Here is a list of features of Linux kernels prebuilt in the CachyOS repositories
- Very customizable PKGBUILD with many features and improvements.
- `GCC/CLANG` Optimization with automatically found CPU architecture or also selectable CPU architecture.
- Choose between `LLVM/LTO & Thin-LTO` or `GCC`.
- Choose between 300Hz, 500Hz, 600 Hz ,750Hz and 1000Hz. Defaults to 500Hz for BORE/CFS/EEVDF and 1000Hz for other schedulers.
- Choose between 300Hz, 500Hz, 600 Hz ,750Hz and 1000Hz. Defaults to 500Hz
- Kernel Control Flow Integrity (kCFI) selectable when using `LLVM`

### :abacus: CPU enhancements
Expand All @@ -64,7 +64,7 @@ Here is a list of features of Linux kernels prebuilt in the CachyOS repositories
- Latest & improved ZSTD 1.5.5 patch-set.
- UserKSM daemon from pf.
- Improved BFQ Scheduler.
- support for bcachefs.
- Bcachefs enabled by default

### &#128423; Network
- BBRv3 tcp_congestion_control.
Expand All @@ -77,13 +77,12 @@ Here is a list of features of Linux kernels prebuilt in the CachyOS repositories
- LRNG Framework - *default disabled*
- OpenRGB and ACS Override support
- maple-tree, MG-LRU and per-VMA-locks fixes from upstream
- kvm-lru patches from upstream

# [CachyOS repositories](https://mirror.cachyos.org/)
The repositories contain both Arch Linux and CachyOS packages, which have been re-built with flags optimized for performance, stability, and security.
- `x86-64-v4` - currently only kernel packages + LTO.
- `x86-64-v3` - all Arch Linux packages + LTO.
- `x86-64` - all Arch Linux packages + LTO.
- `x86-64-v4` - all Arch Linux packages + LTO
- `x86-64-v3` - all Arch Linux packages + LTO
- `x86-64` - currently only kernel packages

## How to add CachyOS repositories

Expand Down Expand Up @@ -148,10 +147,6 @@ Pay attention to the following text with brackets. **(supported, searched)**
x86-64-v4 (supported, searched)
x86-64-v3 (supported, searched)
x86-64-v2 (supported, searched)
haswell (AT_PLATFORM; supported, searched)
tls (supported, searched)
avx512_1 (supported, searched)
x86_64 (supported, searched)
```

#### Example of CPU incompatible with x86-64-v4 instruction set
Expand Down Expand Up @@ -195,12 +190,10 @@ Include = /etc/pacman.d/cachyos-mirrorlist
## Only add if your CPU does support x86-64-v4 architecture
[cachyos-v4]
Include = /etc/pacman.d/cachyos-v4-mirrorlist
[cachyos-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-core-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-extra-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-core-v4]
Include = /etc/pacman.d/cachyos-v4-mirrorlist
[cachyos-extra-v4]
Include = /etc/pacman.d/cachyos-v4-mirrorlist
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist
```
Expand Down
25 changes: 9 additions & 16 deletions linux-bore/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ _cachy_config=${_cachy_config-y}
### Selecting the CPU scheduler
# ATTENTION - only one of the following values can be selected:
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
# 'cachyos' - select 'EEVDF-BORE Variant Scheduler'
# 'eevdf' - select 'EEVDF Scheduler'
Expand All @@ -37,6 +36,7 @@ _makegconfig=${_makegconfig-}
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU actually runs slower with NUMA enabled.
# See, https://bugs.archlinux.org/task/31187
# It seems that in 2023 this is not really a huge regression anymore
_NUMAdisable=${_NUMAdisable-}

# Compile ONLY used modules to VASTLYreduce the number of modules built
Expand Down Expand Up @@ -111,7 +111,7 @@ _damon=${_damon-}
_lrng_enable=${_lrng_enable-}

# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3" "zen4"
# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
# Other options :
# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
Expand Down Expand Up @@ -156,9 +156,6 @@ _build_zfs=${_build_zfs-}
# This does replace the requirement of nvidia-dkms
_build_nvidia=${_build_nvidia-}

# Enable bcachefs
_bcachefs=${_bcachefs-}

if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ -n "$_use_lto_suffix" ]; then
pkgsuffix=${_cpusched}-lto
pkgbase=linux-$pkgsuffix
Expand All @@ -167,17 +164,17 @@ else
pkgsuffix=${_cpusched}
pkgbase=linux-$pkgsuffix
fi
_major=6.6
_minor=10
_major=6.7
_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 BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgdesc='Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
Expand Down Expand Up @@ -217,7 +214,7 @@ fi
# ZFS support
if [ -n "$_build_zfs" ]; then
makedepends+=(git)
source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
source+=("git+https://github.com/cachyos/zfs.git#commit=2d940c7c29a0ba5f84f50ea9773dea237e27bb08")
fi

# NVIDIA pre-build module support
Expand Down Expand Up @@ -246,13 +243,9 @@ case "$_cpusched" in
"${_patchsource}/misc/0001-hardened.patch");;
sched-ext) ## Sched-ext with BORE
source+=("${_patchsource}/sched/0001-sched-ext.patch"
"${_patchsource}/sched/0001-bore-cachy-ext.patch");;
"${_patchsource}/sched/0001-bore-cachy.patch");;
esac

## bcachefs Support
if [ -n "$_bcachefs" ]; then
source+=("${_patchsource}/misc/0001-bcachefs.patch")
fi
## lrng patchset
if [ -n "$_lrng_enable" ]; then
source+=("${_patchsource}/misc/0001-lrng.patch")
Expand Down
Loading

0 comments on commit 08f8f9c

Please sign in to comment.