From 6fa5055a7c50129a67db36ed93a1274f5df1ee37 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Thu, 10 Oct 2024 13:26:50 +0200 Subject: [PATCH] Bump to 6.11.3-1 Signed-off-by: Piotr Gorski --- .SRCINFO | 12 ++++++------ PKGBUILD | 29 ++++++++++++++++------------- config | 10 +++++++--- linux-cachyos-rt.install | 12 ------------ 4 files changed, 29 insertions(+), 34 deletions(-) delete mode 100644 linux-cachyos-rt.install diff --git a/.SRCINFO b/.SRCINFO index 89506206db0d..05bb237f9283 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-cachyos-eevdf pkgdesc = Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements - pkgver = 6.11.2 + pkgver = 6.11.3 pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 @@ -18,16 +18,16 @@ pkgbase = linux-cachyos-eevdf options = !strip options = !debug options = !lto - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.2.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.3.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/sched/0001-eevdf-next.patch - b2sums = 5720e8dd0bed0247dcfe0bdbce17e36e67bff56811611ae1b04f048b77b6e60c2a48303db73c5a0d4a56c7125cdd695116c4dfd965bd7cb28aa932f427bb3e7d - b2sums = 92e635bb3553896146bea23e5e414853723be9843c94750bc6d4bc327a76925bedb2b3b4481f2816a4691d684e417eae0279c1a2019cb37e9e852914696695da + b2sums = 69582e4745850f3ec004d87859ac88994e3715ed38cd66aff2633fbcb6c20ca2e3be83417cd2c42c2757ab4e084e622c688799b5ad28e15c391adb2afab79a68 + b2sums = de8ce27719874bda9132a4b5b18be05b26e75bdf1ecf7370a65518d400f1840c71859ad41bc5afc93944f096f3eb26d80a7afe0ac8bd377244a3e8cdcac35b5f b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667 - b2sums = cdb2c8d3184c4f0c9c9d50cf78db2e5e4a56eac0162b5d2400277e98c0432fecb96a25c50ef99aae328524bb546c3941e5fb3141e59d4943796574d73cd83182 - b2sums = b74de20dc3dfbb84a4c0014d04f91f7001fd816977471bae9069b24540e969f9404f10ba18d20a7e50e6a8d3e7c1cc74d0942e09da0fe7bfcc741d2d82e540ab + b2sums = d79b732315c88d373946b817ed7deb0215521ec260ac0e3a22f75bf9716d4d1d9e364c24b339e18797c016abacacef139aa7a2a612df23e7fa07cc3ace8638c0 + b2sums = 615936c3f921af5df57106fd94f537cf18c3870095a7cd0e6961aa7dc9dc762a7c8428c16b376cbd36b197da79a542614904572618583716da2ca0ab1beaf8b1 pkgname = linux-cachyos-eevdf pkgdesc = The Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index fa681ad10f90..c9553f78abab 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -118,6 +118,10 @@ _use_llvm_lto=${_use_llvm_lto-none} # https://github.com/CachyOS/linux-cachyos/issues/36 _use_lto_suffix=${_use_lto_suffix-y} +# Use suffix -gcc when requested by the user +# This was added to facilitate https://github.com/CachyOS/linux-cachyos/issues/286 +_use_gcc_suffix=${_use_gcc_suffix-} + # KCFI is a proposed forward-edge control-flow integrity scheme for # Clang, which is more suitable for kernel use than the existing CFI # scheme used by CONFIG_CFI_CLANG. kCFI doesn't require LTO, doesn't @@ -144,14 +148,15 @@ _build_debug=${_build_debug-} if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then _pkgsuffix="cachyos-${_cpusched}-lto" - pkgbase="linux-$_pkgsuffix" - -elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then +elif [ "$_use_llvm_lto" = "none" ] && [ -z "$_use_kcfi" ] && [ "$_use_gcc_suffix" = "y" ]; then + _pkgsuffix="cachyos-${_cpusched}-gcc" +else _pkgsuffix="cachyos-${_cpusched}" - pkgbase="linux-$_pkgsuffix" fi + +pkgbase="linux-$_pkgsuffix" _major=6.11 -_minor=2 +_minor=3 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -242,12 +247,10 @@ case "$_cpusched" in eevdf) ## 6.12 EEVDF patches source+=("${_patchsource}/sched/0001-eevdf-next.patch");; rt) ## EEVDF with RT patches - source+=("${_patchsource}/misc/0001-rt.patch" - linux-cachyos-rt.install);; + source+=("${_patchsource}/misc/0001-rt.patch");; rt-bore) ## RT with BORE Scheduler source+=("${_patchsource}/misc/0001-rt.patch" - "${_patchsource}/sched/0001-bore-cachy-rt.patch" - linux-cachyos-rt.install);; + "${_patchsource}/sched/0001-bore-cachy-rt.patch");; hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; @@ -773,8 +776,8 @@ for _p in "${pkgname[@]}"; do }" done -b2sums=('5720e8dd0bed0247dcfe0bdbce17e36e67bff56811611ae1b04f048b77b6e60c2a48303db73c5a0d4a56c7125cdd695116c4dfd965bd7cb28aa932f427bb3e7d' - '92e635bb3553896146bea23e5e414853723be9843c94750bc6d4bc327a76925bedb2b3b4481f2816a4691d684e417eae0279c1a2019cb37e9e852914696695da' +b2sums=('69582e4745850f3ec004d87859ac88994e3715ed38cd66aff2633fbcb6c20ca2e3be83417cd2c42c2757ab4e084e622c688799b5ad28e15c391adb2afab79a68' + 'de8ce27719874bda9132a4b5b18be05b26e75bdf1ecf7370a65518d400f1840c71859ad41bc5afc93944f096f3eb26d80a7afe0ac8bd377244a3e8cdcac35b5f' 'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667' - 'cdb2c8d3184c4f0c9c9d50cf78db2e5e4a56eac0162b5d2400277e98c0432fecb96a25c50ef99aae328524bb546c3941e5fb3141e59d4943796574d73cd83182' - 'b74de20dc3dfbb84a4c0014d04f91f7001fd816977471bae9069b24540e969f9404f10ba18d20a7e50e6a8d3e7c1cc74d0942e09da0fe7bfcc741d2d82e540ab') + 'd79b732315c88d373946b817ed7deb0215521ec260ac0e3a22f75bf9716d4d1d9e364c24b339e18797c016abacacef139aa7a2a612df23e7fa07cc3ace8638c0' + '615936c3f921af5df57106fd94f537cf18c3870095a7cd0e6961aa7dc9dc762a7c8428c16b376cbd36b197da79a542614904572618583716da2ca0ab1beaf8b1') diff --git a/config b/config index 3262357ce58f..e7993491f419 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.11.2 Kernel Configuration +# Linux/x86 6.11.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20240910" CONFIG_CC_IS_GCC=y @@ -1183,11 +1183,11 @@ CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd" # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y -CONFIG_Z3FOLD=y +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_HAVE_ZSMALLOC=y CONFIG_ZSMALLOC=y CONFIG_ZSMALLOC_STAT=y @@ -11042,6 +11042,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y @@ -11654,6 +11657,7 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_HAS_BTF_TAG=y CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y CONFIG_DEBUG_INFO_BTF_MODULES=y # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set diff --git a/linux-cachyos-rt.install b/linux-cachyos-rt.install deleted file mode 100644 index 5bf59d9cb5eb..000000000000 --- a/linux-cachyos-rt.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - cat << EOF -You install the linux-cachyos kernel variant with RT patches. - -Please make sure that you don't use the ZFS filesystem, as this kernel is not -compatible with it due to licensing issues. -EOF -} - -post_upgrade() { - post_install -}