From bbdde5e430eacb82e785a17011cd64a024663c24 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Tue, 31 May 2022 19:16:31 +0200 Subject: [PATCH] 5.18.1-2 --- .SRCINFO | 22 ++++++++++------------ PKGBUILD | 25 ++++++++++++------------- config | 2 +- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2af7b68..4f866b6 100755 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements - pkgver = 5.18.0 - pkgrel = 3 + pkgver = 5.18.1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -24,7 +24,7 @@ pkgbase = linux-cachyos makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.1.tar.xz source = config source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch @@ -35,7 +35,6 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cpu.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fixes.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch @@ -44,22 +43,21 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch source = auto-cpu-optimization.sh - sha256sums = 51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee - sha256sums = d85aa9f4b2f1848f23ce4cbe77ee35949877e590917be2d1dd5a686c596750b1 + sha256sums = 83d14126c660186a7a1774a4a5c29d38e170fa5e52cfd2d08fd344dcf1f57d22 + sha256sums = 1f846f3f08d97322fbb97045d768ab4bf90020ae77ead1407e05d5b463c31f16 sha256sums = e08fb439ba424c9c8db8f41fe9328dd3e30d4405094b6972dcce3863f04a9f46 sha256sums = 9824cd3a41db040bf28d6538aa4805f869333139cbcf43e0422e1b42f5401270 sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2 sha256sums = 56f58801a73e6d930d7680806dc734b50b69617a0eef96244627d7a946b62efd sha256sums = 09d2b3d6b919091f0f313609bdfd7603bfaa8765f0edeaf15efca2aec78284eb - sha256sums = d6e9d3a5a87b4d43ceb4a415e9a15a949c755a2b65f9cf3dcc4bfac15a68af02 + sha256sums = 3e217f0cb056bd823b0d593e5fb66e6acd891a21e1ba6343b7b976c4f9075521 sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7 - sha256sums = e6e02392982b7ce5ca7070231144d9d1c861f4ff45b41f34551450b52fb206ba - sha256sums = 9ea85b97b92c01a8d620a74ab3c375c5cb5017a8f3a5c9996bfff31997521f61 - sha256sums = 67134052d1dc7332ba5a991ec54a2a957539bec4eb4a1a0ed0f0ad7daa8fe763 + sha256sums = abc95e53c38673adb1be0f961c1ce1b5fdc22d150149bffae4b70a21201bc726 + sha256sums = fa8beb48c2e78f5337c6b08d1b6b6575bd01e2f34673d4056f35a1b28165d1ce sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd - sha256sums = babe3ae636742e8b3fa593d6eebc4422fcf894b38764735d6f1477ccf580eca9 - sha256sums = ffa7f63135f093e04cd3af1ec2a9c43381357b6477d59a569580f9f0889f5cfc + sha256sums = 17e8ec78d3df7a1965d3b1667c3323479e94c15a6d3fe59ba17cd73f06a21394 + sha256sums = 65a1a31af7923f5f99b11fe45305f176d75904e05addff168d09517c403e45e1 sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19 sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb diff --git a/PKGBUILD b/PKGBUILD index 0eaff4b..6f380a5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -117,18 +117,18 @@ else pkgbase=linux-cachyos fi _major=5.18 -_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} arch=(x86_64 x86_64_v3) pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=3 +pkgrel=2 arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') @@ -171,7 +171,6 @@ source+=( "${_patchsource}/0001-cpu.patch" "${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch" "${_patchsource}/0001-fixes.patch" - "${_patchsource}/0001-fs-patches.patch" "${_patchsource}/0001-futex-winesync.patch" "${_patchsource}/0001-hwmon.patch" "${_patchsource}/0001-kbuild.patch" @@ -515,6 +514,7 @@ prepare() { scripts/config --disable DEBUG_INFO \ --disable DEBUG_INFO_BTF \ --disable DEBUG_INFO_DWARF4 \ + --disable DEBUG_INFO_DWARF5 \ --disable PAHOLE_HAS_SPLIT_BTF \ --disable DEBUG_INFO_BTF_MODULES \ --disable SLUB_DEBUG \ @@ -703,22 +703,21 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee' - 'd85aa9f4b2f1848f23ce4cbe77ee35949877e590917be2d1dd5a686c596750b1' +sha256sums=('83d14126c660186a7a1774a4a5c29d38e170fa5e52cfd2d08fd344dcf1f57d22' + '1f846f3f08d97322fbb97045d768ab4bf90020ae77ead1407e05d5b463c31f16' 'e08fb439ba424c9c8db8f41fe9328dd3e30d4405094b6972dcce3863f04a9f46' '9824cd3a41db040bf28d6538aa4805f869333139cbcf43e0422e1b42f5401270' '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2' '56f58801a73e6d930d7680806dc734b50b69617a0eef96244627d7a946b62efd' '09d2b3d6b919091f0f313609bdfd7603bfaa8765f0edeaf15efca2aec78284eb' - 'd6e9d3a5a87b4d43ceb4a415e9a15a949c755a2b65f9cf3dcc4bfac15a68af02' + '3e217f0cb056bd823b0d593e5fb66e6acd891a21e1ba6343b7b976c4f9075521' 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c' '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7' - 'e6e02392982b7ce5ca7070231144d9d1c861f4ff45b41f34551450b52fb206ba' - '9ea85b97b92c01a8d620a74ab3c375c5cb5017a8f3a5c9996bfff31997521f61' - '67134052d1dc7332ba5a991ec54a2a957539bec4eb4a1a0ed0f0ad7daa8fe763' + 'abc95e53c38673adb1be0f961c1ce1b5fdc22d150149bffae4b70a21201bc726' + 'fa8beb48c2e78f5337c6b08d1b6b6575bd01e2f34673d4056f35a1b28165d1ce' 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd' - 'babe3ae636742e8b3fa593d6eebc4422fcf894b38764735d6f1477ccf580eca9' - 'ffa7f63135f093e04cd3af1ec2a9c43381357b6477d59a569580f9f0889f5cfc' + '17e8ec78d3df7a1965d3b1667c3323479e94c15a6d3fe59ba17cd73f06a21394' + '65a1a31af7923f5f99b11fe45305f176d75904e05addff168d09517c403e45e1' 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e' '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19' 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb' diff --git a/config b/config index bd951ff..67fcb06 100644 --- a/config +++ b/config @@ -647,7 +647,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m -CONFIG_X86_AMD_PSTATE=m +CONFIG_X86_AMD_PSTATE=y CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m