Bump to 6.5.2

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2023-09-07 19:41:27 +02:00
parent 206c5e5050
commit cbff90beef
No known key found for this signature in database
GPG key ID: 79AFA05ABDB26C5A
2 changed files with 49 additions and 10 deletions

View file

@ -1,6 +1,6 @@
pkgbase = linux-cachyos pkgbase = linux-cachyos
pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.5.1 pkgver = 6.5.2
pkgrel = 1 pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos url = https://github.com/CachyOS/linux-cachyos
arch = x86_64 arch = x86_64
@ -22,16 +22,16 @@ pkgbase = linux-cachyos
makedepends = patch makedepends = patch
makedepends = python makedepends = python
options = !strip options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.5.1.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.5.2.tar.xz
source = config source = config
source = auto-cpu-optimization.sh source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/sched/0001-EEVDF-cachy.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/sched/0001-EEVDF-cachy.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/sched/0001-bore-eevdf.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/sched/0001-bore-eevdf.patch
b2sums = 9d44c188bb7b5d35c685b5718d61a3b5a0b6a335019a8c549ca79f48ea85884dd535f2eb15ab5e0fab841e9861007d706f2424d7bb1ee96f494afa884838a9c8 b2sums = 74a4f998987780001e924e28f8a3f585cd50da9d87d120bcb33fe1fd4fccccc2301fbc3c84c62e914e4694b5eb138e33cacda515db51d5a3997d114154449be3
b2sums = b6647cb293a30ed8bb7f75be0a686576ee38f83b671d424e194ae73897a86f3af0566977da912271b6a2fdd50cea157e8bb0e19650cdce0bfc6bf59f310d890c b2sums = b6647cb293a30ed8bb7f75be0a686576ee38f83b671d424e194ae73897a86f3af0566977da912271b6a2fdd50cea157e8bb0e19650cdce0bfc6bf59f310d890c
b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0 b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
b2sums = c7dd05f4ebb4a963fe043af55e2d894aeefdb65197951e93e630a2f86716b25a9ea4c731529025dc99a2fb8568577cc9e5958768d2e672515af23eb459fa1f7d b2sums = 84d38cd79a1680bff4f84acd692d948d8ef5e798dca4dd3e14927b0f6c6295956e7ef583daa7749e212037bbb6b5d17eec01be8fd31966549bae0a90cb5d63e5
b2sums = db78ba180ea95c77f04d3d3dc99d07c35c0e9efcfd2baf997e485b721adefb5684bf62185436353f7faceba1d2271b5c1c430fcad9a441657bfabdf74d36917b b2sums = db78ba180ea95c77f04d3d3dc99d07c35c0e9efcfd2baf997e485b721adefb5684bf62185436353f7faceba1d2271b5c1c430fcad9a441657bfabdf74d36917b
b2sums = 21bd89028133e9a25878e5841808194c1aa742afe0700e669bc5a024091e04b87b23566e96b451bbad235a33d828f5853e75dab0ec677ad9a16c6406c2ced850 b2sums = 21bd89028133e9a25878e5841808194c1aa742afe0700e669bc5a024091e04b87b23566e96b451bbad235a33d828f5853e75dab0ec677ad9a16c6406c2ced850

View file

