This commit is contained in:
Peter Jung 2022-06-23 20:21:56 +02:00
parent b0020aa633
commit 2c5f2cbe25
No known key found for this signature in database
GPG Key ID: C3C4820857F654FE
2 changed files with 25 additions and 28 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.18.5 pkgver = 5.18.6
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
@ -24,37 +24,37 @@ pkgbase = linux-cachyos
makedepends = make makedepends = make
makedepends = patch makedepends = patch
options = !strip options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.5.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.6.tar.xz
source = config source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cachy.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cachy.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-bbr2.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-bbr2.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-clearlinux.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fixes.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fixes.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-rcu.patch
source = auto-cpu-optimization.sh source = auto-cpu-optimization.sh
sha256sums = 9c3731d405994f9cd3a1bb72e83140735831b19c7cec18e0d7a8f3046fa034e7 sha256sums = 4e1c2a9e79847850029571a1dd04761e5f657b52c558070a085365641f133478
sha256sums = 49ddff0aac1493c3049450f8dacb9de5217c5d9254bc736cd012b3e7bda6baf2 sha256sums = 49ddff0aac1493c3049450f8dacb9de5217c5d9254bc736cd012b3e7bda6baf2
sha256sums = 59279d00aae10848b167aab32baead615dc147996bd7c9542c8a65ec0bb33c21 sha256sums = cdeb94550047982e9a69e4f1068e06884bc8e25bba8d6653b0addbe6d43ee137
sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271 sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6 sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232 sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = 71c33bf75dbf84673ad26a35c20b0f9ae0fa9944d91cd93a0b128752ca2eab0e sha256sums = 71c33bf75dbf84673ad26a35c20b0f9ae0fa9944d91cd93a0b128752ca2eab0e
sha256sums = 74797806c5f0fd05138e184dc7d871fae448648d57200f0a2df9c78ea04b8b99 sha256sums = 39551bf08e6b965db7b125c81a17f60f695a686b13ddc6499463222fd6cec9b4
sha256sums = c60891c18687da053ed826a9195b070e19657d72e87424a48011ebbb42af37d5 sha256sums = efa0cd8f02f1289d8775ce64dc4a2a061b225612e8f1513591c147a3925dc7bd
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00 sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = 16085e0bba8e1843180f82df00d6040b97531cebb2c0c4c7fe23860322d06beb sha256sums = 16085e0bba8e1843180f82df00d6040b97531cebb2c0c4c7fe23860322d06beb
sha256sums = 180baf6baf2474b3ce2b1841b41659e909f9367271f03be443937fbd5d518004
sha256sums = f5b02a27a6324fc5aaabbca03e76d483da9ff51c389e4fabda51fd85f77217fc sha256sums = f5b02a27a6324fc5aaabbca03e76d483da9ff51c389e4fabda51fd85f77217fc
sha256sums = 292240ee42f4e34b97528c9b2b2afcef7bc892501a3750b8825ac6ef9c87072e sha256sums = 292240ee42f4e34b97528c9b2b2afcef7bc892501a3750b8825ac6ef9c87072e
sha256sums = f534b60c0d90ef59312ac874f0fbbcd60434ceac673148e76c503752e837126b
sha256sums = e3bb6ca80b9156c409fdd0ca55916f028213f7b4fc7dcf7cea7702e08822ea5f
sha256sums = ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f sha256sums = ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f
pkgname = linux-cachyos pkgname = linux-cachyos

View File

