From 2f44e3520ca2e4d6e2df993ddf43ab7167ff9e63 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Fri, 10 Mar 2023 20:55:13 +0100 Subject: [PATCH] Bump to 6.2.3-1 Signed-off-by: Piotr Gorski --- .SRCINFO | 18 +++++++++--------- PKGBUILD | 22 +++++++++++++--------- config | 5 ++++- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b0019a7..4ac6691 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.2.2 + pkgver = 6.2.3 pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 @@ -21,18 +21,18 @@ pkgbase = linux-cachyos makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.2.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.3.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/all/0001-cachyos-base-all.patch - source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/misc/0001-Add-latency-priority-for-CFS-class.patch - source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/sched/0001-bore-cachy.patch - sha256sums = c12755a2bb0e19e83457727e949ee1020cc268f44222488256223da8eeecbfb0 - sha256sums = 25d4dd45636b0b2bfb6157578b5ee94b963c4560993a7dc1f7fe642d373e354a + source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/sched/0001-EEVDF.patch + source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/sched/0001-bore-eevdf.patch + sha256sums = b36d0b54fc13770802aff37d8f8d6fec7b950e4f099884e30445ad2265063924 + sha256sums = 0a5944e9e1f9e99939550f5cabb68518721ed01aeb46082cb7a135d4e3c9f736 sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106 - sha256sums = 2996582fd78eb03506bed903711382818252626b2e1ba5d1b498e8be9947e9c2 - sha256sums = a744e56a322e87c3ab9d4ce5b9ffb42e197b66eb45bc1abf1a1a90dafa9aa06a - sha256sums = 200b0b5469fc26e7c77857a13b2e79e85d87e9c8c5461a25ffd58be402a20631 + sha256sums = 7ea50eb9cceae74c2b4417ad3409396ed3e3bcd68b89513801024063be952051 + sha256sums = 76bb9dbca8cba96983e5bc2d55f8aa751f174ac4a508daef984102c4bf21fd64 + sha256sums = d0cacc42325e9bb89588533048830dd5388c92ff3620cf79e73ad3ced9c65840 pkgname = linux-cachyos pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 8c10ed9..d777a77 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,7 +17,8 @@ _cachy_config=${_cachy_config-y} # 'cfs' - select 'Completely Fair Scheduler' # 'tt' - select 'Task Type Scheduler by Hamad Marri' # 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler -_cpusched=${_cpusched-bore} +# 'cachyos' - select BORE Scheduler with the EEVDF Algorithm; Latency Nice as default enabled (slightly modified then upstream) +_cpusched=${_cpusched-cachyos} ## Apply some suggested sysctl values from the bore developer ## These are adjusted to BORE @@ -182,7 +183,7 @@ _bcachefs=${_bcachefs-} # You need to set the values per task # Ananicy-cpp has a implementation for this # You need to configure ananicy-cpp for this or use existing settings -_latency_nice=${_latency_nice-y} +_latency_nice=${_latency_nice-} if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ -n "$_use_lto_suffix" ]; then pkgsuffix=cachyos-lto @@ -193,7 +194,7 @@ else pkgbase=linux-$pkgsuffix fi _major=6.2 -_minor=2 +_minor=3 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -241,6 +242,9 @@ if [ -n "$_latency_nice" ]; then fi case "$_cpusched" in + cachyos) # BMQ/PDS scheduler + source+=("${_patchsource}/sched/0001-EEVDF.patch" + "${_patchsource}/sched/0001-bore-eevdf.patch");; pds|bmq) # BMQ/PDS scheduler source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; tt) ## TT Scheduler @@ -325,7 +329,7 @@ prepare() { pds) scripts/config -e SCHED_ALT -d SCHED_BMQ -e SCHED_PDS -e PSI_DEFAULT_DISABLED;; bmq) scripts/config -e SCHED_ALT -e SCHED_BMQ -d SCHED_PDS -e PSI_DEFAULT_DISABLED;; tt) scripts/config -e TT_SCHED -e TT_ACCOUNTING_STATS;; - bore|hardened) scripts/config -e SCHED_BORE;; + bore|hardened|cachyos) scripts/config -e SCHED_BORE;; cfs) ;; *) _die "The value $_cpusched is invalid. Choose the correct one again.";; esac @@ -841,9 +845,9 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('c12755a2bb0e19e83457727e949ee1020cc268f44222488256223da8eeecbfb0' - '25d4dd45636b0b2bfb6157578b5ee94b963c4560993a7dc1f7fe642d373e354a' +sha256sums=('b36d0b54fc13770802aff37d8f8d6fec7b950e4f099884e30445ad2265063924' + '0a5944e9e1f9e99939550f5cabb68518721ed01aeb46082cb7a135d4e3c9f736' '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106' - '2996582fd78eb03506bed903711382818252626b2e1ba5d1b498e8be9947e9c2' - 'a744e56a322e87c3ab9d4ce5b9ffb42e197b66eb45bc1abf1a1a90dafa9aa06a' - '200b0b5469fc26e7c77857a13b2e79e85d87e9c8c5461a25ffd58be402a20631') + '7ea50eb9cceae74c2b4417ad3409396ed3e3bcd68b89513801024063be952051' + '76bb9dbca8cba96983e5bc2d55f8aa751f174ac4a508daef984102c4bf21fd64' + 'd0cacc42325e9bb89588533048830dd5388c92ff3620cf79e73ad3ced9c65840') diff --git a/config b/config index 1ea2b89..d46bbcc 100644 --- a/config +++ b/config @@ -541,7 +541,7 @@ CONFIG_X86_INTEL_TSX_MODE_AUTO=y CONFIG_X86_SGX=y CONFIG_EFI=y CONFIG_EFI_STUB=y -# CONFIG_EFI_HANDOVER_PROTOCOL is not set +CONFIG_EFI_HANDOVER_PROTOCOL=y CONFIG_EFI_MIXED=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_MAP=y @@ -3408,6 +3408,7 @@ CONFIG_MICROSOFT_MANA=m CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y @@ -5879,6 +5880,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_LOOPBACK=m CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_FLASH_LED_CLASS=m CONFIG_V4L2_FWNODE=m @@ -7104,6 +7106,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y +# CONFIG_SND_HDA_CTL_DEV_ID is not set # end of HD-Audio CONFIG_SND_HDA_CORE=m