From ac9af5854614014aa8064390ec5752c663efc731 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sun, 1 Jan 2023 14:53:29 +0100 Subject: [PATCH] 6.1.2-3 Signed-off-by: Peter Jung --- .SRCINFO | 4 ++-- PKGBUILD | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 215a9c5..4441cd1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements pkgver = 6.1.2 - pkgrel = 1 + pkgrel = 3 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -30,7 +30,7 @@ pkgbase = linux-cachyos sha256sums = ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae sha256sums = d4f3fc2581e338835a33983cca18bfb3225450a07c456c48c9b051c03236955a sha256sums = 32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74 - sha256sums = 1ec422b623d99bcac518075d498e2a32f91151a532edb4ba51b993667b6c32a5 + sha256sums = 53b2918c27a786adde50a28862c63f7c22df1697dfdcf3792123402e98d5a857 sha256sums = 0241632f91c112dcdffbdc203a9245ee3234f9a8b4e5e2c2de45fd0d228840da sha256sums = 564b08b5c076ad3b24ee2e975cac0630628581ce7c3b0eeaa40ce888136a00c6 diff --git a/PKGBUILD b/PKGBUILD index 14197c2..89a2e7a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -102,7 +102,7 @@ _lru_config=${_lru_config-'standard'} # 'standard' - enable per-VMA locking # 'stats' - enable per-VMA locking with stats # 'none' - disable per-VMA locking -_vma_config=${_vma_config-'standard'} +_vma_config=${_vma_config-'none'} ### Transparent Hugepages # ATTENTION - one of two predefined values should be selected! @@ -210,7 +210,7 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=1 +pkgrel=3 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -299,6 +299,10 @@ if [ -n "$_use_gcc_lto" ]; then source+=("${_patchsource}/misc/gcc-lto/0001-gcc-LTO-support-for-the-kernel.patch" "${_patchsource}/misc/gcc-lto/0002-gcc-lto-no-pie.patch") fi +## Use vma lock as an extra patch since it has some issues right now +if [[ "$_vma_config" = "standard" || "$_vma_config" = "stats" ]]; then + source+=("${_patchsource}/misc/0001-Introduce-per-VMA-lock.patch") +fi export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER=$pkgbase @@ -1047,6 +1051,6 @@ done sha256sums=('ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae' 'd4f3fc2581e338835a33983cca18bfb3225450a07c456c48c9b051c03236955a' '32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74' - '1ec422b623d99bcac518075d498e2a32f91151a532edb4ba51b993667b6c32a5' + '53b2918c27a786adde50a28862c63f7c22df1697dfdcf3792123402e98d5a857' '0241632f91c112dcdffbdc203a9245ee3234f9a8b4e5e2c2de45fd0d228840da' '564b08b5c076ad3b24ee2e975cac0630628581ce7c3b0eeaa40ce888136a00c6')