From dd6b2660f418f0db3d43fc2819f1ae8d9c5835f7 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Thu, 30 Jan 2025 19:32:55 +0100 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 4 ++-- PKGBUILD | 20 ++++++-------------- config | 13 ++++++------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c7854c774c3b..01186e681033 100644 --- a/.SRCINFO +++ b/.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 @@ -24,7 +24,7 @@ pkgbase = linux-cachyos-lts source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-bore-cachy.patch b2sums = 3146bbc9075b84db4c6ad3a64cbb91e3c379d0b8e9e90029eaf6a5bd37ea2b8a0a4ac1227e73d0e8acd20cab392841e046e148523bdb206302ea6c37a934b451 - b2sums = a2747236876de1e02c7bde58be26b18656e619c8271402827c2e62df694d32798fb02f2217590a16ea9ab310fb602331913a5e109534a5ce2afc76603a3fc144 + b2sums = f2836dc202ee935e098b1d160bd74587e5b536e59a8eb5bbb85c52c77b6b319a4244fa9cb410c4205bb9d6458699a7d60cd734346821b57704c7506cb2d78089 b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab b2sums = edfafc06fd1e93f5e4c1b341dc978eae439440ea584e53b4d81600461f2e189656e9dcaff61209ba4b093455c955a84f436e136160687b0d23bfbed433e15bfd b2sums = b8007db21488fcd281dde293aba0dfc7afcf556e19d6f397ea7e017e4254b6c3c97e96be9680868d2c03c3500d7b4cdc6493b2896d819d9cf7debf5ebf2ea964 diff --git a/PKGBUILD b/PKGBUILD index 7e71dff7af0f..fb7bb57520c9 100644 --- a/PKGBUILD +++ b/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=( @@ -219,7 +219,7 @@ fi # ZFS support if [ "$_build_zfs" = "yes" ]; then makedepends+=(git) - source+=("git+https://github.com/cachyos/zfs.git#commit=76745cf5b86540f80e8e5faea85f8685a1b76caa") + source+=("git+https://github.com/cachyos/zfs.git#commit=a034b8e60dbddde9cb16476f341c48a9dfe886b8") fi # NVIDIA pre-build module support @@ -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 } @@ -744,7 +736,7 @@ for _p in "${pkgname[@]}"; do done b2sums=('3146bbc9075b84db4c6ad3a64cbb91e3c379d0b8e9e90029eaf6a5bd37ea2b8a0a4ac1227e73d0e8acd20cab392841e046e148523bdb206302ea6c37a934b451' - 'a2747236876de1e02c7bde58be26b18656e619c8271402827c2e62df694d32798fb02f2217590a16ea9ab310fb602331913a5e109534a5ce2afc76603a3fc144' + 'f2836dc202ee935e098b1d160bd74587e5b536e59a8eb5bbb85c52c77b6b319a4244fa9cb410c4205bb9d6458699a7d60cd734346821b57704c7506cb2d78089' '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab' 'edfafc06fd1e93f5e4c1b341dc978eae439440ea584e53b4d81600461f2e189656e9dcaff61209ba4b093455c955a84f436e136160687b0d23bfbed433e15bfd' 'b8007db21488fcd281dde293aba0dfc7afcf556e19d6f397ea7e017e4254b6c3c97e96be9680868d2c03c3500d7b4cdc6493b2896d819d9cf7debf5ebf2ea964') diff --git a/config b/config index 4878c8ade82d..a9c6ac37505d 100644 --- a/config +++ b/config @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.12.7 Kernel Configuration +# Linux/x86 6.12.10 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20240910" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140201 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24300 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24300 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 CONFIG_RUSTC_VERSION=108200 CONFIG_RUSTC_LLVM_VERSION=190101 @@ -89,7 +89,6 @@ CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_INIT=y -CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y @@ -128,7 +127,9 @@ CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_BPF_UNPRIV_DEFAULT_OFF=y -# CONFIG_BPF_PRELOAD is not set +CONFIG_USERMODE_DRIVER=y +CONFIG_BPF_PRELOAD=y +CONFIG_BPF_PRELOAD_UMD=m CONFIG_BPF_LSM=y # end of BPF subsystem @@ -5291,7 +5292,6 @@ CONFIG_POWER_RESET_MT6323=y CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_TPS65086=y CONFIG_POWER_SEQUENCING=m -CONFIG_POWER_SEQUENCING_QCOM_WCN=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_POWER_SUPPLY_HWMON=y @@ -11862,7 +11862,6 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set # CONFIG_DEBUG_PREEMPT is not set #