nyyu/linux-cachyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bump to 6.1.12-1

Browse source 
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2023-02-14 21:20:57 +01:00
parent bf228314bf
commit 5e1fe07d35
No known key found for this signature in database
GPG key ID: 79AFA05ABDB26C5A
2 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.SRCINFO
View file

@ -1,6 +1,6 @@
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 = 6.1.11 pkgver = 6.1.12
pkgrel = 1 pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos url = https://github.com/CachyOS/linux-cachyos
arch = x86_64 arch = x86_64
@ -21,18 +21,18 @@ pkgbase = linux-cachyos
makedepends = make makedepends = make
makedepends = patch makedepends = patch
options = !strip options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.11.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.12.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.1/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch
sha256sums = 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 sha256sums = d47aa675170904dcc93eeaa7c96db54d476a11c5d3e8cf3d3b96e364e2a0edea
sha256sums = 509bde973c87ce534f047ef4bdcd8b07dce606ea8e2fd91af1af0641db21eb37 sha256sums = 509bde973c87ce534f047ef4bdcd8b07dce606ea8e2fd91af1af0641db21eb37
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106 sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = b432d83476b893c2f46b5284bacdf0d760f3708c87dc57905740ad21dc8fc540 sha256sums = 750aafca9b47da4a30fe55b5ffbbe6bbba7129bb7c9fd46621cce80a7ac66401
sha256sums = b40bd5d425701f9d0d4ba3cc9e6f4fac73e80a94e640b16ad2e1fb0183217a49 sha256sums = a9566828cf8b62edfd961d4f5309dd1c414697122835e75c5141fe467ca8c7c0
sha256sums = 12d91f5d6fb3efea7957d5af6bfdb0d917133f9869e29f7249035e8ae750a62e sha256sums = 07dd83252dba452113f2a1f7650117edb725ca92a149ec4fec03fd389abbc81c
pkgname = linux-cachyos pkgname = linux-cachyos
pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules

60
PKGBUILD
View file

@ -197,7 +197,7 @@ else
pkgbase=linux-$pkgsuffix pkgbase=linux-$pkgsuffix
fi fi
_major=6.1 _major=6.1
_minor=11 _minor=12
#_minorc=$((_minor+1)) #_minorc=$((_minor+1))
#_rcver=rc8 #_rcver=rc8
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
@ -215,7 +215,7 @@ license=('GPL2')
options=('!strip') options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch') makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends # LLVM makedepends
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
makedepends+=(clang llvm lld python) makedepends+=(clang llvm lld python)
BUILD_FLAGS=( BUILD_FLAGS=(
CC=clang CC=clang
@ -224,21 +224,19 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
LLVM_IAS=1 LLVM_IAS=1
) )
fi fi
# ZFS makedepends
if [ -n "$_build_zfs" ]; then
makedepends+=(git)
fi
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" _patchsource="https://raw.githubusercontent.com/cachyos/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"
"auto-cpu-optimization.sh" "auto-cpu-optimization.sh"
"${_patchsource}/all/0001-cachyos-base-all.patch") "${_patchsource}/all/0001-cachyos-base-all.patch")
## ZFS Support
# ZFS support
if [ -n "$_build_zfs" ]; then if [ -n "$_build_zfs" ]; then
makedepends+=(git)
source+=("git+https://github.com/cachyos/zfs.git#commit=92e0d9d183ce6752cd52f7277c8321d81df9ffee") source+=("git+https://github.com/cachyos/zfs.git#commit=92e0d9d183ce6752cd52f7277c8321d81df9ffee")
fi fi
## Latency NICE Support ## Latency NICE Support
if [ -n "$_latency_nice" ]; then if [ -n "$_latency_nice" ]; then
if [[ "$_cpusched" = "bore" || "$_cpusched" = "cfs" || "$_cpusched" = "hardened" ]]; then if [[ "$_cpusched" = "bore" || "$_cpusched" = "cfs" || "$_cpusched" = "hardened" ]]; then
@ -259,14 +257,6 @@ case "$_cpusched" in
"${_patchsource}/misc/0001-hardened.patch");; "${_patchsource}/misc/0001-hardened.patch");;
esac esac
## Kernel CFI Patch
if [ -n "$_use_kcfi" ]; then
BUILD_FLAGS=(
CC=clang
LD=ld.lld
LLVM=1
)
fi
## bcachefs Support ## bcachefs Support
if [ -n "$_bcachefs" ]; then if [ -n "$_bcachefs" ]; then
source+=("${_patchsource}/misc/0001-bcachefs.patch") source+=("${_patchsource}/misc/0001-bcachefs.patch")
@ -408,12 +398,14 @@ prepare() {
fi fi
### Setting NR_CPUS ### Setting NR_CPUS
if [ -n "$_nr_cpus" ]; then if [[ "$_nr_cpus" -ge 2 && "$_nr_cpus" -le 512 ]]; then
echo "Setting custom NR_CPUS..." echo "Setting custom NR_CPUS..."
scripts/config --set-val NR_CPUS "$_nr_cpus" scripts/config --set-val NR_CPUS "$_nr_cpus"
else elif [ -z "$_nr_cpus" ]; then
echo "Setting default NR_CPUS..." echo "Setting default NR_CPUS..."
scripts/config --set-val NR_CPUS 320 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 fi
### Disable MQ Deadline I/O scheduler ### Disable MQ Deadline I/O scheduler
@ -703,21 +695,15 @@ build() {
if [ -n "$_build_zfs" ]; then if [ -n "$_build_zfs" ]; then
cd ${srcdir}/"zfs" cd ${srcdir}/"zfs"
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then local CONFIGURE_FLAGS=()
./autogen.sh [ "$_use_llvm_lto" != "none" ] && CONFIGURE_FLAGS+=("KERNEL_LLVM=1")
sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
./configure KERNEL_LLVM=1 --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \ ./autogen.sh
--datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
--libexecdir=/usr/lib/zfs --with-config=kernel \ ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
--with-linux=${srcdir}/$_srcname --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \
else --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \
./autogen.sh --with-linux=${srcdir}/$_srcname
sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
--datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \
--libexecdir=/usr/lib/zfs --with-config=kernel \
--with-linux=${srcdir}/$_srcname
fi
make ${BUILD_FLAGS[*]} make ${BUILD_FLAGS[*]}
fi fi
} }
@ -859,9 +845,9 @@ for _p in "${pkgname[@]}"; do
}" }"
done done
sha256sums=('581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1' sha256sums=('d47aa675170904dcc93eeaa7c96db54d476a11c5d3e8cf3d3b96e364e2a0edea'
'509bde973c87ce534f047ef4bdcd8b07dce606ea8e2fd91af1af0641db21eb37' '509bde973c87ce534f047ef4bdcd8b07dce606ea8e2fd91af1af0641db21eb37'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106' '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'b432d83476b893c2f46b5284bacdf0d760f3708c87dc57905740ad21dc8fc540' '750aafca9b47da4a30fe55b5ffbbe6bbba7129bb7c9fd46621cce80a7ac66401'
'b40bd5d425701f9d0d4ba3cc9e6f4fac73e80a94e640b16ad2e1fb0183217a49' 'a9566828cf8b62edfd961d4f5309dd1c414697122835e75c5141fe467ca8c7c0'
'12d91f5d6fb3efea7957d5af6bfdb0d917133f9869e29f7249035e8ae750a62e') '07dd83252dba452113f2a1f7650117edb725ca92a149ec4fec03fd389abbc81c')