Bump to 6.12.2

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2024-12-05 19:11:44 +01:00
parent 3b885b1e9e
commit c841dde6a5
No known key found for this signature in database
GPG key ID: 79AFA05ABDB26C5A
3 changed files with 30 additions and 35 deletions

View file

@ -1,6 +1,6 @@
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.12.1
pkgver = 6.12.2
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@ -18,16 +18,16 @@ pkgbase = linux-cachyos-bore
options = !strip
options = !debug
options = !lto
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.1.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.2.tar.xz
source = config
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-bore-cachy.patch
b2sums = de3f4dec2fc7e36711c68683d6564d0c3ce6fe728ffa6a629604e2fa9e489dbab45fd6676343f6e68bafbd202a3e814e82a1448b46844e34046b9f82f819b8f4
b2sums = d5f647e8517b423cb3dec37b5b3a65c90c8dcedf36187fb5024a650dfb1817f6cde5f1b0a588a96c374e4b4e78dd7d534b6aa273ed28510e5c0900b96fc48049
b2sums = 3161f791e13156a97215b14ed9d0a18dfd69324e7fa516df2a9385678ba2a2cd67196aa9efd82f7d9f1cb2c91b8733a095ced66c491f3a80c8c70eec1dc703d8
b2sums = 8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701
b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667
b2sums = 158349b76cd1a08fd1ca2eaa6cce1573fa39eab4641b69baaafbdf4cad1890377762bdd6c76a4731c4ddce8b98b4ed6fd302df02b93b59e17ebfa50265cedce7
b2sums = a1bad436ffcaf36266949471ed025b889cf88fe7ecf8174ab73783f3f83630df90911e0b962386c964056b79ab0ec50babe0a3a81b83904216b0eec65f80eb2d
b2sums = d290e958f4870002d5ec6616fa45d9259277bbb7a92b0ff1b093d001bea45be5736f44ecfdeaa4d6fc40c4580ac954b41187b57a323c8b6e4c142f71c9d94724
b2sums = 09e70082f6e1a5e969c545f123f3ecb74880f9b5ef4ad81a64ffd59a105d589fd9aa24699fd9088422c61b961eca647519a66e6893df120aa079e45fc7761702
pkgname = linux-cachyos-bore
pkgdesc = The Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements kernel and modules

View file

