xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coremark: 合并上游改动

This commit is contained in:
Hyy2001X 2021-06-17 23:55:26 +08:00
parent b40ef7e65c
commit 598f37eef3
4 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CustomFiles/Depends/coremark.sh.sh Normal file
View File

@ -0,0 +1,14 @@
#!/bin/bash
coremark > /tmp/coremark.log
Scores=$(cat /tmp/coremark.log 2> /dev/null | grep "CoreMark 1.0" | awk '{print $4}')
Processer=$(awk -F ':[ ]' '/model name/{printf ($2);exit}' /proc/cpuinfo)
[[ -n ${Processer} ]] && echo -e "\nProcesser: ${Processer}"
echo -e "Score: ${Scores}\nTime costs: $(grep "Total time" /tmp/coremark.log | awk '{print $4}')"
echo "(CPU Mark: ${Scores} Scores)" > /etc/bench.log
if [ -f /etc/bench.log ]; then
sed -i '/coremark/d' /etc/crontabs/root
crontab /etc/crontabs/root
fi

10
CustomFiles/Depends/coremark_ImmortalWrt.sh
View File

@ -1,10 +0,0 @@
#!/bin/bash
echo -e "\nRunning CoreMark test,please wait ..."
Scores=$(cat /tmp/coremark.log 2> /dev/null | grep "CoreMark 1.0" | awk '{print $4}')
Processer=$(awk -F ':[ ]' '/model name/{printf ($2);exit}' /proc/cpuinfo)
Time=$(grep "Total time" /tmp/coremark.log | awk '{print $4}')
[[ -z "${Processer}" ]] && Processer=Unknown
echo -e "\nProcesser: ${Processer}\nScore: ${Scores}\nTime costs: ${Time}"

17
CustomFiles/Depends/coremark_lede.sh
View File

@ -1,17 +0,0 @@
#!/bin/bash
echo -e "\nRunning CoreMark test,please wait ..."
/bin/coremark > /tmp/coremark.log
Scores=$(cat /tmp/coremark.log 2> /dev/null | grep "CoreMark 1.0" | awk '{print $4}')
Processer=$(awk -F ':[ ]' '/model name/{printf ($2);exit}' /proc/cpuinfo)
Time=$(grep "Total time" /tmp/coremark.log | awk '{print $4}')
[[ -z "${Processer}" ]] && Processer=Unknown
echo -e "\nProcesser: ${Processer}\nScore: ${Scores}\nTime costs: ${Time}"
echo "(CPU Mark: ${Scores} Scores)" > /etc/bench.log
if [ -f "/etc/bench.log" ]; then
sed -i '/coremark/d' /etc/crontabs/root
crontab /etc/crontabs/root
fi

3
Scripts/AutoBuild_Function.sh
View File

@ -209,7 +209,7 @@ Firmware-Diy_Base() {
Replace_File CustomFiles/Depends/base-files-essential package/base-files/files/lib/upgrade/keep.d
case "${Openwrt_Author}" in
coolsnowwolf)
Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
Replace_File CustomFiles/Depends/coremark.sh package/feeds/packages/coremark
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
AddPackage git other helloworld fw876 master
sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
@ -218,7 +218,6 @@ Firmware-Diy_Base() {
# [[ ${INCLUDE_DRM_I915} == true ]] && Replace_File CustomFiles/Depends/i915-5.4 target/linux/x86 config-5.4
;;
immortalwrt)
Replace_File CustomFiles/Depends/coremark_ImmortalWrt.sh package/base-files/files/etc coremark.sh
Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
sed -i "s?Template?Compiled by ${Author} [${Display_Date}]?g" ${Version_File}