Bump to 6.1.3

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2023-01-04 13:13:25 +01:00
parent fe059ea5f8
commit 99e0d832f3
No known key found for this signature in database
GPG key ID: 79AFA05ABDB26C5A
3 changed files with 52 additions and 50 deletions

View file

@ -1,7 +1,7 @@
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.2 pkgver = 6.1.3
pkgrel = 3 pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos url = https://github.com/CachyOS/linux-cachyos
arch = x86_64 arch = x86_64
arch = x86_64_v3 arch = x86_64_v3
@ -21,16 +21,16 @@ 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.2.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.3.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 = ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae sha256sums = 6dc89ae7a7513e433c597c7346ed7ff4bfd115ea43a3b5e27a6bdb38c5580317
sha256sums = d4f3fc2581e338835a33983cca18bfb3225450a07c456c48c9b051c03236955a sha256sums = d4f3fc2581e338835a33983cca18bfb3225450a07c456c48c9b051c03236955a
sha256sums = 32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74 sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = acdffe9b6d633fdff4bdccc97449350772c841c074f1f06dd2f6aa28af0e3c25 sha256sums = daa88229f69ef9bcab4f41e6757935aa0cdd1377bc576d62ddb9c546f73ae946
sha256sums = 0241632f91c112dcdffbdc203a9245ee3234f9a8b4e5e2c2de45fd0d228840da sha256sums = 0241632f91c112dcdffbdc203a9245ee3234f9a8b4e5e2c2de45fd0d228840da
sha256sums = 564b08b5c076ad3b24ee2e975cac0630628581ce7c3b0eeaa40ce888136a00c6 sha256sums = 564b08b5c076ad3b24ee2e975cac0630628581ce7c3b0eeaa40ce888136a00c6

View file

@ -200,7 +200,7 @@ else
pkgbase=linux-$pkgsuffix pkgbase=linux-$pkgsuffix
fi fi
_major=6.1 _major=6.1
_minor=2 _minor=3
#_minorc=$((_minor+1)) #_minorc=$((_minor+1))
#_rcver=rc8 #_rcver=rc8
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
@ -210,7 +210,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable} _srcname=linux-${_stable}
#_srcname=linux-${_major} #_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=3 pkgrel=1
_kernver=$pkgver-$pkgrel _kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3') arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos" url="https://github.com/CachyOS/linux-cachyos"
@ -1048,9 +1048,9 @@ for _p in "${pkgname[@]}"; do
}" }"
done done
sha256sums=('ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae' sha256sums=('6dc89ae7a7513e433c597c7346ed7ff4bfd115ea43a3b5e27a6bdb38c5580317'
'd4f3fc2581e338835a33983cca18bfb3225450a07c456c48c9b051c03236955a' 'd4f3fc2581e338835a33983cca18bfb3225450a07c456c48c9b051c03236955a'
'32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74' '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'acdffe9b6d633fdff4bdccc97449350772c841c074f1f06dd2f6aa28af0e3c25' 'daa88229f69ef9bcab4f41e6757935aa0cdd1377bc576d62ddb9c546f73ae946'
'0241632f91c112dcdffbdc203a9245ee3234f9a8b4e5e2c2de45fd0d228840da' '0241632f91c112dcdffbdc203a9245ee3234f9a8b4e5e2c2de45fd0d228840da'
'564b08b5c076ad3b24ee2e975cac0630628581ce7c3b0eeaa40ce888136a00c6') '564b08b5c076ad3b24ee2e975cac0630628581ce7c3b0eeaa40ce888136a00c6')

View file

@ -1,49 +1,51 @@
#!/bin/bash #!/bin/bash
CPU=$(gcc -Q -march=native --help=target|grep march=|awk '{print $2}'|head -1)
MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo) # Check if GCC is installed
if [[ ${MARCH} == "ZNVER1" ]]; then check_gcc() {
MARCH="ZEN" if ! [ -x "$(command -v gcc)" ]; then
elif [[ ${MARCH} == "ZNVER2" ]]; then # Display error message if GCC is not installed
MARCH="ZEN2" echo "Error: GCC is not installed. Please install GCC and try again." >&2
elif [[ ${MARCH} == "ZNVER3" ]]; then exit 1
MARCH="ZEN3" fi
elif [[ ${MARCH} == "ZNVER4" ]]; then }
MARCH="ZEN4"
elif [[ ${MARCH} == "BDVER1" ]]; then # Call the function before running the rest of the script
MARCH="BULLDOZER" check_gcc
elif [[ ${MARCH} == "BDVER2" ]]; then
MARCH="PILEDRIVER" # Get CPU type from GCC and convert to uppercase
elif [[ ${MARCH} == "BDVER3" ]]; then MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
MARCH="STEAMROLLER"
elif [[ ${MARCH} == "BDVER4" ]]; then # Check for specific CPU types and set MARCH variable accordingly
MARCH="EXCAVATOR" case $MARCH in
elif [[ ${MARCH} == "BTVER1" ]]; then ZNVER1) MARCH="ZEN";;
MARCH="BOBCAT" ZNVER2) MARCH="ZEN2";;
elif [[ ${MARCH} == "BTVER2" ]]; then ZNVER3) MARCH="ZEN3";;
MARCH="JAGUAR" ZNVER4) MARCH="ZEN4";;
elif [[ ${MARCH} == "AMDFAM10" ]]; then BDVER1) MARCH="BULLDOZER";;
MARCH="MK10" BDVER2) MARCH="PILEDRIVER";;
elif [[ ${MARCH} == "K8-SSE3" ]]; then BDVER3) MARCH="STEAMROLLER";;
MARCH="K8SSE3" BDVER4) MARCH="EXCAVATOR";;
elif [[ ${MARCH} == "BONNELL" ]]; then BTVER1) MARCH="BOBCAT";;
MARCH="ATOM" BTVER2) MARCH="JAGUAR";;
elif [[ ${MARCH} == "GOLDMONT-PLUS" ]]; then AMDFAM10) MARCH="MK10";;
MARCH="GOLDMONTPLUS" K8-SSE3) MARCH="K8SSE3";;
elif [[ ${MARCH} == "SKYLAKE-AVX512" ]]; then BONNELL) MARCH="ATOM";;
MARCH="SKYLAKE2" GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
elif [[ ${MARCH} == "MIVYBRIDGE" ]]; then SKYLAKE-AVX512) MARCH="SKYLAKE2";;
MIVYBRIDGE)
scripts/config --disable CONFIG_AGP_AMD64 scripts/config --disable CONFIG_AGP_AMD64
scripts/config --disable CONFIG_MICROCODE_AMD scripts/config --disable CONFIG_MICROCODE_AMD
MARCH="MIVYBRIDGE" MARCH="MIVYBRIDGE";;
elif [[ ${MARCH} == "ICELAKE-CLIENT" ]]; then ICELAKE-CLIENT) MARCH="ICELAKE";;
MARCH="ICELAKE" esac
fi
# Add "M" prefix to MARCH variable
MARCH2=M${MARCH} MARCH2=M${MARCH}
echo
# Display detected CPU and apply optimization
echo "----------------------------------" echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |" echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------" echo "----------------------------------"
echo "[*] DETECTED CPU (MARCH) : ${MARCH2}" echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
scripts/config -k --disable CONFIG_GENERIC_CPU scripts/config -k --disable CONFIG_GENERIC_CPU
scripts/config -k --enable CONFIG_${MARCH2} scripts/config -k --enable CONFIG_${MARCH2}
sleep 3&&echo