From ca4bab4a6a2faef89bfb1cf236447c6c9705cac7 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Sat, 25 Feb 2023 15:24:01 +0100 Subject: [PATCH] Bump to 6.2.1 Signed-off-by: Piotr Gorski --- .SRCINFO | 14 +++++++------- PKGBUILD | 20 ++++++++++---------- config | 3 ++- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 035f9b25d900..3cab09aee3f1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-bmq pkgdesc = Linux BMQ scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.2.0 - pkgrel = 4 + pkgver = 6.2.1 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -21,16 +21,16 @@ pkgbase = linux-cachyos-bmq makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.1.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/sched/0001-prjc-cachy.patch - sha256sums = 74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1 - sha256sums = b33cf9e4f29262a9992ad71d1aa87ed2655d3430048ad81f5e4a2a32966a7571 + sha256sums = 2fcc07e1c90ea4ce148f50f9beeb0dca0b6e4b379a768de8abc7a4a26f252534 + sha256sums = 25d4dd45636b0b2bfb6157578b5ee94b963c4560993a7dc1f7fe642d373e354a sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106 - sha256sums = 7bb11fde3c16933b84059ae69333232426ff8e5280a3e13ec354156f06cc5b2f - sha256sums = 4dd5aa6f0d16e6e5e12a8a8408a3ac071a505767b5fda80b9a88b935282f6c0d + sha256sums = c3677d1d56e2f12b0ea471ac19fcba070ecba265c6c37503371bec06df020f72 + sha256sums = 6aa26b667733feed80b9bba11297310d4cb15f41535dbad6a55f9e21ca24992d pkgname = linux-cachyos-bmq pkgdesc = The Linux BMQ scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index b01ee187ffa0..1c7f29daec12 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -193,17 +193,17 @@ else pkgbase=linux-$pkgsuffix fi _major=6.2 -_minor=0 +_minor=1 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -#_stable=${_major}.${_minor} -_stable=${_major} +_stable=${_major}.${_minor} +#_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BMQ scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=4 +pkgrel=1 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -322,8 +322,8 @@ prepare() { [ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again." case "$_cpusched" in - pds) scripts/config -e SCHED_ALT -d SCHED_BMQ -e SCHED_PDS;; - bmq) scripts/config -e SCHED_ALT -e SCHED_BMQ -d SCHED_PDS;; + 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;; cfs) ;; @@ -841,8 +841,8 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1' - 'b33cf9e4f29262a9992ad71d1aa87ed2655d3430048ad81f5e4a2a32966a7571' +sha256sums=('2fcc07e1c90ea4ce148f50f9beeb0dca0b6e4b379a768de8abc7a4a26f252534' + '25d4dd45636b0b2bfb6157578b5ee94b963c4560993a7dc1f7fe642d373e354a' '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106' - '7bb11fde3c16933b84059ae69333232426ff8e5280a3e13ec354156f06cc5b2f' - '4dd5aa6f0d16e6e5e12a8a8408a3ac071a505767b5fda80b9a88b935282f6c0d') + 'c3677d1d56e2f12b0ea471ac19fcba070ecba265c6c37503371bec06df020f72' + '6aa26b667733feed80b9bba11297310d4cb15f41535dbad6a55f9e21ca24992d') diff --git a/config b/config index da6c870c226c..1ea2b8931a1c 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.2.0 Kernel Configuration +# Linux/x86 6.2.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230216" CONFIG_CC_IS_GCC=y @@ -9074,6 +9074,7 @@ CONFIG_INTEL_SCU_PLATFORM=m CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_SIEMENS_SIMATIC_IPC=m CONFIG_WINMATE_FM07_KEYS=m +CONFIG_STEAMDECK=m CONFIG_P2SB=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y