summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2023-01-04 13:22:05 +0100
committerPiotr Gorski2023-01-04 13:22:05 +0100
commit4bc1b09c56cd1ae7cd3a25ae79a3b6a451f99661 (patch)
tree000542eb31629b37de32f62aaa293c05c4e92764
parent0ad4a71e178c3a217ec2202f0e48f66c5d99019e (diff)
downloadaur-4bc1b09c56cd1ae7cd3a25ae79a3b6a451f99661.tar.gz
Sync with Github
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-xauto-cpu-optimization.sh80
3 files changed, 43 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 418996f89e6a..1414f6c743a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,7 +29,7 @@ pkgbase = linux-cachyos-rc
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/sched/0001-bore-cachy.patch
sha256sums = 41198ec2da061b6b8d08d70020096dac24fbcda0f657e44d7b76e31c69f9fadb
sha256sums = 916892bbbcaaafda12ee7b1263454dc7495c931195ad9aaa8aff9a61b4196c03
- sha256sums = 32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74
+ sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = bc1fd90c2cb8fe7dd259eea7d6df20051e76f8f3ef1584cda7d48854a17a0b5f
sha256sums = 7aa2d13e3aa8ddba51f338552d016e5f37fedc54537bad9080e12cecedf46673
sha256sums = b29d35fd272cc59856c2276d40d1e387d6fb30fb43af26d48be60b3efe012837
diff --git a/PKGBUILD b/PKGBUILD
index 8c23ac48618e..29ec2f536bf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1046,7 +1046,7 @@ done
sha256sums=('41198ec2da061b6b8d08d70020096dac24fbcda0f657e44d7b76e31c69f9fadb'
'916892bbbcaaafda12ee7b1263454dc7495c931195ad9aaa8aff9a61b4196c03'
- '32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74'
+ '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'bc1fd90c2cb8fe7dd259eea7d6df20051e76f8f3ef1584cda7d48854a17a0b5f'
'7aa2d13e3aa8ddba51f338552d016e5f37fedc54537bad9080e12cecedf46673'
'b29d35fd272cc59856c2276d40d1e387d6fb30fb43af26d48be60b3efe012837')
diff --git a/auto-cpu-optimization.sh b/auto-cpu-optimization.sh
index 4903a69d15d7..4c4b20ea68fb 100755
--- a/auto-cpu-optimization.sh
+++ b/auto-cpu-optimization.sh
@@ -1,49 +1,51 @@
#!/bin/bash
-CPU=$(gcc -Q -march=native --help=target|grep march=|awk '{print $2}'|head -1)
-MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
-if [[ ${MARCH} == "ZNVER1" ]]; then
- MARCH="ZEN"
-elif [[ ${MARCH} == "ZNVER2" ]]; then
- MARCH="ZEN2"
-elif [[ ${MARCH} == "ZNVER3" ]]; then
- MARCH="ZEN3"
-elif [[ ${MARCH} == "ZNVER4" ]]; then
- MARCH="ZEN4"
-elif [[ ${MARCH} == "BDVER1" ]]; then
- MARCH="BULLDOZER"
-elif [[ ${MARCH} == "BDVER2" ]]; then
- MARCH="PILEDRIVER"
-elif [[ ${MARCH} == "BDVER3" ]]; then
- MARCH="STEAMROLLER"
-elif [[ ${MARCH} == "BDVER4" ]]; then
- MARCH="EXCAVATOR"
-elif [[ ${MARCH} == "BTVER1" ]]; then
- MARCH="BOBCAT"
-elif [[ ${MARCH} == "BTVER2" ]]; then
- MARCH="JAGUAR"
-elif [[ ${MARCH} == "AMDFAM10" ]]; then
- MARCH="MK10"
-elif [[ ${MARCH} == "K8-SSE3" ]]; then
- MARCH="K8SSE3"
-elif [[ ${MARCH} == "BONNELL" ]]; then
- MARCH="ATOM"
-elif [[ ${MARCH} == "GOLDMONT-PLUS" ]]; then
- MARCH="GOLDMONTPLUS"
-elif [[ ${MARCH} == "SKYLAKE-AVX512" ]]; then
- MARCH="SKYLAKE2"
-elif [[ ${MARCH} == "MIVYBRIDGE" ]]; then
+
+# Check if GCC is installed
+check_gcc() {
+ if ! [ -x "$(command -v gcc)" ]; then
+ # Display error message if GCC is not installed
+ echo "Error: GCC is not installed. Please install GCC and try again." >&2
+ exit 1
+ fi
+}
+
+# Call the function before running the rest of the script
+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)}')
+
+# 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";;
+ 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="SKYLAKE2";;
+ MIVYBRIDGE)
scripts/config --disable CONFIG_AGP_AMD64
scripts/config --disable CONFIG_MICROCODE_AMD
- MARCH="MIVYBRIDGE"
-elif [[ ${MARCH} == "ICELAKE-CLIENT" ]]; then
- MARCH="ICELAKE"
-fi
+ MARCH="MIVYBRIDGE";;
+ ICELAKE-CLIENT) MARCH="ICELAKE";;
+esac
+
+# Add "M" prefix to MARCH variable
MARCH2=M${MARCH}
-echo
+
+# Display detected CPU and apply optimization
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
scripts/config -k --disable CONFIG_GENERIC_CPU
scripts/config -k --enable CONFIG_${MARCH2}
-sleep 3&&echo