From 4cd620dc1ee1555868e12ec94e356637c52f4ed8 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Tue, 17 Jun 2025 18:20:11 +0200 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 2 +- PKGBUILD | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a7da317f81c4..890de14aa526 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.15.2 - 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 473e6ad7a6d1..f29f138768d4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -150,7 +150,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') @@ -174,7 +174,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=575.57.08 +_nv_ver=575.64 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}" source=( @@ -208,8 +208,7 @@ fi # NVIDIA pre-build module support if [ "$_build_nvidia" = "yes" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch" - "${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch") + "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch") fi if [ "$_build_nvidia_open" = "yes" ]; then @@ -460,7 +459,6 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then