From 4b49b8b1ca597e7918a3135f09f694cd58ff4661 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 21 Aug 2024 16:39:25 +0200 Subject: [PATCH] NVIDIA 560.35.03 rebuild Signed-off-by: Peter Jung --- linux-cachyos-bore/.SRCINFO | 2 +- linux-cachyos-bore/PKGBUILD | 10 +++++++--- linux-cachyos-deckify/.SRCINFO | 2 +- linux-cachyos-deckify/PKGBUILD | 10 +++++++--- linux-cachyos-echo/.SRCINFO | 2 +- linux-cachyos-echo/PKGBUILD | 10 +++++++--- linux-cachyos-eevdf/.SRCINFO | 2 +- linux-cachyos-eevdf/PKGBUILD | 10 +++++++--- linux-cachyos-hardened/.SRCINFO | 2 +- linux-cachyos-hardened/PKGBUILD | 10 +++++++--- linux-cachyos-lts/.SRCINFO | 6 +++--- linux-cachyos-lts/PKGBUILD | 12 ++++++++---- linux-cachyos-rc/.SRCINFO | 2 +- linux-cachyos-rc/PKGBUILD | 10 +++++++--- linux-cachyos-rt-bore/.SRCINFO | 4 ++-- linux-cachyos-rt-bore/PKGBUILD | 12 ++++++++---- linux-cachyos-sched-ext/.SRCINFO | 2 +- linux-cachyos-sched-ext/PKGBUILD | 10 +++++++--- linux-cachyos-server/.SRCINFO | 2 +- linux-cachyos-server/PKGBUILD | 10 +++++++--- linux-cachyos/.SRCINFO | 2 +- linux-cachyos/PKGBUILD | 10 +++++++--- 22 files changed, 93 insertions(+), 49 deletions(-) diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO index 3f3e678a..f2ca81b3 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.6 - pkgrel = 1 + pkgrel = 2 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 e10b6ced..46a3843f 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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-deckify/.SRCINFO b/linux-cachyos-deckify/.SRCINFO index d635a68b..c4dec604 100644 --- a/linux-cachyos-deckify/.SRCINFO +++ b/linux-cachyos-deckify/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-deckify pkgdesc = Linux SCHED-EXT + Cachy Sauce + BORE + Deckify Patches Kernel by CachyOS with other patches and improvements pkgver = 6.10.6 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index ba274b25..84537136 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -163,7 +163,7 @@ _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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -230,7 +230,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -277,6 +278,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -540,6 +542,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-echo/.SRCINFO b/linux-cachyos-echo/.SRCINFO index 54bc51a6..0dcdd09d 100644 --- a/linux-cachyos-echo/.SRCINFO +++ b/linux-cachyos-echo/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-echo pkgdesc = Linux ECHO scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements pkgver = 6.9.9 - pkgrel = 4 + pkgrel = 6 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD index 2643b210..3d3a5034 100644 --- a/linux-cachyos-echo/PKGBUILD +++ b/linux-cachyos-echo/PKGBUILD @@ -163,7 +163,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux ECHO scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements' -pkgrel=4 +pkgrel=6 _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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-eevdf/.SRCINFO b/linux-cachyos-eevdf/.SRCINFO index ecc02abb..f6547c7e 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.6 - pkgrel = 1 + pkgrel = 2 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 0d80a3c9..cc52fa1b 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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO index 4b0ba46a..3c4e01d7 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.6 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index e921a80c..02f5ed4a 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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO index 37b7da14..f30125b9 100644 --- a/linux-cachyos-lts/.SRCINFO +++ b/linux-cachyos-lts/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-cachyos-lts pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.6.46 + pkgver = 6.6.47 pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 @@ -22,12 +22,12 @@ pkgbase = linux-cachyos-lts options = !strip options = !debug options = !lto - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.46.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.47.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch - sha256sums = 052f932396d9c7d84ceeda91226a8ef797c12188bde41e6c419602d990dd45f2 + sha256sums = d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50 sha256sums = 692977cbef1ce2d669e19492bc607f5fb2c6fac0f73c1f37be6c0c5b753c5a08 sha256sums = a91249420d61edb17b8659ab3feca86d24cf3b1c941b14f232c47064fa4f4ce7 sha256sums = 6516e23cf0daed0d565766840342276e00516c732a0e70f996b0e8319221f8c2 diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index 7cfa05fc..989d9e80 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -173,7 +173,7 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then pkgbase=linux-$pkgsuffix fi _major=6.6 -_minor=46 +_minor=47 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -247,7 +247,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -298,6 +299,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -605,6 +607,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } @@ -842,7 +846,7 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('052f932396d9c7d84ceeda91226a8ef797c12188bde41e6c419602d990dd45f2' +sha256sums=('d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50' '692977cbef1ce2d669e19492bc607f5fb2c6fac0f73c1f37be6c0c5b753c5a08' 'a91249420d61edb17b8659ab3feca86d24cf3b1c941b14f232c47064fa4f4ce7' '6516e23cf0daed0d565766840342276e00516c732a0e70f996b0e8319221f8c2' diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO index 0f0c24c3..47336cf7 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.rc4 - 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 ffd3816a..6bc6d792 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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rt-bore/.SRCINFO b/linux-cachyos-rt-bore/.SRCINFO index 4b39125b..5d1fe8ea 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.6 - pkgrel = 1 + pkgrel = 2 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 = 7740fa64764be51df1e3433b02f549dcb187373f790f61a6886fe0cf9ffcfa495c3bbaa123c7f7d4d9ae5726c435c5090140ea735b68caf5efa7f02a4f4f5849 b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667 b2sums = 078169cd2449a144a7e4a3892865c5b0a527df9ae6121b9f7b70af88d93e09dcc83794bf2ad837faf73d58c378705e802e79b83d122e3e0cdfb6438657298dcc - b2sums = 342c4b1ccae34de20db832f24b14f1fa8e6b0962c14e541973929b2cd8ef9d2dc4f731961b9958e521917136ca8df499af7009f941cbb0113d795ff886d93d02 + b2sums = 9bc4b14b44ab6ccbc71afb7d1afa6019d5c986e96da5e6112b9da6d709e7e9a7e6b27aef7ff348fda0629a0f197e6a17571f91ec37f708128f79abe5b0a8dcd3 b2sums = bb101e3fcfffeab6cef10ab97e303de0ae8b4b15b2da3fcf0942df9865d402650564115992bd0a3f3789d1f9ce2302ef4720279196a8d5f5994f4c26c807a8fd b2sums = e395035f1b0b944beca434c1e24264342088365de267cbb83b111f02a029fc78145aec73c14e458bd3ad648c8bb2c2ef30c2ff091b1dad2f9b754ecbeb45e41b diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index f93f3d83..cd131170 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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } @@ -778,6 +782,6 @@ b2sums=('e0e2c2419b6da1a6c5caaf9df669a362bdef3d6fb19742da6c5300a6f6d0994259ea2ac '7740fa64764be51df1e3433b02f549dcb187373f790f61a6886fe0cf9ffcfa495c3bbaa123c7f7d4d9ae5726c435c5090140ea735b68caf5efa7f02a4f4f5849' 'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667' '078169cd2449a144a7e4a3892865c5b0a527df9ae6121b9f7b70af88d93e09dcc83794bf2ad837faf73d58c378705e802e79b83d122e3e0cdfb6438657298dcc' - '342c4b1ccae34de20db832f24b14f1fa8e6b0962c14e541973929b2cd8ef9d2dc4f731961b9958e521917136ca8df499af7009f941cbb0113d795ff886d93d02' + '9bc4b14b44ab6ccbc71afb7d1afa6019d5c986e96da5e6112b9da6d709e7e9a7e6b27aef7ff348fda0629a0f197e6a17571f91ec37f708128f79abe5b0a8dcd3' 'bb101e3fcfffeab6cef10ab97e303de0ae8b4b15b2da3fcf0942df9865d402650564115992bd0a3f3789d1f9ce2302ef4720279196a8d5f5994f4c26c807a8fd' 'e395035f1b0b944beca434c1e24264342088365de267cbb83b111f02a029fc78145aec73c14e458bd3ad648c8bb2c2ef30c2ff091b1dad2f9b754ecbeb45e41b') diff --git a/linux-cachyos-sched-ext/.SRCINFO b/linux-cachyos-sched-ext/.SRCINFO index 026ed8b4..9fd39d14 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.6 - pkgrel = 1 + pkgrel = 2 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 0e13a28b..7716c4b2 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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO index c054c6d6..7851c7fb 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.6 - pkgrel = 1 + pkgrel = 2 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 70c25430..04f5fb37 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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO index 8c794002..cf9cc3a6 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.6 - pkgrel = 1 + pkgrel = 2 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 8a6a9893..eeb00d4c 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=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=560.31.02 +_nv_ver=560.35.03 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -227,7 +227,8 @@ 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/nvidia-open-gcc-ibt-sls.patch" + "${_patchsource}/misc/nvidia/fix-zen5.patch") fi ## List of CachyOS schedulers @@ -274,6 +275,7 @@ prepare() { src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue + [[ $src = fix-zen5.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -537,6 +539,8 @@ 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 Zen5 error print in dmesg + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" fi }