kernel 6.12.12

This commit is contained in:
Anders Rytter Hansen 2025-02-03 11:09:15 +01:00
commit 1a262094b5

View file

@ -12,7 +12,7 @@
# Linux Kernel Versions # Linux Kernel Versions
%define _basekver 6.12 %define _basekver 6.12
%define _stablekver 10 %define _stablekver 12
%define _rpmver %{version}-%{release} %define _rpmver %{version}-%{release}
%define _kver %{_rpmver}.%{_arch} %define _kver %{_rpmver}.%{_arch}
@ -32,9 +32,15 @@
# Builds nvidia-open kernel modules with # Builds nvidia-open kernel modules with
# the kernel # the kernel
%define _nv_pkg open-gpu-kernel-modules-%{_nv_ver}
%if 0%{?fedora} >= 42
%define _build_nv 0
%define _nv_ver 570.86.16
%else
%define _build_nv 1 %define _build_nv 1
%define _nv_ver 565.77 %define _nv_ver 565.77
%define _nv_pkg open-gpu-kernel-modules-%{_nv_ver} %define _nv_old 1
%endif
# Define the tickrate used by the kernel # Define the tickrate used by the kernel
# Valid values: 100, 250, 300, 500, 600, 750 and 1000 # Valid values: 100, 250, 300, 500, 600, 750 and 1000
@ -66,7 +72,7 @@
Name: kernel-cachyos-lts%{?_lto_args:-lto}-skylake Name: kernel-cachyos-lts%{?_lto_args:-lto}-skylake
Summary: Linux BORE %{?_lto_args:+ LTO }Cachy Sauce Kernel by CachyOS with other patches and improvements. Summary: Linux BORE %{?_lto_args:+ LTO }Cachy Sauce Kernel by CachyOS with other patches and improvements.
Version: %{_basekver}.%{_stablekver} Version: %{_basekver}.%{_stablekver}
Release:cachylts4%{?_lto_args:.lto}.skylake%{?dist} Release: cachylts1%{?_lto_args:.lto}.skylake%{?dist}
License: GPL-2.0-only License: GPL-2.0-only
URL: https://cachyos.org URL: https://cachyos.org
@ -129,10 +135,12 @@ Patch2: %{_patch_src}/misc/dkms-clang.patch
%endif %endif
%if %{_build_nv} %if %{_build_nv}
Patch10:%{_patch_src}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch Patch10: %{_patch_src}/misc/nvidia/%{?_nv_old:565}/0001-Make-modeset-and-fbdev-default-enabled.patch
Patch11:%{_patch_src}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch %if 0%{?fedora} < 42
Patch12:%{_patch_src}/misc/nvidia/0004-silence-event-assert-until-570.patch Patch11: %{_patch_src}/misc/nvidia/565/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch
Patch13:%{_patch_src}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch Patch12: %{_patch_src}/misc/nvidia/565/0004-silence-event-assert-until-570.patch
Patch13: %{_patch_src}/misc/nvidia/565/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch
%endif
%endif %endif
%description %description
@ -370,6 +378,8 @@ fi
%license COPYING %license COPYING
%ghost /boot/initramfs-%{_kver}.img %ghost /boot/initramfs-%{_kver}.img
%{_kernel_dir}/vmlinuz %{_kernel_dir}/vmlinuz
%{_kernel_dir}/modules.builtin
%{_kernel_dir}/modules.builtin.modinfo
%{_kernel_dir}/symvers.zst %{_kernel_dir}/symvers.zst
%{_kernel_dir}/config %{_kernel_dir}/config
%{_kernel_dir}/System.map %{_kernel_dir}/System.map
@ -389,7 +399,6 @@ Requires: kernel-uname-r = %{_kver}
This package provides kernel modules for the %{name}-core kernel package. This package provides kernel modules for the %{name}-core kernel package.
%post modules %post modules
/sbin/depmod -a %{_kver}
if [ ! -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{_kver} ]; then if [ ! -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{_kver} ]; then
mkdir -p %{_localstatedir}/lib/rpm-state/%{name} mkdir -p %{_localstatedir}/lib/rpm-state/%{name}
touch %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{_kver} touch %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{_kver}
@ -397,6 +406,7 @@ fi
%posttrans modules %posttrans modules
rm -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{_kver} rm -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{_kver}
/sbin/depmod -a %{_kver}
if [ ! -e /run/ostree-booted ]; then if [ ! -e /run/ostree-booted ]; then
if [ -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{_kver} ]; then if [ -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{_kver} ]; then
echo "Running: dracut -f --kver %{_kver}" echo "Running: dracut -f --kver %{_kver}"
@ -406,8 +416,6 @@ fi
%files modules %files modules
%dir %{_kernel_dir} %dir %{_kernel_dir}
%{_kernel_dir}/modules.builtin
%{_kernel_dir}/modules.builtin.modinfo
%{_kernel_dir}/modules.order %{_kernel_dir}/modules.order
%{_kernel_dir}/build %{_kernel_dir}/build
%{_kernel_dir}/source %{_kernel_dir}/source
@ -486,5 +494,3 @@ This package provides nvidia-open %{_nv_ver} kernel modules for %{name}.
%endif %endif
%files %files