From 0f21b2ff2b288244efcfdbed8b9e05d9acddf4d7 Mon Sep 17 00:00:00 2001 From: "P. Jung" Date: Thu, 21 Oct 2021 08:01:25 +0000 Subject: [PATCH] fixes --- .SRCINFO | 14 ++++++++++---- PKGBUILD | 27 ++++++++++++++++++--------- config | 1 + 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5e4a976..0e3df0b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux cfs scheduler Kernel by CachyOS and with some other patches and other improvements pkgver = 5.14.14 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -26,11 +26,14 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-preempt-hz-cfs.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/cpufreq-patches/0001-cpufreq-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/0008-remove-LightNVM.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-slub.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/amd/0011-amd-ptdma.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-clearlinux-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/ll-patches/0004-mm-set-8-megabytes-for-address_space-level-file-read.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/bbr2-patches/0001-bbr2-5.14-introduce-BBRv2.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/block-patches-v2/0001-block-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/btrfs-patches-v8/0001-btrfs-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/btrfs-patches-v9/0001-btrfs-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/fixes-miscellaneous-v7/0001-fixes-miscellaneous.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/futex-xanmod-patches-v2/0001-futex-resync-from-gitlab.collabora.com.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/futex2-xanmod-patches-v2/0001-futex2-resync-from-gitlab.collabora.com.patch @@ -52,17 +55,20 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-v4l2loopback.patch source = auto-cpu-optimization.sh md5sums = 9646d53502447936773c65cac149572c - md5sums = 6918c6961e213ae5ee0c9d374bb9a06b + md5sums = a6dbc79077287df2279eaa66d54813ef md5sums = 04c5865e765e07cff0649824c2a8d810 md5sums = 581faf85cd625c41bbdd0cadbd0e451e md5sums = f88c3290ece724c81921059df14965cf md5sums = b87b77bd4273817f2b792d6fe965e417 md5sums = eb39a5681a153f5a1f5a67e8b9e957a5 + md5sums = 0464f6f1267bae4d87ee97a305d32467 + md5sums = e2a4af58b9d784226792fdc71d2cabba + md5sums = 54f750c0e08b4e5b51a49c494a6891d6 md5sums = f0d84fc024b9933bc19db696e0393a4e md5sums = e45c7962a78d6e82a0d3808868cd6ac0 md5sums = 196d6ac961497aa880264b83160eb140 md5sums = 1eaf224f9f46096efb75c153b712d702 - md5sums = 87c3ca227283a573646377e5d7e31089 + md5sums = 08183676295d4a89a2c65b1bc326ae3f md5sums = 7c0ff8bd5d8f1069ab34aec2060109c9 md5sums = fd934f7d11131d5a5043e4aea640583b md5sums = 8a96c5e8346bd5b430776ac8a41f96b0 diff --git a/PKGBUILD b/PKGBUILD index 6702235..722c041 100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -113,7 +113,7 @@ else pkgbase=linux-cachyos fi pkgver=5.14.14 -pkgrel=1 +pkgrel=2 arch=(x86_64 x86_64_v3) pkgdesc='Linux cfs scheduler Kernel by CachyOS and with some other patches and other improvements' _gittag=v${pkgver%.*}-${pkgver##*.} @@ -134,11 +134,14 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver "${_patchsource}/0001-preempt-hz-cfs.patch" "${_patchsource}/cpufreq-patches/0001-cpufreq-patches.patch" "${_patchsource}/misc/0008-remove-LightNVM.patch" + "${_patchsource}/0001-slub.patch" + "${_patchsource}/misc/amd/0011-amd-ptdma.patch" + "${_patchsource}/0001-clearlinux-patches.patch" "${_patchsource}/ll-patches/0004-mm-set-8-megabytes-for-address_space-level-file-read.patch" "${_patchsource}/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch" "${_patchsource}/bbr2-patches/0001-bbr2-5.14-introduce-BBRv2.patch" "${_patchsource}/block-patches-v2/0001-block-patches.patch" - "${_patchsource}/btrfs-patches-v8/0001-btrfs-patches.patch" + "${_patchsource}/btrfs-patches-v9/0001-btrfs-patches.patch" "${_patchsource}/fixes-miscellaneous-v7/0001-fixes-miscellaneous.patch" "${_patchsource}/futex-xanmod-patches-v2/0001-futex-resync-from-gitlab.collabora.com.patch" "${_patchsource}/futex2-xanmod-patches-v2/0001-futex2-resync-from-gitlab.collabora.com.patch" @@ -249,9 +252,9 @@ prepare() { scripts/config --set-val CONFIG_HZ 750 fi - ### Optionally set tickrate to 750HZ - if [ -n "$_750_HZ_ticks" ]; then - echo "Setting tick rate to 750HZ..." + ### Optionally set tickrate to 600HZ + if [ -n "$_600_HZ_ticks" ]; then + echo "Setting tick rate to 600HZ..." scripts/config --disable CONFIG_HZ_300 scripts/config --enable CONFIG_HZ_750 scripts/config --set-val CONFIG_HZ 750 @@ -430,13 +433,16 @@ prepare() { scripts/config --module CONFIG_NETFILTER_XT_TARGET_FULLCONENAT echo "Setting performance governor..." scripts/config --disable CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL - scripts/config --enable CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE + scripts/config --enable CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND scripts/config --enable CONFIG_CPU_FREQ_GOV_ONDEMAND + scripts/config --enable CONFIG_CPU_FREQ_GOV_PERFORMANCE scripts/config --enable CONFIG_CPU_FREQ_GOV_CONSERVATIVE scripts/config --enable CONFIG_CPU_FREQ_GOV_USERSPACE scripts/config --enable CONFIG_CPU_FREQ_GOV_SCHEDUTIL - echo "Enable AMD PSTATE v3 driver" + echo "Enable AMD PSTATE v2 driver" scripts/config --enable CONFIG_X86_AMD_PSTATE + scripts/config --enable CONFIG_AMD_PTDMA + ### Optionally disable NUMA for 64-bit kernels only @@ -612,17 +618,20 @@ _package-headers() { } md5sums=('9646d53502447936773c65cac149572c' - '6918c6961e213ae5ee0c9d374bb9a06b' + 'a6dbc79077287df2279eaa66d54813ef' '04c5865e765e07cff0649824c2a8d810' '581faf85cd625c41bbdd0cadbd0e451e' 'f88c3290ece724c81921059df14965cf' 'b87b77bd4273817f2b792d6fe965e417' 'eb39a5681a153f5a1f5a67e8b9e957a5' + '0464f6f1267bae4d87ee97a305d32467' + 'e2a4af58b9d784226792fdc71d2cabba' + '54f750c0e08b4e5b51a49c494a6891d6' 'f0d84fc024b9933bc19db696e0393a4e' 'e45c7962a78d6e82a0d3808868cd6ac0' '196d6ac961497aa880264b83160eb140' '1eaf224f9f46096efb75c153b712d702' - '87c3ca227283a573646377e5d7e31089' + '08183676295d4a89a2c65b1bc326ae3f' '7c0ff8bd5d8f1069ab34aec2060109c9' 'fd934f7d11131d5a5043e4aea640583b' '8a96c5e8346bd5b430776ac8a41f96b0' diff --git a/config b/config index f4b4507..7450e1b 100755 --- a/config +++ b/config @@ -533,6 +533,7 @@ CONFIG_EFI_MIXED=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y +# CONFIG_HZ_600 is not set # CONFIG_HZ_750 is not set # CONFIG_HZ_1000 is not set # CONFIG_HZ_2000 is not set