From 34c1403d867cf54ef53dea63c130e2b527d4eda7 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Fri, 25 Oct 2024 19:46:35 +0200 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 2 +- PKGBUILD | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d8d6eb273aab..28a7eb27fb0e 100644 --- a/.SRCINFO +++ b/.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.11.5 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/PKGBUILD b/PKGBUILD index c8ce6d982762..ee19f6fd0ef7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -166,7 +166,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') @@ -187,7 +187,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=560.35.03 +_nv_ver=565.57.01 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -222,8 +222,7 @@ 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/0001-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -231,9 +230,7 @@ if [ -n "$_build_nvidia_open" ]; then "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" - "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" - "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch" - "${_patchsource}/misc/nvidia/0008-silence-event-assert-until-570.patch" + "${_patchsource}/misc/nvidia/0006-silence-event-assert-until-570.patch" "${_patchsource}/misc/nvidia/0009-fix-hdmi-names.patch") fi @@ -533,8 +530,6 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then @@ -543,12 +538,8 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for 6.12 Module Compilation - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for HDMI names patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-fix-hdmi-names.patch" -d "${srcdir}/${_nv_open_pkg}" fi