From 3edcf38d87f8f01e838b8a1b6c4c8178f35306cf Mon Sep 17 00:00:00 2001
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
Date: Thu, 11 Dec 2025 22:46:31 +0100
Subject: [PATCH] Sync with CachyOS

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
---
 PKGBUILD | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 6edd38eb03a5..b8c9e2a4434e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -137,6 +137,11 @@ _is_lto_kernel() {
     return $?
 }
 
+_is_ci_build() {
+    [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]
+    return $?
+}
+
 if _is_lto_kernel && [ "$_use_lto_suffix" = "yes"  ]; then
     _pkgsuffix="cachyos-lts-lto"
 elif ! _is_lto_kernel && [ "$_use_gcc_suffix" = "yes" ]; then
@@ -178,7 +183,7 @@ makedepends=(
 )
 
 _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.105.08
+_nv_ver=580.119.02
 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
 _nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
 source=(
@@ -219,8 +224,7 @@ 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/0009-nvkms-Limit-default-maximum-TMDS-character-rate-to-3.patch")
+             "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
 fi
 
 ## List of CachyOS schedulers
@@ -368,19 +372,14 @@ prepare() {
     fi
 
     ### CI-only stuff
-    if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then
+    if _is_ci_build; then
         echo "Detected build inside CI"
-        scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \
+
+        scripts/config \
             -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \
-            -e CONFIG_CC_OPTIMIZE_FOR_SIZE \
-            -d SLUB_DEBUG \
-            -d PM_DEBUG \
-            -d PM_ADVANCED_DEBUG \
-            -d PM_SLEEP_DEBUG \
-            -d ACPI_DEBUG \
-            -d LATENCYTOP \
-            -d SCHED_DEBUG \
-            -d DEBUG_PREEMPT
+            -e CC_OPTIMIZE_FOR_SIZE \
+            -d DEBUG_KERNEL \
+            -e DEBUG_INFO_REDUCED
     fi
 
     ### Enable bbr3
@@ -467,7 +466,6 @@ prepare() {
     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}/0009-nvkms-Limit-default-maximum-TMDS-character-rate-to-3.patch" -d "${srcdir}/${_nv_open_pkg}/"
     fi
 }
 
@@ -488,7 +486,10 @@ _sign_modules() {
 build() {
     cd "$_srcname"
     make "${BUILD_FLAGS[@]}" -j"$(nproc)" all
-    make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
+
+    if ! _is_ci_build; then
+        make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
+    fi
 
     local MODULE_FLAGS=(
        KERNEL_UNAME="${_kernuname}"
@@ -563,7 +564,12 @@ _package-headers() {
 
     echo "Installing build files..."
     install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
-        localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h
+        localversion.* version vmlinux
+
+    if ! _is_ci_build; then
+        install -Dt "$builddir" -m644 tools/bpf/bpftool/vmlinux.h
+    fi
+
     install -Dt "$builddir/kernel" -m644 kernel/Makefile
     install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
     cp -t "$builddir" -a scripts