@ -156,6 +156,10 @@ _use_kcfi=${_use_kcfi-}
# If you use ZFS, refrain from building the RT kernel # If you use ZFS, refrain from building the RT kernel
_build_zfs=${_build_zfs-} _build_zfs=${_build_zfs-}
# Builds the nvidia module and package it into a own base
# This does replace the requirement of nvidia-dkms
_build_nvidia=${_build_nvidia-}
# Enable bcachefs # Enable bcachefs
_bcachefs=${_bcachefs-} _bcachefs=${_bcachefs-}
@ -168,7 +172,7 @@ else
pkgbase=linux-$pkgsuffix pkgbase=linux-$pkgsuffix
fi fi
_major=6.5 _major=6.5
_minor=1 _minor=2
#_minorc=$((_minor+1)) #_minorc=$((_minor+1))
#_rcver=rc8 #_rcver=rc8
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
@ -196,6 +200,8 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k
) )
fi fi
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
_nv_ver=535.104.05
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
source=( source=(
"https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
"config" "config"
@ -208,6 +214,11 @@ if [ -n "$_build_zfs" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=8ce2eba9e6a384feef93d77c397f37d17dc588ce") source+=("git+https://github.com/cachyos/zfs.git#commit=8ce2eba9e6a384feef93d77c397f37d17dc588ce")
fi 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")
fi
case "$_cpusched" in case "$_cpusched" in
cachyos) # CachyOS Scheduler (EEVDF + BORE) cachyos) # CachyOS Scheduler (EEVDF + BORE)
source+=("${_patchsource}/sched/0001-EEVDF-cachy.patch" source+=("${_patchsource}/sched/0001-EEVDF-cachy.patch"
@ -637,12 +648,28 @@ prepare() {
echo "Save configuration for later reuse..." echo "Save configuration for later reuse..."
cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}" cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
fi
} }
build() { build() {
cd ${srcdir}/${_srcname} cd ${srcdir}/${_srcname}
make ${BUILD_FLAGS[*]} -j$(nproc) all make ${BUILD_FLAGS[*]} -j$(nproc) all
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}/${_nv_pkg}/kernel"
local MODULE_FLAGS=(
KERNEL_UNAME="${pkgver}-${pkgsuffix}"
IGNORE_PREEMPT_RT_PRESENCE=1
NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES'
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
fi
if [ -n "$_build_zfs" ]; then if [ -n "$_build_zfs" ]; then
cd ${srcdir}/"zfs" cd ${srcdir}/"zfs"
@ -784,10 +811,22 @@ _package-zfs(){
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install" # sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
} }
_package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("linux-$pkgsuffix=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
pkgname=("$pkgbase" "$pkgbase-headers") pkgname=("$pkgbase" "$pkgbase-headers")
if [ -n "$_build_zfs" ]; then [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
pkgname+=("$pkgbase-zfs") [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
fi
for _p in "${pkgname[@]}"; do for _p in "${pkgname[@]}"; do
eval "package_$_p() { eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}") $(declare -f "_package${_p#$pkgbase}")
@ -795,9 +834,9 @@ for _p in "${pkgname[@]}"; do
}" }"
done done
b2sums=('9d44c188bb7b5d35c685b5718d61a3b5a0b6a335019a8c549ca79f48ea85884dd535f2eb15ab5e0fab841e9861007d706f2424d7bb1ee96f494afa884838a9c8' b2sums=('74a4f998987780001e924e28f8a3f585cd50da9d87d120bcb33fe1fd4fccccc2301fbc3c84c62e914e4694b5eb138e33cacda515db51d5a3997d114154449be3'
'b6647cb293a30ed8bb7f75be0a686576ee38f83b671d424e194ae73897a86f3af0566977da912271b6a2fdd50cea157e8bb0e19650cdce0bfc6bf59f310d890c' 'b6647cb293a30ed8bb7f75be0a686576ee38f83b671d424e194ae73897a86f3af0566977da912271b6a2fdd50cea157e8bb0e19650cdce0bfc6bf59f310d890c'
'11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0' '11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
'c7dd05f4ebb4a963fe043af55e2d894aeefdb65197951e93e630a2f86716b25a9ea4c731529025dc99a2fb8568577cc9e5958768d2e672515af23eb459fa1f7d' '84d38cd79a1680bff4f84acd692d948d8ef5e798dca4dd3e14927b0f6c6295956e7ef583daa7749e212037bbb6b5d17eec01be8fd31966549bae0a90cb5d63e5'
'db78ba180ea95c77f04d3d3dc99d07c35c0e9efcfd2baf997e485b721adefb5684bf62185436353f7faceba1d2271b5c1c430fcad9a441657bfabdf74d36917b' 'db78ba180ea95c77f04d3d3dc99d07c35c0e9efcfd2baf997e485b721adefb5684bf62185436353f7faceba1d2271b5c1c430fcad9a441657bfabdf74d36917b'
'21bd89028133e9a25878e5841808194c1aa742afe0700e669bc5a024091e04b87b23566e96b451bbad235a33d828f5853e75dab0ec677ad9a16c6406c2ced850') '21bd89028133e9a25878e5841808194c1aa742afe0700e669bc5a024091e04b87b23566e96b451bbad235a33d828f5853e75dab0ec677ad9a16c6406c2ced850')