diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 952848b12d..49a7444df4 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define Package/autocore-raspberrypi TITLE:=RaspberryPi auto core loadbalance script. MAINTAINER:=CN_SZTL - DEPENDS:=@TARGET_bcm27xx + DEPENDS:=@TARGET_bcm27xx +bcm27xx-userland endef define Package/autocore-x86 diff --git a/package/lean/autocore/files/raspberrypi/index.htm b/package/lean/autocore/files/raspberrypi/index.htm index 746926885e..f77f4ed44f 100644 --- a/package/lean/autocore/files/raspberrypi/index.htm +++ b/package/lean/autocore/files/raspberrypi/index.htm @@ -50,11 +50,8 @@ local cpu_usage = (luci.sys.exec("expr 100 - $(top -n 1 | grep 'CPU:' | awk -F '%' '{print$4}' | awk -F ' ' '{print$2}')") or "6") .. "%" - local cpu_info = luci.sys.exec("cpuinfo") - local rv = { cpuusage = cpu_usage, - cpuinfo = cpu_info, userinfo = user_info, systemp = sys_temp, uptime = sysinfo.uptime or 0, @@ -648,9 +645,6 @@ if (e = document.getElementById('cpuusage')) e.innerHTML = info.cpuusage; - if (e = document.getElementById('cpuinfo')) - e.innerHTML = info.cpuinfo; - if (e = document.getElementById('loadavg')) e.innerHTML = String.format( '%.02f, %.02f, %.02f', @@ -697,9 +691,8 @@ - - - + +
<%:Hostname%><%=luci.sys.hostname() or "?"%>
<%:Model%><%=pcdata(boardinfo.model or "?")%> <%=luci.sys.exec("cat /etc/bench.log") or " "%>
<%:Architecture%><%=pcdata(boardinfo.system or "ARMv8 Processor")%> x <%=luci.sys.exec("cat /proc/cpuinfo | grep 'processor' | wc -l") or "1"%>
<%:CPU Info%>-
<%:Model%><%=pcdata(boardinfo.model or "?")%> <%=luci.sys.exec("cat /etc/bench.log") or ""%>
<%:Architecture%><%=pcdata(boardinfo.system or "ARMv8 Processor")%> x <%=luci.sys.exec("cat /proc/cpuinfo | grep 'processor' | wc -l") or "1"%> <%=luci.sys.exec("cpuinfo") or ""%>
<%:Firmware Version%> <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> diff --git a/package/lean/autocore/files/raspberrypi/sbin/cpuinfo b/package/lean/autocore/files/raspberrypi/sbin/cpuinfo index 3456ad6a14..c79f937869 100755 --- a/package/lean/autocore/files/raspberrypi/sbin/cpuinfo +++ b/package/lean/autocore/files/raspberrypi/sbin/cpuinfo @@ -8,4 +8,4 @@ else sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" fi -echo -n "${cpu_freq} | ${sys_temp}" +echo -n "(${cpu_freq}, ${sys_temp})"