From 8033af08c10ee72830ff7b194e9d4f2acfa67798 Mon Sep 17 00:00:00 2001 From: "P. Jung" Date: Wed, 8 Dec 2021 18:25:50 +0000 Subject: [PATCH] 5.15.7-1 --- .SRCINFO | 76 ++++++++++++++++++++++------------------ PKGBUILD | 103 +++++++++++++++++++++++++++++-------------------------- config | 80 ++++++++++++++++++++---------------------- 3 files changed, 134 insertions(+), 125 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2677b8d..2403159 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.15.6 - pkgrel = 2 + pkgver = 5.15.7 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -19,9 +19,12 @@ pkgbase = linux-cachyos makedepends = tar makedepends = xz options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.6.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.7.tar.xz source = config source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-arch-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-CLUSTER.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-cfi.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-le9.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/AMD/0001-amd-pstate-dev-v5-fixes.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/AMD/0001-amd64-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-bbr2.patch @@ -39,42 +42,47 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-ksmbd-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-damon.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-pf-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-mm-lru.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-lqx-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-lrng-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-sbitmap-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-v4l2loopback.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-security-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-spectre-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-sbitmap-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-zstd.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-xfs-backport.patch source = auto-cpu-optimization.sh - sha512sums = 0f69e98590e796a3ec3e04340fc41954f1cdb7a5859da8efec1ba4a6498760778744e6243d068bc91343e3e7029239ff2e9ee2572f458c6b0e31c23f3686b5f5 - sha512sums = a258bde3c81f8a7eb0c93f0ec0490488096ea26b16744730de301855c5bcc38aa04b2755be8d3cd992b34bc2568647350b68dc73755e1f5e6a894ea9a57e5e5a - sha512sums = 35e36b6824c83f2bfb0314882be8b373243fa4cd45bcda6291171206ca5b718e73abb91c0edc3f0ad6b06f099746c954aedb5f05fe42797fe408a8176898de65 - sha512sums = d6544f652ef9767e20d8acd1bf09738e7dcd4bc430a39a75b591aa38631942c952f70a29d1febfdfea20e7bc64813991fc1428a1dcaf176b3a024cb17be8cb3c - sha512sums = d800ad18b40f71a8509acca4d74d8ea9b4d24558665e40a558345403cbcb8a29096baf686158e55baf3d0a4a41a605033c09b162d00a810aa50d8d50785e4bc1 - sha512sums = d549caac984a68ff95c928ffb2055b1ed09f1b0bb0beeded731c4a9f391bf0923c50c1cdefa145cc116121e4746bb35f0b9d32814bad8da142f48b1ead293ab1 - sha512sums = d7b8c20c6950b86ed88aeb271466bcac282c86c8c42a2603e7d54b57b2421c74ad3530bab4a8d43fee407ddcbb2e42885acf1b357b9d87f2a1c4250816c0e788 - sha512sums = cfbebdb5347e53020123fc395eb2d241a3463c8a7ebbe251c5af37dd1b91569fdb172c16daa7d9ddd8b05975dffb5ea536cb3760f7af953921156d0c37647427 - sha512sums = 0339084577de212c4ef02b46d8d836c0211aacae7503ace23b6098af90e9ca1e9ca9e6fa8e3132051ac0a68b032b89b60078bd5a0d7ca3ad617b91a61acbd3b5 - sha512sums = 5a1600c43db9493c85fd8654b857bf82c5482c52c19a12df6a34a92d16600a022e284f15e68609f9611b8443944674ee5cc6f87a9c944c6463fb313f1a68b65c - sha512sums = e7a66c81d1e920684cb597f7446a1f5c244c32db69735fcdfc7983304851f31dee11668370e2e322259fa4e9d7368fc46ac6fdff1ae1366a68642a88ca5ab311 - sha512sums = f8e20fe34b058e8e554f653424ced37fefd004489689e6047def11cd463b594241432dd425b082d73a2646fe91531be9083a481b47cc784930991f78d9214529 - sha512sums = e4266d7b8b3de6be625a8df0404e94eab0305ef929f93ee7fef14bb69f690938b7c9c7ab7578b5c9c7174ae2697893f920d609cd818b649604d4bebeda48df44 - sha512sums = 29bb6f3b5ef1232f9c3a34dee19c592f5f87ba8b06a020e840ba9c914953092ee987380cab9a92e233df5e2e1a6a8f211d49376ca4f7ae076b7a4f92749758b6 - sha512sums = 999b518c2ecd9a86d6eb9b11fbaca4c141f73d93831bb0e9a861763b6b3f275fc5592a2cf826f590219c97255da935f1ec54624cc75e2f5f8dc9ea7c2b745b69 - sha512sums = 48b6b0d070240a0f9ac4d95b679fd80e006979c0239c3f56101f626cbddd38abbd572ff8ca2106f5a331c41664b1d3ae275ca43e0cb166a3b0bf768238259b03 - sha512sums = 76dfd2023b314be3e5b84acc074857322d49938078b69c87efc4c3510fd5aa528781a07197d00823012a4bdccdcab10db11fc116609d1da7ca694e29010c92b6 - sha512sums = 51ccbf184aeb98b05bb72f6d2ded8158a16bb2350ff192ce301c2e405bf514af5fe4888098d5a804cf1b2c6558a36ecc9cbdaaeeaf4f43150495579b4c2f7c00 - sha512sums = 7d953a6093de744e9dfe841cec28e9bd88dd12b5cd142d04736fe318a77709f166fe476f8c8bbb77013f715e27c1e1ba219998d3f50d29dfe1127216b64b6d60 - sha512sums = 4ba31d174af375b29b7ebea72ce24d5c81d3876885c35baea4d801f691c4083934422ab89470f4725c5ffb3646ea49b140ea33630cce35ee316985bc2bda7b0b - sha512sums = 7adb4076e60bdf884c16e491e1dc9730baa1fadbabdc0a89773986973b42943a3b1666c5ee047373d72581e8d98686044c4bf0dca7ad03ca120ff2e9a560c9d4 - sha512sums = fb2d882a1156e5f78ff4b5809f0eea6ab6df17f460ad1547c422476e942af54b064c2587d9dc1c0cffef9e906990285d12e98f2efe132c50bf27f02c52d61681 - sha512sums = b501454a225cc3882c6ccc61e6029e6a20efee5179668819d3055afa059ecaa4307c1b57f9780c224e91bf2f50192a93cf7003b9dbb7296a9d604e52604eaea4 - sha512sums = ef893edc3c4416c31f1bc011cdb9b4926dd39beb696997c31dc8416948255f93c4cf3363bb90a4cfc7d73ad2cecf6e03acf88b458d607e042644333b5d69e643 - sha512sums = a1279dcb47ff3d43811c5dfca84a5b4edd6be87f012fa4e2c1a1f0c379e707bee67f23e6dd186be97f78cf1f45f781619db0382fc6aa0d5c42208ad77b95373e - sha512sums = 8d2230bbae1708610ff0d93537d1a1f372f4efd25cb35e6016657c13c6032a0e8e5a3ade89ed5e6a866e3720fe998e5aceac3496a1d3c9423af4d1b40c949022 - sha512sums = a0322e98aa0406eda29975be648f33b562c894a090ccafcde6c6dad580353c2029fa5bb2d66d31faa8ff0c593ba2ffe1e76031c0a16f55bf16c6a5366b9d700f - sha512sums = a54c01ba42e7d5f9433dacaa21f656d8aefdb6a5228fbca2b8e55b26eb02b35327ae3fd98a26a708452b8559e7f4acb32b6e685e26edc64497d1b7d10c5d86e1 + md5sums = b79700122766ccf561f032eb3c8da27e + md5sums = ec8bc0f3c29da5e6256068b73ab0cb6f + md5sums = 2627c6fcd9760b0e7a3553500db0a7e1 + md5sums = df0a0c51baecdbd369694c9f10715cb4 + md5sums = e3fa8507aed6ef3ce37e62f18fe9b7e1 + md5sums = 448e2846e615c76989289ef30ec9eba2 + md5sums = 4866d66f4cc1b10cccb520c22cbc71d7 + md5sums = 53f037488a66667220c263f92ded333d + md5sums = 2a8097ba46be56fbbe3967e9c34c9a0b + md5sums = e708f2160dee1ef5c7dffb8a23c199d7 + md5sums = 56ceaed8bfb44eca93298ccc5fe11ca7 + md5sums = 67764a5824b567b49bcce19c01d4e1b3 + md5sums = 299b176cbfc1b386d74406387e9e2d6b + md5sums = 5b9a009ab68ba548e9d06e0932ab967d + md5sums = 0b6d09bdd920f4c31c05fdeaa0740548 + md5sums = 8cf507777e20cd4d75a0627eef10c10d + md5sums = 6038177c72982533035309fcd6df208a + md5sums = 8aaac6621843060d8fec99e839c3200a + md5sums = 8c354c3d1962ec6785db7f0c3fbbab03 + md5sums = 9b6369bc4c58ad0d9195b5c204ed4b8a + md5sums = c6efda5716e4ff79ebdbc963bebd851a + md5sums = 408dfabb34f2b79aa2f5044b052703db + md5sums = 08c84362cb916b30d9c77e35b1b3bc54 + md5sums = 56fdf3562b041c0408d9751b7e447977 + md5sums = b09b84168822521426f197610727618b + md5sums = 8cb0301d159b59727b7bdd09350e2a9f + md5sums = bc64b1d1a9c95b07c28457f7214ebf81 + md5sums = 8d390345afa36c56fa15bf4f4edad9a2 + md5sums = 7530840f2eb439f64307dd3157beb28e + md5sums = f23b415ff37873ae7142aed31808b635 + md5sums = 507e61367296d14b88ac38a4aee03cdf + md5sums = 21c98f19e883879dd3336c1fa143fd31 pkgname = linux-cachyos pkgdesc = The Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements kernel and modules @@ -89,5 +97,5 @@ pkgname = linux-cachyos pkgname = linux-cachyos-headers pkgdesc = Headers and scripts for building modules for the Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements - depends = linux-cachyos=5.15.6 + depends = linux-cachyos=5.15.7 depends = pahole diff --git a/PKGBUILD b/PKGBUILD index 6f2d344..0d96401 100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,7 +22,7 @@ _makegconfig= # NUMA is optimized for multi-socket motherboards. # A single multi-core CPU actually runs slower with NUMA enabled. # See, https://bugs.archlinux.org/task/31187 -_NUMAdisable=y +_NUMAdisable= # Compile ONLY used modules to VASTLYreduce the number of modules built # and the build time. @@ -65,10 +65,10 @@ _mq_deadline_disable=y _kyber_disable=y ### Enable protect file mappings under memory pressure -_mm_protect= +_mm_protect=y ### Enable multigenerational LRU -_lru_enable=y +#_lru_enable= ### Enable DAMON _damon=y @@ -125,13 +125,13 @@ else pkgbase=linux-cachyos fi _major=5.15 -_minor=6 +_minor=7 pkgver=${_major}.${_minor} _srcname=linux-${pkgver} arch=(x86_64 x86_64_v3) pkgdesc='Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements' _srcname=linux-${pkgver} -pkgrel=2 +pkgrel=1 arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') @@ -150,11 +150,15 @@ source=(#"https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" "config" # "${_patchsource}/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch" "${_patchsource}/0001-arch-patches.patch" + "${_patchsource}/0001-CLUSTER.patch" + "${_patchsource}/0001-cfi.patch" + "${_patchsource}/0001-le9.patch" "${_patchsource}/AMD/0001-amd-pstate-dev-v5-fixes.patch" "${_patchsource}/AMD/0001-amd64-patches.patch" "${_patchsource}/0001-bbr2.patch" "${_patchsource}/0001-bitmap.patch" "${_patchsource}/0001-block-patches.patch" + #"${_patchsource}/0001-ksm-patches.patch" "${_patchsource}/0001-cpu-patches.patch" "${_patchsource}/0001-misc.patch" "${_patchsource}/0001-btrfs-patches.patch" @@ -167,21 +171,17 @@ source=(#"https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" "${_patchsource}/0001-ksmbd-patches.patch" "${_patchsource}/0001-damon.patch" "${_patchsource}/0001-pf-patches.patch" - "${_patchsource}/0001-mm-lru.patch" "${_patchsource}/0001-lqx-patches.patch" "${_patchsource}/0001-lrng-patches.patch" - # "${_patchsource}/0001-security-patches.patch" - "${_patchsource}/0001-sbitmap-patches.patch" "${_patchsource}/0001-v4l2loopback.patch" + "${_patchsource}/0001-security-patches.patch" + "${_patchsource}/0001-spectre-patches.patch" + "${_patchsource}/0001-sbitmap-patches.patch" "${_patchsource}/0001-zstd.patch" "${_patchsource}/0001-xfs-backport.patch" "auto-cpu-optimization.sh" ) -if [ -n "$_use_cfi" ]; then - source+=("${_patchsource}/0001-cfi.patch") -fi - if [ -n "$_use_pgo" ]; then source+=("${_patchsource}/0001-PGO.patch") fi @@ -238,7 +238,7 @@ prepare() { fi fi - if [ -n "$_use_cfi" ]; then +if [ -n "$_use_cfi" ] && [ -n "$_use_llvm_lto" ]; then scripts/config --enable CONFIG_ARCH_SUPPORTS_CFI_CLANG scripts/config --enable CONFIG_CFI_CLANG fi @@ -344,19 +344,20 @@ prepare() { ### Enable multigenerational LRU if [ -n "$_lru_enable" ]; then echo "Enabling multigenerational LRU..." - scripts/config --enable CONFIG_HAVE_ARCH_PARENT_PMD_YOUNG + scripts/config --enable CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG scripts/config --enable CONFIG_LRU_GEN - scripts/config --set-val CONFIG_NR_LRU_GENS 7 - scripts/config --set-val CONFIG_TIERS_PER_GEN 4 - scripts/config --enable CONFIG_LRU_GEN_ENABLED + scripts/config --set-val CONFIG_NR_LRU_GENS 4 + scripts/config --set-val CONFIG_TIERS_PER_GEN 2 + scripts/config --disable CONFIG_LRU_GEN_ENABLED scripts/config --disable CONFIG_LRU_GEN_STATS fi + ### Enable DAMON if [ -n "$_damon" ]; then echo "Enabling DAMON..." scripts/config --enable CONFIG_DAMON - scripts/config --enable CONFIG_DAMON_VADDR - scripts/config --enable CONFIG_DAMON_DBGFS + scripts/config --disable CONFIG_DAMON_VADDR + scripts/config --disable CONFIG_DAMON_DBGFS scripts/config --enable CONFIG_DAMON_PADDR scripts/config --enable CONFIG_DAMON_RECLAIM fi @@ -499,7 +500,7 @@ prepare() { echo "Applying default config..." make ${BUILD_FLAGS[*]} olddefconfig - make ${BUILD_FLAGS[*]} -s kernelrelease > version + make -s kernelrelease > version echo "Prepared $pkgbase version $(