diff --git a/.SRCINFO b/.SRCINFO index 41df8682a72a..8c1415c49cb4 100644 --- a/.SRCINFO +++ b/.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.14.7 - pkgrel = 2 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/PKGBUILD b/PKGBUILD index 889f7f922c4f..84b51b0fb626 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -156,7 +156,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') @@ -177,7 +177,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=570.144 +_nv_ver=570.153.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}" source=( @@ -212,16 +212,13 @@ 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/0002-CFLAGS-Set-std-gnu17-for-all-compilation-flags.patch") + "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch") fi if [ "$_build_nvidia_open" = "yes" ]; then source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz" "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch" - "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch" - "${_patchsource}/misc/nvidia/0003-Kbuild-Convert-EXTRA_CFLAGS-to-ccflags-y.patch" - "${_patchsource}/misc/nvidia/0008-kbuild-Add-workaround-for-GCC-15-Compilation.patch") + "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch") fi ## List of CachyOS schedulers @@ -464,15 +461,11 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" - # GCC 15 - patch -Np1 -i "${srcdir}/0002-CFLAGS-Set-std-gnu17-for-all-compilation-flags.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/" - patch -Np1 -i "${srcdir}/0003-Kbuild-Convert-EXTRA_CFLAGS-to-ccflags-y.patch" -d"${srcdir}/${_nv_open_pkg}" - patch -Np1 -i "${srcdir}/0008-kbuild-Add-workaround-for-GCC-15-Compilation.patch" -d "${srcdir}/${_nv_open_pkg}/" fi }