Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stable: Update to 6.12 #329

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions linux-cachyos-autofdo/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-autofdo
pkgdesc = Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements
pkgver = 6.12.rc7
pkgdesc = Linux BORE + LTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements (AutoFDO Optimized)
pkgver = 6.12.0
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
Expand All @@ -21,21 +21,21 @@ pkgbase = linux-cachyos-autofdo
options = !strip
options = !debug
options = !lto
source = https://github.com/torvalds/linux/archive/refs/tags/v6.12-rc7.tar.gz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.tar.xz
source = config
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/misc/dkms-clang.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-bore-cachy.patch
b2sums = fb767fa467f6c42af06f025970957acfe57dd09ec7119a16f2b503ec563870d9c40a5f128faa9ebb6d5ec05555b66fa0175168007d44b2e25ea410439a4a1193
b2sums = 07b0fd947b811352141ac940f7fc3d91b4dc5fabbf1c9dd2360fb8ddd52ed73e07401b9b294e4e38573b3d96850c46f9dfe7cb2734461136ab685aa0db4702df
b2sums = b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e
b2sums = 62c6d3bb71a0d16b42e37958c46363d086964705e98c2e117af0913d71529b4973cf8e95cd20bed058857da15a00d0cb3d3f57fa5bf3ed89ca89d664af521578
b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667
b2sums = be62c345df6734a3fc8190f1c142531a00497770ca0ff1de8c8a9e3f3ac7074e3a5b562c9ca83d51e39c593f81d2bfcc57a797931b9047c902bd46e4954c5a9f
b2sums = eb40c22ca0f424c575e1360948e972d5b0265436ec7a27d1312e5840207e98927556a24eb65cb2ff30d059a10299feec2a572f2dda88072e0f5b533713c1255e
b2sums = c7294a689f70b2a44b0c4e9f00c61dbd59dd7063ecbe18655c4e7f12e21ed7c5bb4f5169f5aa8623b1c59de7b2667facb024913ecb9f4c650dabce4e8a7e5452
b2sums = a1bad436ffcaf36266949471ed025b889cf88fe7ecf8174ab73783f3f83630df90911e0b962386c964056b79ab0ec50babe0a3a81b83904216b0eec65f80eb2d

pkgname = linux-cachyos-autofdo
pkgdesc = The Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel and modules
pkgdesc = The Linux BORE + LTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements (AutoFDO Optimized) kernel and modules
depends = coreutils
depends = kmod
depends = initramfs
Expand All @@ -51,10 +51,10 @@ pkgname = linux-cachyos-autofdo
provides = NTSYNC-MODULE

pkgname = linux-cachyos-autofdo-dbg
pkgdesc = Non-stripped vmlinux file for the Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel
pkgdesc = Non-stripped vmlinux file for the Linux BORE + LTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements (AutoFDO Optimized) kernel
depends = linux-cachyos-autofdo-headers

pkgname = linux-cachyos-autofdo-headers
pkgdesc = Headers and scripts for building modules for the Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel
pkgdesc = Headers and scripts for building modules for the Linux BORE + LTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements (AutoFDO Optimized) kernel
depends = pahole
depends = linux-cachyos-autofdo
49 changes: 20 additions & 29 deletions linux-cachyos-autofdo/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ _cachy_config=${_cachy_config-y}
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'bmq' - select 'BMQ Scheduler'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
# 'cachyos' - select 'Sched-Ext Scheduler Framework Variant Scheduler with BORE Scheduler'
# 'cachyos' - select 'CachyOS Default Scheduler (BORE)'
# 'eevdf' - select 'EEVDF Scheduler'
# 'rt' - select EEVDF, but includes a series of realtime patches
# 'rt-bore' - select Burst-Oriented Response Enhancer, but includes a series of realtime patches
# 'sched-ext' - select 'sched-ext' Scheduler, based on EEVDF
_cpusched=${_cpusched-cachyos}

### Tweak kernel options prior to a build via nconfig
Expand Down Expand Up @@ -176,14 +175,14 @@ pkgbase="linux-$_pkgsuffix"
_major=6.12
_minor=0
#_minorc=$((_minor+1))
_rcver=rc7
pkgver=${_major}.${_rcver}
#_rcver=rc7
pkgver=${_major}.${_minor}
#_stable=${_major}.${_minor}
#_stable=${_major}
_stable=${_major}-${_rcver}
_stable=${_major}
#_stable=${_major}-${_rcver}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements'
pkgdesc='Linux BORE + LTO + AutoFDO + Cachy Sauce Kernel by CachyOS with other patches and improvements (AutoFDO Optimized)'
pkgrel=1
_kernver="$pkgver-$pkgrel"
_kernuname="${pkgver}-${_pkgsuffix}"
Expand All @@ -209,7 +208,7 @@ _nv_ver=565.57.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}"
source=(
"https://github.com/torvalds/linux/archive/refs/tags/v${_major}-${_rcver}.tar.gz"
"https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
"config"
"auto-cpu-optimization.sh"
"${_patchsource}/all/0001-cachyos-base-all.patch")
Expand Down Expand Up @@ -258,22 +257,15 @@ fi
if [ -n "$_autofdo_use" ]; then
source+=("$_autofdo_profile_name")
fi