@ -158,7 +158,7 @@ fi
pkgbase="linux-$_pkgsuffix"
_major=6.12
_minor=1
_minor=2
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@ -189,7 +189,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
_nv_ver=565.57.01
_nv_ver=565.77
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}"
source=(
@ -224,8 +224,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
"${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch"
"${_patchsource}/misc/nvidia/0006-nvidia-drm-Set-FOP_UNSIGNED_OFFSET-for-nv_drm_fops.f.patch")
"${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch")
fi
if [ -n "$_build_nvidia_open" ]; then
@ -234,8 +233,7 @@ if [ -n "$_build_nvidia_open" ]; then
"${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch"
"${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch"
"${_patchsource}/misc/nvidia/0004-silence-event-assert-until-570.patch"
"${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch"
"${_patchsource}/misc/nvidia/0006-nvidia-drm-Set-FOP_UNSIGNED_OFFSET-for-nv_drm_fops.f.patch")
"${_patchsource}/misc/nvidia/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch")
fi
## List of CachyOS schedulers
@ -246,6 +244,10 @@ case "$_cpusched" in
source+=("${_patchsource}/sched/0001-prjc-cachy.patch");;
hardened) ## Hardened Patches
source+=("${_patchsource}/misc/0001-hardened.patch");;
rt) ## EEVDF with RT patches
source+=("${_patchsource}/misc/0001-rt.patch");;
rt-bore) ## RT with BORE Scheduler
source+=("${_patchsource}/misc/0001-rt.patch");;
esac
export KBUILD_BUILD_HOST=cachyos
@ -366,17 +368,6 @@ prepare() {
-d NUMA_BALANCING_DEFAULT_ENABLED
fi
### Setting NR_CPUS
if [[ "$_nr_cpus" -ge 2 && "$_nr_cpus" -le 512 ]]; then
echo "Setting custom NR_CPUS..."
scripts/config --set-val NR_CPUS "$_nr_cpus"
elif [ -z "$_nr_cpus" ]; then
echo "Setting default NR_CPUS..."
scripts/config --set-val NR_CPUS 320
else
_die "The value '$_nr_cpus' is invalid. Please select a numerical value from 2 to 512..."
fi
### Select performance governor
if [ -n "$_per_gov" ]; then
echo "Setting performance governor..."
@ -442,7 +433,11 @@ prepare() {
-d DEFAULT_CUBIC \
-e TCP_CONG_BBR \
-e DEFAULT_BBR \
--set-str DEFAULT_TCP_CONG bbr
--set-str DEFAULT_TCP_CONG bbr \
-m NET_SCH_FQ_CODEL \
-e NET_SCH_FQ \
-d CONFIG_DEFAULT_FQ_CODEL \
-e CONFIG_DEFAULT_FQ
fi
### Select THP
@ -519,8 +514,6 @@ prepare() {
# Use fbdev and modeset as default
patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel"
# Fix for 6.12
patch -Np2 -i "${srcdir}/0006-nvidia-drm-Set-FOP_UNSIGNED_OFFSET-for-nv_drm_fops.f.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
if [ -n "$_build_nvidia_open" ]; then
@ -533,8 +526,6 @@ prepare() {
patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-silence-event-assert-until-570.patch" -d "${srcdir}/${_nv_open_pkg}"
# Fix for HDMI names
patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch" -d "${srcdir}/${_nv_open_pkg}"
# Add fix for 6.12 Display Open issue
patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0006-nvidia-drm-Set-FOP_UNSIGNED_OFFSET-for-nv_drm_fops.f.patch" -d "${srcdir}/${_nv_open_pkg}"
fi
}
@ -766,8 +757,8 @@ for _p in "${pkgname[@]}"; do
}"
done
b2sums=('de3f4dec2fc7e36711c68683d6564d0c3ce6fe728ffa6a629604e2fa9e489dbab45fd6676343f6e68bafbd202a3e814e82a1448b46844e34046b9f82f819b8f4'
'd5f647e8517b423cb3dec37b5b3a65c90c8dcedf36187fb5024a650dfb1817f6cde5f1b0a588a96c374e4b4e78dd7d534b6aa273ed28510e5c0900b96fc48049'
b2sums=('3161f791e13156a97215b14ed9d0a18dfd69324e7fa516df2a9385678ba2a2cd67196aa9efd82f7d9f1cb2c91b8733a095ced66c491f3a80c8c70eec1dc703d8'
'8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701'
'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667'
'158349b76cd1a08fd1ca2eaa6cce1573fa39eab4641b69baaafbdf4cad1890377762bdd6c76a4731c4ddce8b98b4ed6fd302df02b93b59e17ebfa50265cedce7'
'a1bad436ffcaf36266949471ed025b889cf88fe7ecf8174ab73783f3f83630df90911e0b962386c964056b79ab0ec50babe0a3a81b83904216b0eec65f80eb2d')
'd290e958f4870002d5ec6616fa45d9259277bbb7a92b0ff1b093d001bea45be5736f44ecfdeaa4d6fc40c4580ac954b41187b57a323c8b6e4c142f71c9d94724'
'09e70082f6e1a5e969c545f123f3ecb74880f9b5ef4ad81a64ffd59a105d589fd9aa24699fd9088422c61b961eca647519a66e6893df120aa079e45fc7761702')

10
config
View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.12.0 Kernel Configuration
# Linux/x86 6.12.2 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20240910"
CONFIG_CC_IS_GCC=y
@ -12,7 +12,7 @@ CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24300
CONFIG_LLD_VERSION=0
CONFIG_RUSTC_VERSION=108200
CONFIG_RUSTC_LLVM_VERSION=180108
CONFIG_RUSTC_LLVM_VERSION=190101
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@ -450,7 +450,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MSKYLAKE is not set
# CONFIG_MSKYLAKEX is not set
# CONFIG_MCANNONLAKE is not set
# CONFIG_MICELAKE is not set
# CONFIG_MICELAKE_CLIENT is not set
# CONFIG_MICELAKE_SERVER is not set
# CONFIG_MCASCADELAKE is not set
# CONFIG_MCOOPERLAKE is not set
# CONFIG_MTIGERLAKE is not set
@ -1233,6 +1234,9 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
CONFIG_ANON_MIN_RATIO=15
CONFIG_CLEAN_LOW_RATIO=0
CONFIG_CLEAN_MIN_RATIO=15
CONFIG_HAVE_GUP_FAST=y
CONFIG_NUMA_KEEP_MEMINFO=y
CONFIG_MEMORY_ISOLATION=y