diff options
author | Piotr Gorski | 2023-04-24 16:15:18 +0200 |
---|---|---|
committer | Piotr Gorski | 2023-04-24 16:15:18 +0200 |
commit | 4b181ac3913e6b70a571e5f5a21ecd0d1a182ba9 (patch) | |
tree | 181de3619f38c07a70286d0296284f196196d941 /PKGBUILD | |
parent | 18962f07d2fe31846dd38a5a668cc3bbef2b5ddd (diff) | |
download | aur-4b181ac3913e6b70a571e5f5a21ecd0d1a182ba9.tar.gz |
Bump to 6.3
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 52 |
1 files changed, 23 insertions, 29 deletions
@@ -98,8 +98,7 @@ _lru_config=${_lru_config-standard} # 'standard' - enable per-VMA locking # 'stats' - enable per-VMA locking with stats # 'none' - disable per-VMA locking -# Broken since 6.2.11 due the maple tree RCU patches. Will be as default enabled in 6.3 -# _vma_config=${_vma_config-none} +_vma_config=${_vma_config-standard} ### Transparent Hugepages # ATTENTION - one of two predefined values should be selected! @@ -185,7 +184,8 @@ _bcachefs=${_bcachefs-} # Ananicy-cpp has a implementation for this # You need to configure ananicy-cpp for this or use existing settings # Its default enabled at the "cachyos" scheduler option -_latency_nice=${_latency_nice-} +# _latency_nice=${_latency_nice-} +# Disabled till rebased if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ -n "$_use_lto_suffix" ]; then pkgsuffix=${_cpusched}-lto @@ -195,13 +195,13 @@ else pkgsuffix=${_cpusched} pkgbase=linux-$pkgsuffix fi -_major=6.2 -_minor=12 +_major=6.3 +_minor=0 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -_stable=${_major}.${_minor} -#_stable=${_major} +#_stable=${_major}.${_minor} +_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} @@ -233,7 +233,7 @@ source=( # ZFS support if [ -n "$_build_zfs" ]; then makedepends+=(git) - source+=("git+https://github.com/cachyos/zfs.git#commit=e25f9131d679692704c11dc0c1df6d4585b70c35") + source+=("git+https://github.com/cachyos/zfs.git#commit=ac18dc77f3703940682aecb442f4e58aa2c14f1a") fi ## Latency NICE Support @@ -269,10 +269,6 @@ 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 ## lrng patchset if [ -n "$_lrng_enable" ]; then source+=("${_patchsource}/misc/0001-lrng.patch") @@ -288,8 +284,6 @@ prepare() { cd ${srcdir}/$_srcname - echo "Setting version..." - scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname @@ -483,16 +477,16 @@ prepare() { echo "Selecting '$_lru_config' LRU_GEN config..." ### Select VMA config -# [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again." -# -# case "$_vma_config" in -# standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;; -# stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;; -# none) scripts/config -d PER_VMA_LOCK;; -# *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";; -# esac -# -# echo "Selecting '$_vma_config' PER_VMA_LOCK config..." + [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again." + + case "$_vma_config" in + standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;; + stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;; + none) scripts/config -d PER_VMA_LOCK;; + *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";; + esac + + echo "Selecting '$_vma_config' PER_VMA_LOCK config..." ### Select THP [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again." @@ -831,7 +825,7 @@ _package-zfs(){ cd ${srcdir}/"zfs" install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}" - install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}" + install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}" find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} + # sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install" } @@ -847,8 +841,8 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('c7e146b52737adfa4c724bfa41bf4721c5ee3cf220c074fbc60eb3ea62b0ccc8' - '816508270cc1062a9089548a7320922c028431450db4231fc5786d81beedd9ed' +sha256sums=('ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e' + '54d0470901596286036c20b1537754ba71885cad51452bcb9bf42b92b2175cbe' '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106' - 'df9ad8d111f94c6705de28c692de217e39d76b509309f38a3e4a510a5d36d187' - 'c5c48b3e6b08c54b7d057f32da5d11478cf25ba87c903727a77a7b5a8d3f78a8') + '2aad3a138b4fa550fd2de35b5c91f46f3f4bd1e9a9ab0d09b737da2c030da55b' + '5712e53698953d3e0dceda2da72888ec51aff7a0e2973f9e5d6c6894ca5c2b01') |