Bump to 6.6.31

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2024-05-17 14:48:09 +02:00
parent affc2597fa
commit c6a3b369d8
No known key found for this signature in database
GPG key ID: 79AFA05ABDB26C5A
2 changed files with 11 additions and 8 deletions

View file

@ -1,6 +1,6 @@
pkgbase = linux-cachyos-lts
pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.30
pkgver = 6.6.31
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@ -23,15 +23,15 @@ pkgbase = linux-cachyos-lts
makedepends = python
options = !strip
options = !debug
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.30.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.31.tar.xz
source = config
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch
sha256sums = b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6
sha256sums = d6ecff966f8c95ec4cb3bb303904f757b7de6a6bcfef0d0771cb852158e61c20
sha256sums = fdc2b032badafe9eb4b5e27925df057fe6d24dc0803bd37dd4be895f3606dbed
sha256sums = 3f3233256725683aa95c29ee423932a5bcc74c0653e09d502240601387c3edec
sha256sums = 054d5faa8e1314ae0393bd4502f82319e32719a92cfd6fd5468aea999b077a18
sha256sums = 794a5b743bd94a715957dc5fa391c3e3cd283b4aa12a4af9487565639192ef72
sha256sums = e5bac2247f709a073ff5c901e9ec2043641d0cf61d8e64dcdfd35f489c72c13a
pkgname = linux-cachyos-lts

View file

@ -165,7 +165,7 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then
pkgbase=linux-$pkgsuffix
fi
_major=6.6
_minor=30
_minor=31
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@ -216,6 +216,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/make-modeset-fbdev-default.patch"
"${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
fi
@ -265,6 +266,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
[[ $src = make-modeset-fbdev-default.patch ]] && continue
[[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
@ -558,7 +560,8 @@ prepare() {
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
# Temporary fix for nvidia module
# Use fbdev and modeset as default
patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}"
patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
@ -745,8 +748,8 @@ for _p in "${pkgname[@]}"; do
}"
done
sha256sums=('b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6'
sha256sums=('d6ecff966f8c95ec4cb3bb303904f757b7de6a6bcfef0d0771cb852158e61c20'
'fdc2b032badafe9eb4b5e27925df057fe6d24dc0803bd37dd4be895f3606dbed'
'3f3233256725683aa95c29ee423932a5bcc74c0653e09d502240601387c3edec'
'054d5faa8e1314ae0393bd4502f82319e32719a92cfd6fd5468aea999b077a18'
'794a5b743bd94a715957dc5fa391c3e3cd283b4aa12a4af9487565639192ef72'
'e5bac2247f709a073ff5c901e9ec2043641d0cf61d8e64dcdfd35f489c72c13a')