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

优化主页 CPU 温度显示(x86);优化 coremark.sh;调整与修复

This commit is contained in:
Hyy2001X 2021-03-04 21:50:20 +08:00
parent 3c354edfcc
commit 35a44e1ec6
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Customize/coremark.sh Normal file
View File

@ -0,0 +1,17 @@
#!/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

5
Customize/cpuinfo_x86 Normal file
View File

@ -0,0 +1,5 @@
#!/bin/sh
MHz=$(grep 'MHz' /proc/cpuinfo | awk '{print $4}' | awk 'NR==1')
TEMP=$(sensors 2>/dev/null | grep 'Package id' | awk '{print $4}')
echo "$MHz MHz $TEMP "

17
Scripts/AutoBuild_DiyScript.sh
View File

@ -24,13 +24,17 @@ Diy-Part1() {
Diy_Part1_Base
Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
Replace_File Customize/coremark.sh package/lean/coremark
Replace_File Customize/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
Update_Makefile xray-core package/lean/helloworld/xray-core
Update_Makefile exfat package/kernel/exfat
ExtraPackages git lean luci-theme-argon https://github.com/jerrykuku 18.06
ExtraPackages git other luci-app-argon-config https://github.com/jerrykuku master
ExtraPackages git other luci-app-adguardhome https://github.com/Hyy2001X master
ExtraPackages git other luci-app-shutdown https://github.com/Hyy2001X master
ExtraPackages git other luci-app-argon-config https://github.com/jerrykuku
ExtraPackages git other luci-app-adguardhome https://github.com/Hyy2001X
ExtraPackages git other luci-app-shutdown https://github.com/Hyy2001X
ExtraPackages svn other luci-app-smartdns https://github.com/immortalwrt/immortalwrt/trunk/package/ntlf9t
ExtraPackages git other luci-app-serverchan https://github.com/tty228 master
ExtraPackages git other luci-app-serverchan https://github.com/tty228
ExtraPackages svn other luci-app-socat https://github.com/Lienol/openwrt-package/trunk
ExtraPackages svn other luci-app-usb3disable https://github.com/immortalwrt/immortalwrt/trunk/package/ctcgfw
ExtraPackages svn lean luci-app-kodexplorer https://github.com/immortalwrt/immortalwrt/trunk/package/lean
@ -39,16 +43,11 @@ Diy-Part1() {
ExtraPackages svn lean luci-app-eqos https://github.com/immortalwrt/immortalwrt/trunk/package/ntlf9t
ExtraPackages svn other luci-app-mentohust https://github.com/immortalwrt/immortalwrt/trunk/package/ctcgfw
ExtraPackages svn other mentohust https://github.com/immortalwrt/immortalwrt/trunk/package/ctcgfw
# ExtraPackages svn lean luci-app-qbittorrent https://github.com/immortalwrt/immortalwrt/trunk/package/lean
# ExtraPackages svn lean libtorrent-rasterbar https://github.com/immortalwrt/packages/trunk/libs
# rm -rf package/lean/qBittorrent
# ExtraPackages svn lean qBittorrent-Enhanced-Edition https://github.com/garypang13/openwrt-static-qb/trunk
}
Diy-Part2() {
Diy_Part2_Base
ExtraPackages svn other/../../feeds/packages/admin netdata https://github.com/openwrt/packages/trunk/admin
# ExtraPackages svn other/../../feeds/packages/net zerotier https://github.com/openwrt/packages/trunk/net
}
Diy-Part3() {

7
Scripts/AutoBuild_Function.sh
View File

@ -72,8 +72,6 @@ Diy_Part1_Base() {
echo "Warning: OpenAppFilter may conflict with FLowoffload/SFE !"
ExtraPackages git other OpenAppFilter https://github.com/destan19
fi
Update_Makefile xray-core package/lean/helloworld/xray-core
Update_Makefile exfat package/kernel/exfat
}
Diy_Part2_Base() {
@ -111,12 +109,11 @@ Diy_Part2_Base() {
echo "Openwrt Version: ${Openwrt_Version}"
echo "Router: ${TARGET_PROFILE}"
echo "Github: ${Github_Repo}"
echo "Firmware Type: ${Firmware_sfx}"
[ -f "$Default_File" ] && sed -i "s?${Lede_Version}?${Lede_Version} Compiled by ${Author} [${Display_Date}]?g" $Default_File
echo "${Openwrt_Version}" > ${AutoBuild_Info}
echo "${Github_Repo}" >> ${AutoBuild_Info}
echo "${TARGET_PROFILE}" >> ${AutoBuild_Info}
echo "Firmware Type: ${Firmware_sfx}"
echo "Writting Type: ${Firmware_sfx} to ${AutoBuild_Info} ..."
echo "${Firmware_sfx}" >> ${AutoBuild_Info}
}
@ -227,7 +224,7 @@ Replace_File() {
Mkdir ${PATCH_DIR}
[ -f "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="f" && _TYPE2="File"
[ -d "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="d" && _TYPE2="Folder"
if [ -f "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
if [ -${_TYPE1} "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
[[ ! -z "${FILE_RENAME}" ]] && _RENAME="${FILE_RENAME}" || _RENAME=""
if [ -${_TYPE1} "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
echo "[$(date "+%H:%M:%S")] Moving [${_TYPE2}] ${FILE_NAME} to ${2}/${FILE_RENAME} ..."