## List of CachyOS schedulers
case "$_cpusched" in
cachyos) # CachyOS Scheduler (Sched-ext + BORE + Cachy Sauce)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
bore) ## BORE Scheduler
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE)
source+=("${_patchsource}/sched/0001-bore-cachy.patch");;&
bmq) ## Project C Scheduler
source+=("${_patchsource}/sched/0001-prjc-cachy.patch");;
rt) ## EEVDF with RT patches
source+=(linux-cachyos-rt.install);;
rt-bore) ## RT with BORE Scheduler
source+=("${_patchsource}/sched/0001-bore-cachy-rt.patch"
linux-cachyos-rt.install);;
hardened) ## Hardened Patches with BORE Scheduler
source+=("${_patchsource}/sched/0001-bore-cachy.patch"
"${_patchsource}/misc/0001-hardened.patch");;
hardened) ## Hardened Patches
source+=("${_patchsource}/misc/0001-hardened.patch");;
esac

export KBUILD_BUILD_HOST=cachyos
Expand Down Expand Up @@ -337,9 +329,8 @@ prepare() {
cachyos|bore|hardened) scripts/config -e SCHED_BORE;;
bmq) scripts/config -e SCHED_ALT -e SCHED_BMQ;;
eevdf) ;;
rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;;
rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;;
sched-ext) ;;
rt) scripts/config -d PREEMPT -d PREEMPT_DYNAMIC -e PREEMPT_RT;;
1Naim marked this conversation as resolved.
Show resolved Hide resolved
rt-bore) scripts/config -e SCHED_BORE -d PREEMPT -d PREEMPT_DYNAMIC -e PREEMPT_RT;;
*) _die "The value $_cpusched is invalid. Choose the correct one again.";;
esac

Expand Down Expand Up @@ -754,7 +745,7 @@ _package-zfs(){
cd "${srcdir}/zfs"
install -dm755 "${modulesdir}"
install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}

Expand All @@ -772,7 +763,7 @@ _package-nvidia(){
install -dm755 "${modulesdir}"
install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
}

_package-nvidia-open(){
Expand All @@ -790,7 +781,7 @@ _package-nvidia-open(){
install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING

find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
}

pkgname=("$pkgbase")
Expand All @@ -806,9 +797,9 @@ for _p in "${pkgname[@]}"; do
}"
done

