From 2a1ebdc59bf57f6ae724d34a941bc76d1e1ea3f4 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Tue, 30 Sep 2025 17:59:32 +0200 Subject: [PATCH] Sync with CachyOS Signed-off-by: Piotr Gorski --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++--- config | 13 +++---------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 67e724de5712..d956611a568d 100644 --- a/.SRCINFO +++ b/.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.17.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only @@ -26,7 +26,7 @@ pkgbase = linux-cachyos-bore source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.17/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.17/sched/0001-bore-cachy.patch b2sums = 0edb2324be5638aa75984128aafdba3e50824187d2fcdff8794eab99d85c10c3a17d1e840053c2c83df5ee11fdf69f1c9452c57ecc9dae01c4af38180fe7821a - b2sums = aaf7ad22ac8555d22e41b00f3ecb4d279d85e4be5228d0c070791e8aab6a639c0451719cbbf335cceaaf08041451289ba2e9696491bc77b6f1dac6e02178ebd8 + b2sums = eed81db2b3b273b38d4326b90c26510700fd2a9efb377cfb1be1fd20b05a0506de3d2eb4f34480099c742409af24c052f17cbcd93eb54834cdf8c26c98f4f76d b2sums = 2eb84d4c45d9b8de6f7f8cae7ef527e4b5b26c12f462cfd41604f74cda83a7b1147c1957cadeddbe0db0db0de70e158b063946a29ba5a2b3ffc5593e5915a1ac b2sums = 0c71dafb75e3ec09472f9a3a054048770334506f74a5744ad86a062fea6a2e0f2fd6a393653e058110f836192fc6f965e57036c05e9a4198d9dbbd071b4d07d3 diff --git a/PKGBUILD b/PKGBUILD index 3dc8184bf2ba..7ef3d321c0af 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -150,7 +150,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') @@ -174,7 +174,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=580.82.09 +_nv_ver=580.95.05 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}" source=( @@ -728,6 +728,6 @@ for _p in "${pkgname[@]}"; do done b2sums=('0edb2324be5638aa75984128aafdba3e50824187d2fcdff8794eab99d85c10c3a17d1e840053c2c83df5ee11fdf69f1c9452c57ecc9dae01c4af38180fe7821a' - 'aaf7ad22ac8555d22e41b00f3ecb4d279d85e4be5228d0c070791e8aab6a639c0451719cbbf335cceaaf08041451289ba2e9696491bc77b6f1dac6e02178ebd8' + 'eed81db2b3b273b38d4326b90c26510700fd2a9efb377cfb1be1fd20b05a0506de3d2eb4f34480099c742409af24c052f17cbcd93eb54834cdf8c26c98f4f76d' '2eb84d4c45d9b8de6f7f8cae7ef527e4b5b26c12f462cfd41604f74cda83a7b1147c1957cadeddbe0db0db0de70e158b063946a29ba5a2b3ffc5593e5915a1ac' '0c71dafb75e3ec09472f9a3a054048770334506f74a5744ad86a062fea6a2e0f2fd6a393653e058110f836192fc6f965e57036c05e9a4198d9dbbd071b4d07d3') diff --git a/config b/config index 78d1a9a73081..c41da5aa543b 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.17.0-rc6 Kernel Configuration +# Linux/x86 6.17.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.2.1 20250813" CONFIG_CC_IS_GCC=y @@ -2545,7 +2545,7 @@ CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_SYSFB=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y CONFIG_FW_CS_DSP=m CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_SMI is not set @@ -11534,13 +11534,7 @@ CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" # CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set -CONFIG_SECURITY_APPARMOR=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY=y -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -CONFIG_SECURITY_APPARMOR_EXPORT_BINARY=y -CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y +# CONFIG_SECURITY_APPARMOR is not set CONFIG_SECURITY_LOADPIN=y CONFIG_SECURITY_LOADPIN_ENFORCE=y CONFIG_SECURITY_YAMA=y @@ -11580,7 +11574,6 @@ CONFIG_INTEGRITY_AUDIT=y # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"