Bump to 6.12.3

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2024-12-06 16:23:22 +01:00
parent 576131c424
commit 582ce342b9
No known key found for this signature in database
GPG key ID: 79AFA05ABDB26C5A
3 changed files with 59 additions and 40 deletions

View file

@ -1,6 +1,6 @@
pkgbase = linux-cachyos-eevdf
pkgdesc = Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements
pkgver = 6.12.2
pkgver = 6.12.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@ -18,14 +18,14 @@ pkgbase = linux-cachyos-eevdf
options = !strip
options = !debug
options = !lto
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.2.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.3.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
b2sums = 3161f791e13156a97215b14ed9d0a18dfd69324e7fa516df2a9385678ba2a2cd67196aa9efd82f7d9f1cb2c91b8733a095ced66c491f3a80c8c70eec1dc703d8
b2sums = 1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955
b2sums = 8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701
b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667
b2sums = d290e958f4870002d5ec6616fa45d9259277bbb7a92b0ff1b093d001bea45be5736f44ecfdeaa4d6fc40c4580ac954b41187b57a323c8b6e4c142f71c9d94724
b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
b2sums = db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d
pkgname = linux-cachyos-eevdf
pkgdesc = The Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel and modules

View file

@ -143,14 +143,14 @@ _build_nvidia_open=${_build_nvidia_open-}
_build_debug=${_build_debug-}
# ATTENTION: Do not modify after this line
_is_clang_kernel() {
[[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]
_is_lto_kernel() {
[[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]
return $?
}
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then
if _is_lto_kernel && [ "$_use_lto_suffix" = "y" ]; then
_pkgsuffix="cachyos-${_cpusched}-lto"
elif [ "$_use_llvm_lto" = "none" ] && [ -z "$_use_kcfi" ] && [ "$_use_gcc_suffix" = "y" ]; then
elif ! _is_lto_kernel && [ "$_use_gcc_suffix" = "y" ]; then
_pkgsuffix="cachyos-${_cpusched}-gcc"
else
_pkgsuffix="cachyos-${_cpusched}"
@ -158,7 +158,7 @@ fi
pkgbase="linux-$_pkgsuffix"
_major=6.12
_minor=2
_minor=3
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@ -199,7 +199,7 @@ source=(
"${_patchsource}/all/0001-cachyos-base-all.patch")
# LLVM makedepends
if _is_clang_kernel; then
if _is_lto_kernel; then
makedepends+=(clang llvm lld)
source+=("${_patchsource}/misc/dkms-clang.patch")
BUILD_FLAGS=(
@ -757,7 +757,7 @@ for _p in "${pkgname[@]}"; do
}"
done
b2sums=('3161f791e13156a97215b14ed9d0a18dfd69324e7fa516df2a9385678ba2a2cd67196aa9efd82f7d9f1cb2c91b8733a095ced66c491f3a80c8c70eec1dc703d8'
b2sums=('1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955'
'8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701'
'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667'
'd290e958f4870002d5ec6616fa45d9259277bbb7a92b0ff1b093d001bea45be5736f44ecfdeaa4d6fc40c4580ac954b41187b57a323c8b6e4c142f71c9d94724')
'390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
'db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d')

View file

@ -13,40 +13,59 @@ check_gcc() {
check_gcc
# Get CPU type from GCC and convert to uppercase
MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
# Sync with 0005-cachy.patch using
# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
# Check for specific CPU types and set MARCH variable accordingly
case $MARCH in
ZNVER1) MARCH="ZEN";;
ZNVER2) MARCH="ZEN2";;
ZNVER3) MARCH="ZEN3";;
ZNVER4) MARCH="ZEN4";;
ZNVER5) MARCH="ZEN5";;
BDVER1) MARCH="BULLDOZER";;
BDVER2) MARCH="PILEDRIVER";;
BDVER3) MARCH="STEAMROLLER";;
BDVER4) MARCH="EXCAVATOR";;
BTVER1) MARCH="BOBCAT";;
BTVER2) MARCH="JAGUAR";;
AMDFAM10) MARCH="MK10";;
K8-SSE3) MARCH="K8SSE3";;
BONNELL) MARCH="ATOM";;
GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
SKYLAKE-AVX512) MARCH="SKYLAKEX";;
MIVYBRIDGE)
scripts/config --disable CONFIG_AGP_AMD64
scripts/config --disable CONFIG_MICROCODE_AMD
MARCH="MIVYBRIDGE";;
ICELAKE-CLIENT) MARCH="ICELAKE";;
bonnell) MARCH=ATOM;;
k8-sse3) MARCH=K8SSE3;;
amdfam10) MARCH=K10;;
barcelona) MARCH=BARCELONA;;
btver1) MARCH=BOBCAT;;
btver2) MARCH=JAGUAR;;
bdver1) MARCH=BULLDOZER;;
bdver2) MARCH=PILEDRIVER;;
bdver3) MARCH=STEAMROLLER;;
bdver4) MARCH=EXCAVATOR;;
znver1) MARCH=ZEN;;
znver2) MARCH=ZEN2;;
znver3) MARCH=ZEN3;;
znver4) MARCH=ZEN4;;
znver5) MARCH=ZEN5;;
nehalem) MARCH=NEHALEM;;
westmere) MARCH=WESTMERE;;
silvermont) MARCH=SILVERMONT;;
goldmont) MARCH=GOLDMONT;;
goldmont-plus) MARCH=GOLDMONTPLUS;;
sandybridge) MARCH=SANDYBRIDGE;;
ivybridge) MARCH=IVYBRIDGE;;
haswell) MARCH=HASWELL;;
broadwell) MARCH=BROADWELL;;
skylake) MARCH=SKYLAKE;;
skylake-avx512) MARCH=SKYLAKEX;;
cannonlake) MARCH=CANNONLAKE;;
icelake-server) MARCH=ICELAKE_SERVER;;
icelake-client) MARCH=ICELAKE_CLIENT;;
cascadelake) MARCH=CASCADELAKE;;
cooperlake) MARCH=COOPERLAKE;;
tigerlake) MARCH=TIGERLAKE;;
sapphirerapids) MARCH=SAPPHIRERAPIDS;;
rocketlake) MARCH=ROCKETLAKE;;
alderlake) MARCH=ALDERLAKE;;
raptorlake) MARCH=RAPTORLAKE;;
meteorlake) MARCH=METEORLAKE;;
emeraldrapids) MARCH=EMERALDRAPIDS;;
esac
# Add "M" prefix to MARCH variable
MARCH2=M${MARCH}
# If doesn't match, re-use the arch name (uppercased)
# Display detected CPU and apply optimization
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
scripts/config -k --disable CONFIG_GENERIC_CPU
scripts/config -k --enable CONFIG_${MARCH2}
scripts/config -k --enable CONFIG_M${MARCH^^}