Bump to 5.19.8-2

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2022-09-14 20:09:17 +02:00
parent 56e03e71d7
commit 5a2ba27604
No known key found for this signature in database
GPG Key ID: 79AFA05ABDB26C5A
5 changed files with 65 additions and 31 deletions

View File

@ -1,7 +1,7 @@
pkgbase = linux-cachyos pkgbase = linux-cachyos
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 5.19.8 pkgver = 5.19.8
pkgrel = 1 pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos url = https://github.com/CachyOS/linux-cachyos
arch = x86_64 arch = x86_64
arch = x86_64_v3 arch = x86_64_v3
@ -27,8 +27,8 @@ pkgbase = linux-cachyos
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/5.19/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/5.19/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/5.19/sched/0001-bore.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/5.19/sched/0001-bore.patch
sha256sums = 616308795a952a6a39b4c74807c33916850eb7166d8ed7c9a87a1ba55d7487ce sha256sums = 616308795a952a6a39b4c74807c33916850eb7166d8ed7c9a87a1ba55d7487ce
sha256sums = 0dcff98ce415b81e00648712f8d7d7beb5f332239618bc95c7c3f9ae1573a92a sha256sums = 4e00d2c15d104f239fd1b320c0fd00f8de6ef7cb0e1eaba477b8b227854d639e
sha256sums = ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f sha256sums = e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e
sha256sums = 170239dd75f80d5f3c4a4706b11c6569a97be36a9057cd36c54296da0cc6a2d7 sha256sums = 170239dd75f80d5f3c4a4706b11c6569a97be36a9057cd36c54296da0cc6a2d7
sha256sums = 9659b83b734788c7cecb39d15f3a273d007bfa95fc3ed1951dd92796533fdcb2 sha256sums = 9659b83b734788c7cecb39d15f3a273d007bfa95fc3ed1951dd92796533fdcb2

View File