@ -107,9 +107,6 @@ _nf_cone=y
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full." # "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
_use_llvm_lto= _use_llvm_lto=
## Change the thin lto cachedir for fixing building several dkms modules including zfs
_thin_lto_cachedir=
# KCFI is a proposed forward-edge control-flow integrity scheme for # KCFI is a proposed forward-edge control-flow integrity scheme for
# Clang, which is more suitable for kernel use than the existing CFI # Clang, which is more suitable for kernel use than the existing CFI
# scheme used by CONFIG_CFI_CLANG. KCFI doesn't require LTO, doesn't # scheme used by CONFIG_CFI_CLANG. KCFI doesn't require LTO, doesn't
@ -135,7 +132,7 @@ else
pkgbase=linux-$pkgsuffix pkgbase=linux-$pkgsuffix
fi fi
_major=5.18 _major=5.18
_minor=5 _minor=6
#_minorc=$((_minor+1)) #_minorc=$((_minor+1))
#_rcver=rc8 #_rcver=rc8
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
@ -146,7 +143,7 @@ _srcname=linux-${_stable}
#_srcname=linux-${_major} #_srcname=linux-${_major}
arch=(x86_64 x86_64_v3) arch=(x86_64 x86_64_v3)
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"
@ -165,11 +162,11 @@ fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}" _patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
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"
"${_patchsource}/0001-cachy.patch" "${_patchsource}/0001-cachy.patch"
) )
if [ -n "$_build_zfs" ]; then if [ -n "$_build_zfs" ]; then
source+=("git+https://github.com/ptr1337/zfs.git#commit=24414b85f1b0fce4b13c10be4af47ebb826fef27") source+=("git+https://github.com/openzfs/zfs.git#commit=6c3c5fcfbe27d9193cd131753cc7e47ee2784621")
fi fi
if [ "$_cpusched" = "bmq" ]; then if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch") source+=("${_patchsource}/sched/0001-prjc.patch")
@ -193,20 +190,20 @@ if [ "$_cpusched" = "hardened" ]; then
source+=( source+=(
"${_patchsource}/sched/0001-bore-sched.patch" "${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-hardening.patch" "${_patchsource}/0001-hardening.patch"
"${_patchsource}/0001-hardened.patch") "${_patchsource}/0001-hardened.patch")
fi fi
source+=( source+=(
"${_patchsource}/0001-amd-perf.patch" "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-bbr2.patch" "${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch" "${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
"${_patchsource}/0001-fixes.patch" "${_patchsource}/0001-fixes.patch"
"${_patchsource}/0001-fs-patches.patch" "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch" "${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch" "${_patchsource}/0001-hwmon.patch"
"${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch" "${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch" "${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-rcu.patch"
"auto-cpu-optimization.sh" "auto-cpu-optimization.sh"
) )
if [ -n "$_use_kcfi" ]; then if [ -n "$_use_kcfi" ]; then
@ -220,7 +217,7 @@ if [ -n "$_use_kcfi" ]; then
fi fi
if [ -n "$_bcachefs" ]; then if [ -n "$_bcachefs" ]; then
source+=("${_patchsource}/0001-bcachefs.patch") source+=("${_patchsource}/0001-bcachefs-after-lru.patch")
fi fi
export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_HOST=archlinux
@ -811,19 +808,19 @@ for _p in "${pkgname[@]}"; do
}" }"
done done
sha256sums=('9c3731d405994f9cd3a1bb72e83140735831b19c7cec18e0d7a8f3046fa034e7' sha256sums=('4e1c2a9e79847850029571a1dd04761e5f657b52c558070a085365641f133478'
'49ddff0aac1493c3049450f8dacb9de5217c5d9254bc736cd012b3e7bda6baf2' '49ddff0aac1493c3049450f8dacb9de5217c5d9254bc736cd012b3e7bda6baf2'
'59279d00aae10848b167aab32baead615dc147996bd7c9542c8a65ec0bb33c21' 'cdeb94550047982e9a69e4f1068e06884bc8e25bba8d6653b0addbe6d43ee137'
'7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271' '7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271'
'326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6' '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232' 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
'71c33bf75dbf84673ad26a35c20b0f9ae0fa9944d91cd93a0b128752ca2eab0e' '71c33bf75dbf84673ad26a35c20b0f9ae0fa9944d91cd93a0b128752ca2eab0e'
'74797806c5f0fd05138e184dc7d871fae448648d57200f0a2df9c78ea04b8b99' '39551bf08e6b965db7b125c81a17f60f695a686b13ddc6499463222fd6cec9b4'
'c60891c18687da053ed826a9195b070e19657d72e87424a48011ebbb42af37d5' 'efa0cd8f02f1289d8775ce64dc4a2a061b225612e8f1513591c147a3925dc7bd'
'1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00' '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
'16085e0bba8e1843180f82df00d6040b97531cebb2c0c4c7fe23860322d06beb' '16085e0bba8e1843180f82df00d6040b97531cebb2c0c4c7fe23860322d06beb'
'180baf6baf2474b3ce2b1841b41659e909f9367271f03be443937fbd5d518004'
'f5b02a27a6324fc5aaabbca03e76d483da9ff51c389e4fabda51fd85f77217fc' 'f5b02a27a6324fc5aaabbca03e76d483da9ff51c389e4fabda51fd85f77217fc'
'292240ee42f4e34b97528c9b2b2afcef7bc892501a3750b8825ac6ef9c87072e' '292240ee42f4e34b97528c9b2b2afcef7bc892501a3750b8825ac6ef9c87072e'
'f534b60c0d90ef59312ac874f0fbbcd60434ceac673148e76c503752e837126b'
'e3bb6ca80b9156c409fdd0ca55916f028213f7b4fc7dcf7cea7702e08822ea5f'
'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f') 'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f')