From 971df99aece2ab590efccd4ec0fdf46f70203bf7 Mon Sep 17 00:00:00 2001 From: "P. Jung" Date: Wed, 12 Jan 2022 01:13:57 +0100 Subject: [PATCH] 5.16-2 --- .SRCINFO | 134 ++- PKGBUILD | 168 ++-- config | 2417 ++++++++++++++++++++++++++++++++++------------------- configure | 0 4 files changed, 1680 insertions(+), 1039 deletions(-) mode change 100755 => 100644 PKGBUILD mode change 100755 => 100644 config mode change 100755 => 100644 configure diff --git a/.SRCINFO b/.SRCINFO index cdfa02d..6ca9431 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.12 - pkgrel = 1 +pkgbase = linux-cachyos-bore + pkgdesc = Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements + pkgver = 5.16.0 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -19,73 +19,67 @@ pkgbase = linux-cachyos makedepends = tar makedepends = xz options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.12.tar.xz + source = https://git.kernel.org/torvalds/t/linux-5.16.tar.gz 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-cfi.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-lru-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/AMD/0001-amdpstate.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/AMD/amd-sched.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 - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-block-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-cpu-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-misc.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-btrfs-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-clearlinux-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-intel-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-ntfs3.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-fixes-miscellaneous.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-futex-wait.v-fsync-winesync.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-hwmon-patches.patch - 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-pf-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-page-table-check.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-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-xanmod-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-net-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.16/sched/0001-bore-sched.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-MG-LRU-v6.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-blk-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-sched-perf-fix.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-block-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-amdpstate.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-anbox.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-bbr2-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-btrfs.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-lrng.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cfi.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cpu.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-clearlinux.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-f2fs-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-misc.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-fixes.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-futex.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-hwmon.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-ksmbd.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-rcu.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-zstd-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-zen-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-v4l2loopback.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/misc/0007-v5.16-winesync.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/next/0002-mm-next.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/next/0003-folio-io.patch source = auto-cpu-optimization.sh - md5sums = 7c3faf14ec344d6d0219b6a8b2475726 - md5sums = 788dcd568f1c00441ad9746706e4f1bc - md5sums = ef9fa3407854cea8e78112c25bb72e41 - md5sums = e3fa8507aed6ef3ce37e62f18fe9b7e1 - md5sums = 1f3becd94390729d940a60b1e9b872b1 - md5sums = 9ce207e47ad186b612050bd83641a697 - md5sums = dccfe71705b24d3fb1f51aaf2016216d - md5sums = 53f037488a66667220c263f92ded333d - md5sums = 2a8097ba46be56fbbe3967e9c34c9a0b - md5sums = 56ceaed8bfb44eca93298ccc5fe11ca7 - md5sums = 67764a5824b567b49bcce19c01d4e1b3 - md5sums = 018c728c9e744a99bb9b589028b8a1f6 - md5sums = a5de61b14e9ff7bfb4cb6548b6ee1c93 - md5sums = 41887f2f959068e41756f4c39671ca79 - md5sums = b04c8a3f01b3dfba1410e2c26ec7d975 - md5sums = 8cf507777e20cd4d75a0627eef10c10d - md5sums = 8bda7327ae759b1b52e3b617952bd964 - md5sums = 8c354c3d1962ec6785db7f0c3fbbab03 - md5sums = b6b2c2c6b4761aa5a8dea6ac0add8736 - md5sums = c8546d67979e5f33f819284c11daa9c5 - md5sums = 08c84362cb916b30d9c77e35b1b3bc54 - md5sums = 7d28f804d6b74f9a22ad30d67af5a669 - md5sums = 2130bb325438a2fc880593c5e345521f - md5sums = b09b84168822521426f197610727618b - md5sums = d9a892f66631615a72bdc93ee7397afa - md5sums = bc64b1d1a9c95b07c28457f7214ebf81 - md5sums = 8d390345afa36c56fa15bf4f4edad9a2 - md5sums = 102fd2533e85eaecb4255df77d3e2901 - md5sums = 03bb361f5f900cc9fd1159eda5e4f0ff - md5sums = 7530840f2eb439f64307dd3157beb28e - md5sums = 940d98858e6e59ecc07da50e05f6bc3d + md5sums = 5c6acbcc119ab680a32264c865ea70e1 + md5sums = f9425b75de74d70497781f8c8448c27f + md5sums = 1fb4de64e7b59b67afecc7b71b951576 + md5sums = d16ccc4f52eb0bc08893dc66a7caa154 + md5sums = 194c8e20ad30973c32159cb23f3be4c9 + md5sums = 1262001a6a1e72fa271481cf897ac6d1 + md5sums = f717c0a238353f443a6f0633a59ee8ca + md5sums = 2923efbd99eea15f7ef2ada70e661bd5 + md5sums = 80e419d6847d4122a23a141fd3a40e52 + md5sums = d194311161f8f44755e532db738f4a2d + md5sums = e9dff9b551b8fa7c0b47ae5ac0b16365 + md5sums = 9f86c3b9e6271cfc4440864a6857b256 + md5sums = b61fd5f488e44208fc97bfa6a274aebb + md5sums = d4c38ce51fb9a69aa92ad9b9e0199122 + md5sums = a687c26c262ccb9ad7cb54697a1476bc + md5sums = 55bb44747ae64b05640e6452113877c2 + md5sums = 80920e501b9b87bfe587edff445e6efe + md5sums = f574f1c40fa2d07602e77418b863e144 + md5sums = 2458d1c5d00d10709922e686c5d1e97f + md5sums = 2160aabf2b9798907d36c4d246937d71 + md5sums = 12ad5085b7f01793980f137f2c9451cb + md5sums = 167a4267269e6a709c54e7b9ea8bf8d5 + md5sums = bf58290793d3a095ef95fb1fac2de89a + md5sums = de6db1147385c058b2e94df3c1739fdf + md5sums = cb9384ce179d08be6c90df6d0a0977a1 + md5sums = 972fa89ff4ad22631fca50af2305c049 + md5sums = 258c33888c85d1ecc0bbdf59c3a92895 + md5sums = 9956af4381a21744369bf81d76d3142d md5sums = 21c98f19e883879dd3336c1fa143fd31 -pkgname = linux-cachyos - pkgdesc = The Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements kernel and modules +pkgname = linux-cachyos-bore + pkgdesc = The Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements kernel and modules depends = coreutils depends = kmod depends = initramfs @@ -95,7 +89,7 @@ pkgname = linux-cachyos provides = VIRTUALBOX-GUEST-MODULES provides = WIREGUARD-MODULE -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.12 +pkgname = linux-cachyos-bore-headers + pkgdesc = Headers and scripts for building modules for the Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements + depends = linux-cachyos-bore=5.16.0 depends = pahole diff --git a/PKGBUILD b/PKGBUILD old mode 100755 new mode 100644 index db89e2d..3d57e70 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ # 'bore' - select 'Burst-Oriented Response Enhancer' # 'tt' - select 'Task Type Scheduler by Hamad Marri' # 'cfs' - select 'Completely Fair Scheduler' -_cpusched='cfs' +_cpusched='bore' ### BUILD OPTIONS # Set these variables to ANYTHING that is not null to enable them @@ -59,7 +59,7 @@ _mq_deadline_disable=y _kyber_disable=y ### Enable protect file mappings under memory pressure -_mm_protect=y +_mm_protect= ### Enable multigenerational LRU _lru_enable=y @@ -117,18 +117,23 @@ _use_cfi= if [ -n "$_use_llvm_lto" ]; then - pkgbase=linux-cachyos-lto + pkgbase=linux-cachyos-bore-lto else - pkgbase=linux-cachyos + pkgbase=linux-cachyos-bore fi -_major=5.15 -_minor=12 +_major=5.16 +_minor=0 +#_minorc=$((_minor+1)) +#_rcver=rc8 pkgver=${_major}.${_minor} -_srcname=linux-${pkgver} +#_stable=${_major}.${_minor} +_stable=${_major} +_stablerc=${_major}-${_rcver} +_srcname=linux-${_stable} +#_srcname=linux-${_major} 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=1 +pkgdesc='Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements' +pkgrel=2 arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') @@ -141,40 +146,39 @@ fi if [ -n "$_use_llvm_lto" ]; then makedepends+=(clang llvm lld python) fi -_caculepatches="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/CacULE" -_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15" +_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16" source=( - "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz" + "https://git.kernel.org/torvalds/t/linux-${_stable}.tar.gz" "config" - "${_patchsource}/0001-arch-patches.patch" - "${_patchsource}/0001-cfi.patch" - "${_patchsource}/0001-lru-patches.patch" - "${_patchsource}/AMD/0001-amdpstate.patch" - "${_patchsource}/AMD/amd-sched.patch" - "${_patchsource}/AMD/0001-amd64-patches.patch" - "${_patchsource}/0001-bbr2.patch" + # "${_patchsource}/sched/0001-pjrc.patch" ## not released for 5.16 right now + # "${_patchsource}/sched/0001-cacULE-5.16-full.patch" + "${_patchsource}/sched/0001-bore-sched.patch" + # "${_patchsource}/sched/0001-tt.patch" + "${_patchsource}/0001-MG-LRU-v6.patch" + "${_patchsource}/0001-blk-patches.patch" + "${_patchsource}/0001-sched-perf-fix.patch" "${_patchsource}/0001-block-patches.patch" - "${_patchsource}/0001-cpu-patches.patch" + "${_patchsource}/0001-amdpstate.patch" + "${_patchsource}/0001-anbox.patch" + "${_patchsource}/0001-bbr2-patches.patch" + "${_patchsource}/0001-btrfs.patch" + "${_patchsource}/0001-lrng.patch" + "${_patchsource}/0001-cfi.patch" + "${_patchsource}/0001-cpu.patch" + "${_patchsource}/0001-clearlinux.patch" + "${_patchsource}/0001-f2fs-patches.patch" "${_patchsource}/0001-misc.patch" - "${_patchsource}/0001-btrfs-patches.patch" - "${_patchsource}/0001-clearlinux-patches.patch" - "${_patchsource}/0001-intel-patches.patch" - "${_patchsource}/0001-ntfs3.patch" - "${_patchsource}/0001-fixes-miscellaneous.patch" - "${_patchsource}/0001-futex-wait.v-fsync-winesync.patch" - "${_patchsource}/0001-hwmon-patches.patch" - "${_patchsource}/0001-ksmbd-patches.patch" - "${_patchsource}/0001-pf-patches.patch" - "${_patchsource}/0001-page-table-check.patch" - "${_patchsource}/0001-lqx-patches.patch" - "${_patchsource}/0001-lrng-patches.patch" + "${_patchsource}/0001-fixes.patch" + "${_patchsource}/0001-futex.patch" + "${_patchsource}/0001-hwmon.patch" + "${_patchsource}/0001-ksmbd.patch" + "${_patchsource}/0001-rcu.patch" + "${_patchsource}/0001-zstd-patches.patch" + "${_patchsource}/0001-zen-patches.patch" "${_patchsource}/0001-v4l2loopback.patch" - "${_patchsource}/0001-security-patches.patch" - "${_patchsource}/0001-spectre-patches.patch" - "${_patchsource}/0001-xanmod-patches.patch" - "${_patchsource}/0001-net-patches.patch" - "${_patchsource}/0001-sbitmap-patches.patch" - "${_patchsource}/0001-zstd.patch" + "${_patchsource}/misc/0007-v5.16-winesync.patch" + "${_patchsource}/next/0002-mm-next.patch" + "${_patchsource}/next/0003-folio-io.patch" "auto-cpu-optimization.sh" ) @@ -239,13 +243,11 @@ prepare() { "${srcdir}"/auto-cpu-optimization.sh fi - if [ -n "$_use_optimization_select" ]; then source "${startdir}"/configure cpu_arch fi - ### Selecting the CPU scheduler if [ "$_cpusched" = "bmq" ]; then echo "Selecting BMQ CPU scheduler..." @@ -285,7 +287,6 @@ prepare() { exit fi - if [ -n "$_use_cfi" ] && [ -n "$_use_llvm_lto" ]; then echo "Enabling CFI" scripts/config --enable CONFIG_ARCH_SUPPORTS_CFI_CLANG @@ -297,12 +298,6 @@ prepare() { scripts/config --disable CONFIG_LTO_NONE fi - # if [ -n "$_use_pgo" ]; then - # scripts/config --enable CONFIG_ARCH_SUPPORTS_PGO_CLANG - # scripts/config --enable DEBUG_FS - # scripts/config --enable CONFIG_PGO_CLANG - # fi - ### Optionally set tickrate to 1000 if [ -n "$_1k_HZ_ticks" ]; then echo "Setting tick rate to 1k..." @@ -512,9 +507,6 @@ prepare() { echo "Enabling KBUILD_CFLAGS -O3..." scripts/config --disable CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE scripts/config --enable CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 - scripts/config --module CONFIG_IP_NF_TARGET_FULLCONENAT - scripts/config --module CONFIG_NETFILTER_XT_TARGET_FULLCONENAT - ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db @@ -557,6 +549,7 @@ _package() { 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig') provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE) + cd $_srcname local kernver="$(