@ -84,6 +84,12 @@ _kyber_disable=y
# 'none' - disable multigenerational LRU # 'none' - disable multigenerational LRU
_lru_config='standard' _lru_config='standard'
### Enable per-VMA locking
# ATTENTION - one of two predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
_vma_config='standard'
## Enable DAMON ## Enable DAMON
_damon= _damon=
@ -158,7 +164,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable} _srcname=linux-${_stable}
#_srcname=linux-${_major} #_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1 pkgrel=2
_kernver=$pkgver-$pkgrel _kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3') arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos" url="https://github.com/CachyOS/linux-cachyos"
@ -234,7 +240,7 @@ if [ -n "$_bcachefs" ]; then
source+=("${_patchsource}/misc/0001-bcachefs-after-lru.patch") source+=("${_patchsource}/misc/0001-bcachefs-after-lru.patch")
fi fi
export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_HOST=cachyos
export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
@ -503,17 +509,17 @@ prepare() {
### Select LRU config ### Select LRU config
if [ "$_lru_config" = "standard" ]; then if [ "$_lru_config" = "standard" ]; then
echo "Enabling multigenerational LRU..." echo "Enabling multigenerational LRU..."
scripts/config --enable CONFIG_LRU_GEN \ scripts/config --enable LRU_GEN \
--enable CONFIG_LRU_GEN_ENABLED \ --enable LRU_GEN_ENABLED \
--disable CONFIG_LRU_GEN_STATS --disable LRU_GEN_STATS
elif [ "$_lru_config" = "stats" ]; then elif [ "$_lru_config" = "stats" ]; then
echo "Enabling multigenerational LRU with stats..." echo "Enabling multigenerational LRU with stats..."
scripts/config --enable CONFIG_LRU_GEN \ scripts/config --enable LRU_GEN \
--enable CONFIG_LRU_GEN_ENABLED \ --enable LRU_GEN_ENABLED \
--enable CONFIG_LRU_GEN_STATS --enable LRU_GEN_STATS
elif [ "$_lru_config" = "none" ]; then elif [ "$_lru_config" = "none" ]; then
echo "Disabling multigenerational LRU..." echo "Disabling multigenerational LRU..."
scripts/config --disable CONFIG_LRU_GEN scripts/config --disable LRU_GEN
else else
if [ -n "$_lru_config" ]; then if [ -n "$_lru_config" ]; then
error "The value $_lru_config is invalid. Choose the correct one again." error "The value $_lru_config is invalid. Choose the correct one again."
@ -524,6 +530,25 @@ prepare() {
exit exit
fi fi
### Select VMA config
if [ "$_vma_config" = "standard" ]; then
echo "Enabling per-VMA locking..."
scripts/config --enable PER_VMA_LOCK \
--disable PER_VMA_LOCK_STATS
elif [ "$_vma_config" = "stats" ]; then
echo "Enabling per-VMA locking with stats..."
scripts/config --enable PER_VMA_LOCK \
--enable PER_VMA_LOCK_STATS
else
if [ -n "$_vma_config" ]; then
error "The value $_vma_config is invalid. Choose the correct one again."
else
error "The value is empty. Choose the correct one again."
fi
error "Enabling per-VMA locking failed!"
exit
fi
### Enable DAMON ### Enable DAMON
if [ -n "$_damon" ]; then if [ -n "$_damon" ]; then
echo "Enabling DAMON..." echo "Enabling DAMON..."
@ -611,28 +636,28 @@ prepare() {
### Enable zram/zswap ZSTD compression ### Enable zram/zswap ZSTD compression
if [ -n "$_zstd_compression" ]; then if [ -n "$_zstd_compression" ]; then
echo "Enabling zram/swap ZSTD compression..." echo "Enabling zram/swap ZSTD compression..."
scripts/config --disable CONFIG_ZRAM_DEF_COMP_LZORLE \ scripts/config --disable ZRAM_DEF_COMP_LZORLE \
--enable CONFIG_ZRAM_DEF_COMP_ZSTD \ --enable ZRAM_DEF_COMP_ZSTD \
--set-str CONFIG_ZRAM_DEF_COMP zstd \ --set-str ZRAM_DEF_COMP zstd \
--disable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 \ --disable ZSWAP_COMPRESSOR_DEFAULT_LZ4 \
--enable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD \ --enable ZSWAP_COMPRESSOR_DEFAULT_ZSTD \
--set-str CONFIG_ZSWAP_COMPRESSOR_DEFAULT zstd \ --set-str ZSWAP_COMPRESSOR_DEFAULT zstd \
--enable CONFIG_ZRAM_ENTROPY \ --enable ZRAM_ENTROPY \
--set-val CONFIG_ZRAM_ENTROPY_THRESHOLD 100000 --set-val ZRAM_ENTROPY_THRESHOLD 100000
fi fi
### Selecting the ZSTD modules and kernel compression level ### Selecting the ZSTD modules and kernel compression level
if [ "$_zstd_level_value" = "ultra" ]; then if [ "$_zstd_level_value" = "ultra" ]; then
echo "Enabling highest ZSTD modules and kernel compression ratio..." echo "Enabling highest ZSTD modules and kernel compression ratio..."
scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 19 \ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
--enable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA \ --enable MODULE_COMPRESS_ZSTD_ULTRA \
--set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
--set-val CONFIG_ZSTD_COMP_VAL 22 --set-val ZSTD_COMP_VAL 22
elif [ "$_zstd_level_value" = "normal" ]; then elif [ "$_zstd_level_value" = "normal" ]; then
echo "Enabling standard ZSTD modules and kernel compression ratio..." echo "Enabling standard ZSTD modules and kernel compression ratio..."
scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 9 \ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
--disable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA \ --disable MODULE_COMPRESS_ZSTD_ULTRA \
--set-val CONFIG_ZSTD_COMP_VAL 19 --set-val ZSTD_COMP_VAL 19
else else
if [ -n "$_zstd_level_value" ]; then if [ -n "$_zstd_level_value" ]; then
error "The value $_zstd_level_value is invalid. Choose the correct one again." error "The value $_zstd_level_value is invalid. Choose the correct one again."
@ -885,7 +910,7 @@ for _p in "${pkgname[@]}"; do
done done
sha256sums=('616308795a952a6a39b4c74807c33916850eb7166d8ed7c9a87a1ba55d7487ce' sha256sums=('616308795a952a6a39b4c74807c33916850eb7166d8ed7c9a87a1ba55d7487ce'
'0dcff98ce415b81e00648712f8d7d7beb5f332239618bc95c7c3f9ae1573a92a' '4e00d2c15d104f239fd1b320c0fd00f8de6ef7cb0e1eaba477b8b227854d639e'
'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f' 'e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e'
'170239dd75f80d5f3c4a4706b11c6569a97be36a9057cd36c54296da0cc6a2d7' '170239dd75f80d5f3c4a4706b11c6569a97be36a9057cd36c54296da0cc6a2d7'
'9659b83b734788c7cecb39d15f3a273d007bfa95fc3ed1951dd92796533fdcb2') '9659b83b734788c7cecb39d15f3a273d007bfa95fc3ed1951dd92796533fdcb2')

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
CPU=$(gcc -Q -march=native --help=target|grep march=|awk '{print $2}'|head -1) CPU=$(gcc -Q -march=native --help=target|grep march=|awk '{print $2}'|head -1)
MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo) MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]; then if [[ ${MARCH} == "ZNVER1" ]]; then
MARCH="ZEN" MARCH="ZEN"
elif [[ ${MARCH} == "ZNVER2" ]]; then elif [[ ${MARCH} == "ZNVER2" ]]; then
MARCH="ZEN2" MARCH="ZEN2"
@ -29,6 +29,10 @@ elif [[ ${MARCH} == "GOLDMONT-PLUS" ]]; then
MARCH="GOLDMONTPLUS" MARCH="GOLDMONTPLUS"
elif [[ ${MARCH} == "SKYLAKE-AVX512" ]]; then elif [[ ${MARCH} == "SKYLAKE-AVX512" ]]; then
MARCH="SKYLAKE2" MARCH="SKYLAKE2"
elif [[ ${MARCH} == "MIVYBRIDGE" ]]; then
scripts/config --disable CONFIG_AGP_AMD64
scripts/config --disable CONFIG_MICROCODE_AMD
MARCH="MIVYBRIDGE"
elif [[ ${MARCH} == "ICELAKE-CLIENT" ]]; then elif [[ ${MARCH} == "ICELAKE-CLIENT" ]]; then
MARCH="ICELAKE" MARCH="ICELAKE"
fi fi

5
config
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 5.19.3 Kernel Configuration # Linux/x86 5.19.8 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -1196,6 +1196,8 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_LRU_GEN is not set # CONFIG_LRU_GEN is not set
# CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_ENABLED is not set
# CONFIG_LRU_GEN_STATS is not set # CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
# #
# Data Access Monitoring # Data Access Monitoring
@ -10945,6 +10947,7 @@ CONFIG_DEBUG_WX=y
CONFIG_GENERIC_PTDUMP=y CONFIG_GENERIC_PTDUMP=y
CONFIG_PTDUMP_CORE=y CONFIG_PTDUMP_CORE=y
# CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_PTDUMP_DEBUGFS is not set
# CONFIG_PER_VMA_LOCK_STATS is not set
# CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_OBJECTS is not set
CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DEBUG_KMEMLEAK=y
# CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_KMEMLEAK is not set

2
configure vendored
View File

@ -202,6 +202,8 @@ cpu_arch() {
scripts/config --enable CONFIG_MSANDYBRIDGE scripts/config --enable CONFIG_MSANDYBRIDGE
elif [[ "$_microarchitecture" = "45" ]]; then elif [[ "$_microarchitecture" = "45" ]]; then
scripts/config --disable CONFIG_GENERIC_CPU scripts/config --disable CONFIG_GENERIC_CPU
scripts/config --disable CONFIG_AGP_AMD64
scripts/config --disable CONFIG_MICROCODE_AMD
scripts/config --enable CONFIG_MIVYBRIDGE scripts/config --enable CONFIG_MIVYBRIDGE
elif [[ "$_microarchitecture" = "46" ]]; then elif [[ "$_microarchitecture" = "46" ]]; then
scripts/config --disable CONFIG_GENERIC_CPU scripts/config --disable CONFIG_GENERIC_CPU