b2sums=('fb767fa467f6c42af06f025970957acfe57dd09ec7119a16f2b503ec563870d9c40a5f128faa9ebb6d5ec05555b66fa0175168007d44b2e25ea410439a4a1193'
'07b0fd947b811352141ac940f7fc3d91b4dc5fabbf1c9dd2360fb8ddd52ed73e07401b9b294e4e38573b3d96850c46f9dfe7cb2734461136ab685aa0db4702df'
b2sums=('b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e'
'62c6d3bb71a0d16b42e37958c46363d086964705e98c2e117af0913d71529b4973cf8e95cd20bed058857da15a00d0cb3d3f57fa5bf3ed89ca89d664af521578'
'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667'
'be62c345df6734a3fc8190f1c142531a00497770ca0ff1de8c8a9e3f3ac7074e3a5b562c9ca83d51e39c593f81d2bfcc57a797931b9047c902bd46e4954c5a9f'
'eb40c22ca0f424c575e1360948e972d5b0265436ec7a27d1312e5840207e98927556a24eb65cb2ff30d059a10299feec2a572f2dda88072e0f5b533713c1255e'
'c7294a689f70b2a44b0c4e9f00c61dbd59dd7063ecbe18655c4e7f12e21ed7c5bb4f5169f5aa8623b1c59de7b2667facb024913ecb9f4c650dabce4e8a7e5452'
'a1bad436ffcaf36266949471ed025b889cf88fe7ecf8174ab73783f3f83630df90911e0b962386c964056b79ab0ec50babe0a3a81b83904216b0eec65f80eb2d')
13 changes: 8 additions & 5 deletions linux-cachyos-autofdo/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.12.0-rc7 Kernel Configuration
# Linux/x86 6.12.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20240910"
CONFIG_CC_IS_GCC=y
Expand All @@ -11,7 +11,8 @@ CONFIG_AS_VERSION=24300
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24300
CONFIG_LLD_VERSION=0
CONFIG_RUSTC_VERSION=108100
CONFIG_RUSTC_VERSION=108200
CONFIG_RUSTC_LLVM_VERSION=180108
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
Expand Down Expand Up @@ -135,6 +136,7 @@ CONFIG_PREEMPT_BUILD=y
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
# CONFIG_PREEMPT_RT is not set
CONFIG_PREEMPT_COUNT=y
CONFIG_PREEMPTION=y
CONFIG_PREEMPT_DYNAMIC=y
Expand Down Expand Up @@ -582,6 +584,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG_FORCE=y
CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y
CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y
CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y
CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y
CONFIG_PHYSICAL_START=0x1000000
Expand Down Expand Up @@ -3247,7 +3250,6 @@ CONFIG_BONDING=m
CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
# CONFIG_WIREGUARD_DEBUG is not set
CONFIG_OVPN=m
CONFIG_EQUALIZER=m
CONFIG_NET_FC=y
CONFIG_IFB=m
Expand Down Expand Up @@ -5980,6 +5982,7 @@ CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BCM590XX=m
CONFIG_REGULATOR_BD9571MWV=m
CONFIG_REGULATOR_DA903X=m
CONFIG_REGULATOR_DA9052=m
CONFIG_REGULATOR_DA9055=m
CONFIG_REGULATOR_DA9062=m
Expand Down Expand Up @@ -8066,7 +8069,6 @@ CONFIG_HID_APPLE=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLETB_BL=m
CONFIG_HID_APPLETB_KBD=m
CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m
CONFIG_HID_ASUS=m
CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
Expand Down Expand Up @@ -9400,8 +9402,8 @@ CONFIG_AMD_PMF=m
# CONFIG_AMD_PMF_DEBUG is not set
CONFIG_AMD_PMC=m
CONFIG_AMD_MP2_STB=y
CONFIG_AMD_3D_VCACHE=y
CONFIG_AMD_HSMP=m
CONFIG_AMD_3D_VCACHE=y
CONFIG_AMD_WBRF=y
CONFIG_ADV_SWBUTTON=m
CONFIG_APPLE_GMUX=m
Expand Down Expand Up @@ -11790,6 +11792,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_KASAN_SW_TAGS=y
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
# CONFIG_KASAN is not set
CONFIG_HAVE_ARCH_KFENCE=y
Expand Down
16 changes: 8 additions & 8 deletions linux-cachyos-bmq/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-bmq
pkgdesc = Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.11.9
pkgver = 6.12.0
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
Expand All @@ -18,16 +18,16 @@ pkgbase = linux-cachyos-bmq
options = !strip
options = !debug
options = !lto
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.9.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.tar.xz
source = config
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/sched/0001-prjc-cachy.patch
b2sums = 97787b71bcf6a57872078e46917b3b6e339f25a0320dabe226fe5fe91e3eb829e3749b096eec4525fd1d6f25805f54f8a2d2b71a41bc94fd35c2b9c9140f25d7
b2sums = 274c2c0808bdb6923f42a1635bd9be161852338a511293922aa7e79c070707cd44ddd9ccc73e20bb4c4bbbc58f8996af16468831a1fae9d3fe936a699992d5e5
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-prjc-cachy.patch
b2sums = b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e
b2sums = 62c6d3bb71a0d16b42e37958c46363d086964705e98c2e117af0913d71529b4973cf8e95cd20bed058857da15a00d0cb3d3f57fa5bf3ed89ca89d664af521578
b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667
b2sums = b147966760f2f8e5dbba84e1ee73a1d81baf938848eb22bf58f5644de264baf4c857abd32e754d57c181b633ea8bfbb6568fe1c3229ce1feb1c4b3295ba3f884
b2sums = a98db145d4a8e0f8ed9b4cf7675f2a425bb0f2d4f84b05d5a64419ff5fd7adb1e319ca5be2faa3904175f00b35ea0af094e1fe5a079e3f16cbf1b647f56aa8eb
b2sums = eb40c22ca0f424c575e1360948e972d5b0265436ec7a27d1312e5840207e98927556a24eb65cb2ff30d059a10299feec2a572f2dda88072e0f5b533713c1255e
b2sums = d33710b15e483e998b4965464c62a4eaa3b6f761048a8cafbd15c89c7078ffff50f9c9fca5ca56cfa977ce4dc17c255fe6f489bf7d3f7b8a6e5675e1a8cce846

pkgname = linux-cachyos-bmq
pkgdesc = The Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements kernel and modules
Expand Down
Loading
Loading