Skip to content

Commit 5db083b

Browse files
committed
linux-cachyos-rc: cgroup-vram and update zfs commit
Signed-off-by: Peter Jung <admin@ptr1337.dev>
1 parent 708043b commit 5db083b

2 files changed

Lines changed: 14 additions & 17 deletions

File tree

linux-cachyos-rc/.SRCINFO

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = linux-cachyos-rc
2-
pkgdesc = Linux BORE + LTO + AutoFDO + Propeller + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate
2+
pkgdesc = Linux Clang ThinLTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate
33
pkgver = 7.0.rc7
4-
pkgrel = 1
4+
pkgrel = 2
55
url = https://github.com/CachyOS/linux-cachyos
66
arch = x86_64
77
license = GPL-2.0-only
@@ -24,17 +24,15 @@ pkgbase = linux-cachyos-rc
2424
options = !strip
2525
options = !debug
2626
options = !lto
27-
source = https://github.com/CachyOS/linux/releases/download/cachyos-7.0-rc7-2/cachyos-7.0-rc7-2.tar.gz
27+
source = https://github.com/CachyOS/linux/releases/download/cachyos-7.0-rc7-3/cachyos-7.0-rc7-3.tar.gz
2828
source = config
2929
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/7.0/misc/dkms-clang.patch
30-
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/7.0/sched/0001-bore-cachy.patch
31-
b2sums = b71424d4ab6caedeb8a0642091d8f86e2d90d377431f1a3de1c45e63363bb908940467f6693ee3ff8349372b08c736606cf1bb877e4c061f3648f3bd22713d90
30+
b2sums = 83a22300c3aca33fc4ba63171546d1ae1f1a3126553a61d45aa656e06a6d0b11a05a417f0854c75bf8570d9fd165765789af939c352388c57344b85de157cfad
3231
b2sums = f31abd75b2551c74aa86e8dd3f31e959dab2592e20ec52ffae5505b4baad2eef12757a77908fba3e95391c074b68da4d9ef6f213dc6ba224ae1872cd6ca457eb
3332
b2sums = c992567bd7dd8553432be496ffa1c17e2f5ebe9c7edb51945cf977e1b742dd6517c210d8843bb82744ca705efd07f8027cd7dde41b50215ebd707a34aa81462e
34-
b2sums = 786f91e6946bfb654c95659721ea37a0ad004691cca797132f2a8722e7e8f6514d72d2a3547dbb6f4ebba48a40bd4c333d4632b47c21f593813e738fdf0ba4db
3533

3634
pkgname = linux-cachyos-rc
37-
pkgdesc = The Linux BORE + LTO + AutoFDO + Propeller + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel and modules
35+
pkgdesc = The Linux Clang ThinLTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel and modules
3836
depends = coreutils
3937
depends = kmod
4038
depends = initramfs
@@ -51,7 +49,7 @@ pkgname = linux-cachyos-rc
5149
provides = ADIOS-MODULE
5250

5351
pkgname = linux-cachyos-rc-headers
54-
pkgdesc = Headers and scripts for building modules for the Linux BORE + LTO + AutoFDO + Propeller + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel
52+
pkgdesc = Headers and scripts for building modules for the Linux Clang ThinLTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel
5553
depends = pahole
5654
depends = linux-cachyos-rc
5755
depends = clang

linux-cachyos-rc/PKGBUILD

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@ _minor=0
180180
#_minorc=$((_minor+1))
181181
_rcver=rc7
182182
pkgver=${_major}.${_rcver}
183-
_tagrel=2
184-
pkgrel=1
183+
_tagrel=3
184+
pkgrel=2
185185
#_stable=${_major}.${_minor}
186186
#_stable=${_major}
187187
_stable=${_major}-${_rcver}
188188
_srctag=cachyos-${_major}-${_rcver}-${_tagrel}
189189
_srcname=${_srctag}
190-
pkgdesc='Linux BORE + LTO + AutoFDO + Propeller + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate'
190+
pkgdesc='Linux Clang ThinLTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate'
191191
_kernver="$pkgver-$pkgrel"
192192
_kernuname="${pkgver}-${_pkgsuffix}"
193193
arch=('x86_64')
@@ -238,7 +238,7 @@ fi
238238
# ZFS support
239239
if [ "$_build_zfs" = "yes" ]; then
240240
makedepends+=(git)
241-
source+=("git+https://github.com/cachyos/zfs.git#commit=6132f5bc08f2b3f86677ac9f3a12a688eb984d11")
241+
source+=("git+https://github.com/cachyos/zfs.git#commit=0829cf892b5d7b3a0e8aa76cc7aca02b84f62557")
242242
fi
243243

244244

@@ -272,7 +272,7 @@ fi
272272

273273
## List of CachyOS schedulers
274274
case "$_cpusched" in
275-
cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE)
275+
bore|rt-bore|hardened) # CachyOS Scheduler (BORE)
276276
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;&
277277
bmq) ## Project C Scheduler
278278
source+=("${_patchsource}/sched/0001-prjc-cachy.patch");;
@@ -334,7 +334,7 @@ prepare() {
334334

335335
### Selecting the CPU scheduler
336336
case "$_cpusched" in
337-
cachyos|bore|hardened) scripts/config -e SCHED_BORE;;
337+
bore|hardened) scripts/config -e SCHED_BORE;;
338338
bmq) scripts/config -e SCHED_ALT -e SCHED_BMQ;;
339339
eevdf) ;;
340340
rt) scripts/config -e PREEMPT_RT;;
@@ -802,7 +802,6 @@ for _p in "${pkgname[@]}"; do
802802
}"
803803
done
804804

805-
b2sums=('b71424d4ab6caedeb8a0642091d8f86e2d90d377431f1a3de1c45e63363bb908940467f6693ee3ff8349372b08c736606cf1bb877e4c061f3648f3bd22713d90'
805+
b2sums=('83a22300c3aca33fc4ba63171546d1ae1f1a3126553a61d45aa656e06a6d0b11a05a417f0854c75bf8570d9fd165765789af939c352388c57344b85de157cfad'
806806
'f31abd75b2551c74aa86e8dd3f31e959dab2592e20ec52ffae5505b4baad2eef12757a77908fba3e95391c074b68da4d9ef6f213dc6ba224ae1872cd6ca457eb'
807-
'c992567bd7dd8553432be496ffa1c17e2f5ebe9c7edb51945cf977e1b742dd6517c210d8843bb82744ca705efd07f8027cd7dde41b50215ebd707a34aa81462e'
808-
'786f91e6946bfb654c95659721ea37a0ad004691cca797132f2a8722e7e8f6514d72d2a3547dbb6f4ebba48a40bd4c333d4632b47c21f593813e738fdf0ba4db')
807+
'c992567bd7dd8553432be496ffa1c17e2f5ebe9c7edb51945cf977e1b742dd6517c210d8843bb82744ca705efd07f8027cd7dde41b50215ebd707a34aa81462e')

0 commit comments

Comments
 (0)