diff --git a/linux-cachyos-bmq/.SRCINFO b/linux-cachyos-bmq/.SRCINFO index ceb7b83f..81dae4ed 100644 --- a/linux-cachyos-bmq/.SRCINFO +++ b/linux-cachyos-bmq/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-bmq pkgdesc = Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements pkgver = 6.13.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index 237bed56..3d72b134 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -168,7 +168,7 @@ _stable=${_major} _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') @@ -189,7 +189,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -224,24 +224,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -508,48 +497,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO index 04014f12..48c833dd 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.13.0 - 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 84ec9aec..fed553d9 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -168,7 +168,7 @@ _stable=${_major} _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') @@ -189,7 +189,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -224,24 +224,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -508,48 +497,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-deckify/.SRCINFO b/linux-cachyos-deckify/.SRCINFO index c7a7a5f4..84d394fb 100644 --- a/linux-cachyos-deckify/.SRCINFO +++ b/linux-cachyos-deckify/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-deckify pkgdesc = Linux BORE + Cachy Sauce + Handheld Kernel by CachyOS with other patches and improvements. pkgver = 6.13.0 - 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 2185ed9b..09a13b56 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -167,7 +167,7 @@ _stable=${_major} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE + Cachy Sauce + Handheld Kernel by CachyOS with other patches and improvements.' -pkgrel=1 +pkgrel=2 _kernver="$pkgver-$pkgrel" _kernuname="${pkgver}-${_pkgsuffix}" arch=('x86_64') @@ -188,7 +188,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -225,24 +225,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -509,48 +498,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-eevdf/.SRCINFO b/linux-cachyos-eevdf/.SRCINFO index 860452a8..3c942011 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.13.0 - 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 3de914c7..2e9d8258 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -168,7 +168,7 @@ _stable=${_major} _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') @@ -189,7 +189,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -224,24 +224,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -508,48 +497,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO index f5f47cf1..0323a08a 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.12.10 - 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 fa93cc52..8592e4ca 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -169,7 +169,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') @@ -190,7 +190,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -231,10 +231,7 @@ fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -505,15 +502,10 @@ prepare() { fi if [ "$_build_nvidia_open" = "yes" ]; then + # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO index 52d452a6..01186e68 100644 --- a/linux-cachyos-lts/.SRCINFO +++ b/linux-cachyos-lts/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-lts pkgdesc = Linux BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements - Long Term Service pkgver = 6.12.10 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index 12d08780..fb7bb575 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -169,7 +169,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements - Long Term Service' -pkgrel=1 +pkgrel=2 _kernver="$pkgver-$pkgrel" _kernuname="${pkgver}-${_pkgsuffix}" arch=('x86_64') @@ -190,7 +190,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -231,10 +231,7 @@ fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -503,15 +500,10 @@ prepare() { fi if [ "$_build_nvidia_open" = "yes" ]; then + # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 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 for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO index 3a9f6168..d50bec4e 100644 --- a/linux-cachyos-rc/.SRCINFO +++ b/linux-cachyos-rc/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-rc pkgdesc = Linux BORE + LTO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate pkgver = 6.13.rc7 - 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 e1e1f750..c421d68d 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -193,7 +193,7 @@ _stable=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE + LTO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate' -pkgrel=1 +pkgrel=2 _kernver="$pkgver-$pkgrel" _kernuname="${pkgver}-${_pkgsuffix}" arch=('x86_64') @@ -214,7 +214,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -249,24 +249,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi # Use generated AutoFDO Profile @@ -569,48 +558,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rt-bore/.SRCINFO b/linux-cachyos-rt-bore/.SRCINFO index 59e30fa7..92731b49 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.13.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 8c92c314..cfcf156d 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -168,7 +168,7 @@ _stable=${_major} _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') @@ -189,7 +189,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -224,24 +224,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -508,48 +497,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO index 8953c0ba..62e4cfdb 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.13.0 - 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 a442e5c3..87d1eb6d 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -168,7 +168,7 @@ _stable=${_major} _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') @@ -189,7 +189,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -224,24 +224,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi ## List of CachyOS schedulers @@ -504,48 +493,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO index e9b901ce..c05119f6 100644 --- a/linux-cachyos/.SRCINFO +++ b/linux-cachyos/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE + LTO + AutoFDO Cachy Sauce Kernel by CachyOS with other patches and improvements. pkgver = 6.13.0 - 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 cebc4339..dde28f32 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -194,7 +194,7 @@ _stable=${_major} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE + LTO + AutoFDO Cachy Sauce Kernel by CachyOS with other patches and improvements.' -pkgrel=1 +pkgrel=2 _kernver="$pkgver-$pkgrel" _kernuname="${pkgver}-${_pkgsuffix}" arch=('x86_64') @@ -215,7 +215,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=565.77 +_nv_ver=570.86.16 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -250,24 +250,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-Make-modeset-and-fbdev-default-enabled.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch") fi if [ "$_build_nvidia_open" = "yes" ]; 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/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-silence-event-assert-until-570.patch" - "${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" - "${_patchsource}/misc/nvidia/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" - "${_patchsource}/misc/nvidia/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" - "${_patchsource}/misc/nvidia/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" - "${_patchsource}/misc/nvidia/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" - "${_patchsource}/misc/nvidia/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch") + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch") fi # Use generated AutoFDO Profile @@ -570,48 +559,13 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_pkg}/kernel" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ "$_build_nvidia_open" = "yes" ]; then # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - - # 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 for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for CS2 dmesg spam - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix for HDMI names - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fix build errors on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-crypto-Add-fix-for-6.13-Module-compilation.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch" -d "${srcdir}/${_nv_open_pkg}" - - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch" -d "${srcdir}/${_nv_open_pkg}" - - # Fixes fbdev on 6.13+ - # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 - # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch" -d "${srcdir}/${_nv_open_pkg}" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch" -d "${srcdir}/${_nv_open_pkg}" fi }