From 03ee133a3102440fc6fb40b81f0c40d41d07d55a Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Wed, 3 Apr 2024 19:29:14 +0200 Subject: [PATCH] Bump to 6.8.3 Signed-off-by: Piotr Gorski --- .SRCINFO | 12 ++++++------ PKGBUILD | 28 ++++++++++++++++++---------- config | 10 +++++++--- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 92092a79a032..afe5009b6474 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-eevdf pkgdesc = Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.8.2 - pkgrel = 3 + pkgver = 6.8.3 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -23,14 +23,14 @@ pkgbase = linux-cachyos-eevdf makedepends = python options = !strip options = !debug - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.2.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.3.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.8/all/0001-cachyos-base-all.patch - b2sums = f057c2512040600fbf0df67cf9c7200aee0c06b82b3cf749be8c5685844d2662a585ce17685c7af880c0d9dbbbd81302e5a1fa41c3dbd39869123121a0e82dc2 - b2sums = 8178cdd3224ca5b7ef9e971fdb403b57d4f4e44d3b9de31cf118bc1b195cf5d376b424cd5a5013c10182116b9ed18d09b893633ccf2486454d60bcced32149a0 + b2sums = d03f8938da5a3322447fa639718590f5630cd391de45952bf2ca697d95210cc47d4ff27f26b7ebe5ce2328ea4f4df040ed0f335a3607fa8c05feb17a8c7d545c + b2sums = aed56a9f01bebda81eb39f8a2160538581614d8163cdeb6980f78aab489f9c990349c93e9c82cf5ca93f407bdd8853078fc5dadfddb9c733518e6928ca612212 b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d - b2sums = 2a1405c927f5f21b0f88ffa43dd5137750929ad348d9fa5ee01e8e3d20bf98808be6cbc8a5b0c355245de4347f6db02af4d116262a3a672c790db431ee1cd243 + b2sums = 0c400c649ab765e65a05bc3fa51e7d1bc28f702ffeefa1a4140898d20a992fa57bd1b3ff43d33c032042d1f0321455ab8b6f83afb2beda1ac52c9ba6a4af9e11 pkgname = linux-cachyos-eevdf pkgdesc = The Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 5c89b5086d6e..9e9a0abbd5e7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,6 +18,7 @@ _cachy_config=${_cachy_config-y} # 'rt' - select EEVDF, but includes a series of realtime patches # 'rt-bore' - select Burst-Oriented Response Enhancer, but includes a series of realtime patches # 'sched-ext' - select 'sched-ext' Scheduler, based on EEVDF +# 'echo' - select 'ECHO Scheduler' _cpusched=${_cpusched-eevdf} ### Tweak kernel options prior to a build via nconfig @@ -71,7 +72,7 @@ _per_gov=${_per_gov-} ### Enable TCP_CONG_BBR3 _tcp_bbr3=${_tcp_bbr3-y} -### Running with a 1000HZ, 750Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate +### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate _HZ_ticks=${_HZ_ticks-1000} ## Choose between perodic, idle or full @@ -158,7 +159,7 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then pkgbase=linux-$pkgsuffix fi _major=6.8 -_minor=2 +_minor=3 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -168,7 +169,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=3 +pkgrel=1 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -218,10 +219,13 @@ fi ## List of CachyOS schedulers case "$_cpusched" in - cachyos|sched-ext) ## SCHED-EXT - source+=("${_patchsource}/sched/0001-sched-ext.patch");; + cachyos|sched-ext) ## SCHED-EXT + BORE Scheduler + source+=("${_patchsource}/sched/0001-sched-ext.patch" + "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + echo) ## ECHO Scheduler + source+=("${_patchsource}/sched/0001-echo-cachy.patch");; rt) ## EEVDF with RT patches source+=("${_patchsource}/misc/0001-rt.patch" linux-cachyos-rt.install);; @@ -232,6 +236,8 @@ case "$_cpusched" in hardened) ## Hardened Patches with BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch" "${_patchsource}/misc/0001-hardened.patch");; + sched-ext) ## SCHED-EXT + source+=("${_patchsource}/sched/0001-sched-ext.patch");; esac export KBUILD_BUILD_HOST=cachyos @@ -285,11 +291,13 @@ prepare() { [ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again." case "$_cpusched" in - cachyos|sched-ext) scripts/config -e SCHED_CLASS_EXT;; + cachyos) scripts/config -e SCHED_CLASS_EXT -e SCHED_BORE;; bore|hardened) scripts/config -e SCHED_BORE;; + echo) scripts/config -e ECHO_SCHED;; eevdf) ;; rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;; + sched-ext) scripts/config -e SCHED_CLASS_EXT;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -318,7 +326,7 @@ prepare() { [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again." case "$_HZ_ticks" in - 100|250|500|600|750|1000) + 100|250|500|600|625|750|1000) scripts/config -d HZ_300 -e "HZ_${_HZ_ticks}" --set-val HZ "${_HZ_ticks}";; 300) scripts/config -e HZ_300 --set-val HZ 300;; @@ -711,7 +719,7 @@ for _p in "${pkgname[@]}"; do }" done -b2sums=('f057c2512040600fbf0df67cf9c7200aee0c06b82b3cf749be8c5685844d2662a585ce17685c7af880c0d9dbbbd81302e5a1fa41c3dbd39869123121a0e82dc2' - '8178cdd3224ca5b7ef9e971fdb403b57d4f4e44d3b9de31cf118bc1b195cf5d376b424cd5a5013c10182116b9ed18d09b893633ccf2486454d60bcced32149a0' +b2sums=('d03f8938da5a3322447fa639718590f5630cd391de45952bf2ca697d95210cc47d4ff27f26b7ebe5ce2328ea4f4df040ed0f335a3607fa8c05feb17a8c7d545c' + 'aed56a9f01bebda81eb39f8a2160538581614d8163cdeb6980f78aab489f9c990349c93e9c82cf5ca93f407bdd8853078fc5dadfddb9c733518e6928ca612212' '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d' - '2a1405c927f5f21b0f88ffa43dd5137750929ad348d9fa5ee01e8e3d20bf98808be6cbc8a5b0c355245de4347f6db02af4d116262a3a672c790db431ee1cd243') + '0c400c649ab765e65a05bc3fa51e7d1bc28f702ffeefa1a4140898d20a992fa57bd1b3ff43d33c032042d1f0321455ab8b6f83afb2beda1ac52c9ba6a4af9e11') diff --git a/config b/config index 5d7e4d9473ad..8c4511e48288 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.8.1 Kernel Configuration +# Linux/x86 6.8.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801" CONFIG_CC_IS_GCC=y @@ -24,6 +24,7 @@ CONFIG_PAHOLE_VERSION=126 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y +# CONFIG_ECHO_SCHED is not set # # General setup @@ -518,7 +519,6 @@ CONFIG_X86_DIRECT_GBPAGES=y CONFIG_X86_CPA_STATISTICS=y CONFIG_X86_MEM_ENCRYPT=y CONFIG_AMD_MEM_ENCRYPT=y -# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set CONFIG_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y @@ -561,6 +561,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_500 is not set # CONFIG_HZ_600 is not set # CONFIG_HZ_750 is not set +# CONFIG_HZ_625 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y @@ -836,6 +837,8 @@ CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y +CONFIG_AS_VAES=y +CONFIG_AS_VPCLMULQDQ=y CONFIG_AS_WRUSS=y # @@ -1024,6 +1027,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set # CONFIG_MODULE_SIG_SHA256 is not set # CONFIG_MODULE_SIG_SHA384 is not set CONFIG_MODULE_SIG_SHA512=y @@ -2053,7 +2057,6 @@ CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m -# CONFIG_BT_HS is not set CONFIG_BT_LE=y CONFIG_BT_LE_L2CAP_ECRED=y CONFIG_BT_6LOWPAN=m @@ -6867,6 +6870,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_FP=y CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_AMD_SECURE_DISPLAY=y +CONFIG_AMD_PRIVATE_COLOR=y # end of Display Engine Configuration CONFIG_HSA_AMD=y