diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO index 54c8ae6f..2f7d0f1c 100644 --- a/linux-cachyos-bore/.SRCINFO +++ b/linux-cachyos-bore/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-bore pkgdesc = Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements pkgver = 6.10.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index 116497b3..2d8de5c3 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-deckify/.SRCINFO b/linux-cachyos-deckify/.SRCINFO index f0dca448..b21cb0a5 100644 --- a/linux-cachyos-deckify/.SRCINFO +++ b/linux-cachyos-deckify/.SRCINFO @@ -1,10 +1,9 @@ pkgbase = linux-cachyos-deckify pkgdesc = Linux SCHED-EXT + Cachy Sauce + BORE + Deckify Patches Kernel by CachyOS with other patches and improvements pkgver = 6.10.3 - pkgrel = 3 + pkgrel = 4 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 - arch = x86_64_v3 license = GPL-2.0-only makedepends = bc makedepends = libelf diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index ff1b8200..9651b223 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -163,10 +163,10 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux SCHED-EXT + Cachy Sauce + BORE + Deckify Patches Kernel by CachyOS with other patches and improvements' -pkgrel=3 +pkgrel=4 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" -arch=('x86_64' 'x86_64_v3') +arch=('x86_64') url="https://github.com/CachyOS/linux-cachyos" license=('GPL-2.0-only') options=('!strip' '!debug' '!lto') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -230,8 +230,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -278,7 +277,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -321,8 +319,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -542,8 +540,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-echo/.SRCINFO b/linux-cachyos-echo/.SRCINFO index 4c49c06f..b2a4453c 100644 --- a/linux-cachyos-echo/.SRCINFO +++ b/linux-cachyos-echo/.SRCINFO @@ -4,7 +4,6 @@ pkgbase = linux-cachyos-echo pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 - arch = x86_64_v3 license = GPL-2.0-only makedepends = bc makedepends = libelf diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD index 8f54584e..0f0e3109 100644 --- a/linux-cachyos-echo/PKGBUILD +++ b/linux-cachyos-echo/PKGBUILD @@ -166,7 +166,7 @@ pkgdesc='Linux ECHO scheduler + Cachy Sauce Kernel by CachyOS with other patches pkgrel=1 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" -arch=('x86_64' 'x86_64_v3') +arch=('x86_64') url="https://github.com/CachyOS/linux-cachyos" license=('GPL-2.0-only') options=('!strip' '!debug' '!lto') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -215,7 +215,7 @@ fi # ZFS support if [ -n "$_build_zfs" ]; then makedepends+=(git) - source+=("git+https://github.com/cachyos/zfs.git#commit=228ff3867f53d31dab403a3b6b3b555eaf8bdc04") + source+=("git+https://github.com/cachyos/zfs.git#commit=55a3483f28e69bf0514abb8c0a8e3812da282e73") fi # NVIDIA pre-build module support @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-eevdf/.SRCINFO b/linux-cachyos-eevdf/.SRCINFO index a736824d..9f011aad 100644 --- a/linux-cachyos-eevdf/.SRCINFO +++ b/linux-cachyos-eevdf/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-eevdf pkgdesc = Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements pkgver = 6.10.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index c0003ea2..b7b57b71 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO index 4736d056..0928c5fc 100644 --- a/linux-cachyos-hardened/.SRCINFO +++ b/linux-cachyos-hardened/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-hardened pkgdesc = Linux BORE scheduler and hardened Kernel by CachyOS with other patches and improvements pkgver = 6.10.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only @@ -33,7 +33,7 @@ pkgbase = linux-cachyos-hardened b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667 b2sums = 5da048ff11b0371fda80f0c06f9b24a322d687effc28a23229381cbdf4f05d206440697dd19225c247e7c106f2c9f9a6877f7f84d210339290445857402d681a b2sums = 9df21e46a1d2e48ad9bc30007586e6c3e7a423b402f606f4ac69f9e08a26b3323d3dcb3537e5188e08de771b1d40abb97f1ed8e53c3f3c8ec66368b0f0662c4a - b2sums = f526b807b0aa60ab37abc44d5a876d465c37c7c799536c53021585f8f6c7553eba65bcdce294b441e127cc73b16f57660fd2ee9b9f970f5d3e7082b44367c1dc + b2sums = 8e9fede2679500ddcc8f7c28138af6b09515b6d424f4901ea9f5297d48d6a3080c56b5dc0f08353089ea8aff038c93e4247c8b67c4f43d27ba5d670146c92946 pkgname = linux-cachyos-hardened pkgdesc = The Linux BORE scheduler and hardened Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index 56422b37..64c3e7f8 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE scheduler and hardened Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } @@ -782,4 +778,4 @@ b2sums=('e114bbaea91d03efa318f5a85c11e28257defa5f0c8467d3a5d467a7985bdfd7c23a5f5 'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667' '5da048ff11b0371fda80f0c06f9b24a322d687effc28a23229381cbdf4f05d206440697dd19225c247e7c106f2c9f9a6877f7f84d210339290445857402d681a' '9df21e46a1d2e48ad9bc30007586e6c3e7a423b402f606f4ac69f9e08a26b3323d3dcb3537e5188e08de771b1d40abb97f1ed8e53c3f3c8ec66368b0f0662c4a' - 'f526b807b0aa60ab37abc44d5a876d465c37c7c799536c53021585f8f6c7553eba65bcdce294b441e127cc73b16f57660fd2ee9b9f970f5d3e7082b44367c1dc') + '8e9fede2679500ddcc8f7c28138af6b09515b6d424f4901ea9f5297d48d6a3080c56b5dc0f08353089ea8aff038c93e4247c8b67c4f43d27ba5d670146c92946') diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO index a9c30338..56ad7c3a 100644 --- a/linux-cachyos-lts/.SRCINFO +++ b/linux-cachyos-lts/.SRCINFO @@ -1,10 +1,9 @@ pkgbase = linux-cachyos-lts pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements pkgver = 6.6.44 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 - arch = x86_64_v3 license = GPL-2.0-only makedepends = bc makedepends = libelf diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index b356b99b..2215c9e7 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -183,10 +183,10 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" -arch=('x86_64' 'x86_64_v3') +arch=('x86_64') url="https://github.com/CachyOS/linux-cachyos" license=('GPL-2.0-only') options=('!strip' '!debug' '!lto') @@ -218,7 +218,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -235,7 +235,7 @@ fi # ZFS support if [ -n "$_build_zfs" ]; then makedepends+=(git) - source+=("git+https://github.com/cachyos/zfs.git#commit=228ff3867f53d31dab403a3b6b3b555eaf8bdc04") + source+=("git+https://github.com/cachyos/zfs.git#commit=55a3483f28e69bf0514abb8c0a8e3812da282e73") fi # NVIDIA pre-build module support @@ -247,11 +247,10 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi -## ToDo: Adjust for new Scheduler Changes +## List of CachyOS schedulers case "$_cpusched" in cachyos) # CachyOS Scheduler (EEVDF + BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; @@ -299,7 +298,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -607,8 +605,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO index 7ff01887..3add2931 100644 --- a/linux-cachyos-rc/.SRCINFO +++ b/linux-cachyos-rc/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-rc pkgdesc = Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements pkgver = 6.11.rc2 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 84be8b5a..deb22a76 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements' -pkgrel=1 +pkgrel=2 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rt-bore/.SRCINFO b/linux-cachyos-rt-bore/.SRCINFO index 6f1d33fb..a628d60b 100644 --- a/linux-cachyos-rt-bore/.SRCINFO +++ b/linux-cachyos-rt-bore/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-rt-bore pkgdesc = Linux BORE-RT + Cachy Sauce Kernel by CachyOS with other patches and improvements pkgver = 6.10.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only @@ -33,7 +33,7 @@ pkgbase = linux-cachyos-rt-bore b2sums = ccf740c8001a5254d07ff3112015798e4c8112d1f8324d6a5d8bdf58fbedd8edc724927e8e43bf8f2a837ca13e0a32e379d36c414349617a4b5d684f84442f7f b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667 b2sums = 5da048ff11b0371fda80f0c06f9b24a322d687effc28a23229381cbdf4f05d206440697dd19225c247e7c106f2c9f9a6877f7f84d210339290445857402d681a - b2sums = ac7f3ad015a1c31da4de4754ee0d4702d5e98e130dae00d02a71e38806f49b442dc2121625e64109e187bb43dc273e9521dea3e7efea7226cfb341a8941eefe3 + b2sums = 67579459ee179a24e607bf5da81fef3244f7fd83e7868677c344d13b99ba85f16059808f9e6398d8be3c6e03260eba3e1e2b5fb40fd5d610a477d2c29c008123 b2sums = a9624b87daa2d25a81a393559bc0dec295f31d368236b1ca9b07b7f0219c2d24a43f0be2f2a862f041978064774a31e80c977e6ad5949ae77886b137312ff757 b2sums = e395035f1b0b944beca434c1e24264342088365de267cbb83b111f02a029fc78145aec73c14e458bd3ad648c8bb2c2ef30c2ff091b1dad2f9b754ecbeb45e41b diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 9ca4447b..50a8b5fe 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE-RT + Cachy Sauce Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } @@ -782,6 +778,6 @@ b2sums=('e114bbaea91d03efa318f5a85c11e28257defa5f0c8467d3a5d467a7985bdfd7c23a5f5 'ccf740c8001a5254d07ff3112015798e4c8112d1f8324d6a5d8bdf58fbedd8edc724927e8e43bf8f2a837ca13e0a32e379d36c414349617a4b5d684f84442f7f' 'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667' '5da048ff11b0371fda80f0c06f9b24a322d687effc28a23229381cbdf4f05d206440697dd19225c247e7c106f2c9f9a6877f7f84d210339290445857402d681a' - 'ac7f3ad015a1c31da4de4754ee0d4702d5e98e130dae00d02a71e38806f49b442dc2121625e64109e187bb43dc273e9521dea3e7efea7226cfb341a8941eefe3' + '67579459ee179a24e607bf5da81fef3244f7fd83e7868677c344d13b99ba85f16059808f9e6398d8be3c6e03260eba3e1e2b5fb40fd5d610a477d2c29c008123' 'a9624b87daa2d25a81a393559bc0dec295f31d368236b1ca9b07b7f0219c2d24a43f0be2f2a862f041978064774a31e80c977e6ad5949ae77886b137312ff757' 'e395035f1b0b944beca434c1e24264342088365de267cbb83b111f02a029fc78145aec73c14e458bd3ad648c8bb2c2ef30c2ff091b1dad2f9b754ecbeb45e41b') diff --git a/linux-cachyos-sched-ext/.SRCINFO b/linux-cachyos-sched-ext/.SRCINFO index d86f9ed2..b71555ce 100644 --- a/linux-cachyos-sched-ext/.SRCINFO +++ b/linux-cachyos-sched-ext/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-sched-ext pkgdesc = Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements pkgver = 6.10.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index f6ad1686..55b70600 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO index 80ddcd2c..f1e27ac0 100644 --- a/linux-cachyos-server/.SRCINFO +++ b/linux-cachyos-server/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-server pkgdesc = Linux EEVDF scheduler Kernel by CachyOS targeted for Servers workloads pkgver = 6.10.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index ae240f7b..6c49363d 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux EEVDF scheduler Kernel by CachyOS targeted for Servers workloads' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO index 658ab5aa..e06fbd45 100644 --- a/linux-cachyos/.SRCINFO +++ b/linux-cachyos/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux SCHED-EXT + BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements pkgver = 6.10.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 0bd17051..458165f6 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux SCHED-EXT + BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=3 _kernver=$pkgver-$pkgrel _kernuname="${pkgver}-${pkgsuffix}" arch=('x86_64') @@ -198,7 +198,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=555.58.02 +_nv_ver=560.31.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,8 +227,7 @@ fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/gsp-fix-stutter.patch") + "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi ## List of CachyOS schedulers @@ -275,7 +274,6 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = gsp-fix-stutter.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,8 +316,8 @@ prepare() { bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; echo) scripts/config -e ECHO_SCHED;; eevdf) ;; - rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; - rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; + rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -539,8 +537,6 @@ prepare() { patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for Stutters in KDE - patch -Np1 -i "${srcdir}/gsp-fix-stutter.patch" -d "${srcdir}/${_nv_open_pkg}" fi }