From 8419c9376d30ec77364075b440193ef477df606e Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sat, 15 Feb 2020 23:14:02 +0800
Subject: [PATCH 1/2] default-settings: fix po2lmo error (#3107)

---
 package/lean/default-settings/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile
index cd64d7eaa0..c54c1c4f16 100644
--- a/package/lean/default-settings/Makefile
+++ b/package/lean/default-settings/Makefile
@@ -28,9 +28,6 @@ define Package/default-settings/description
 	Language Support Packages.
 endef
 
-define Build/Prepare
-endef
-
 define Build/Configure
 endef
 
@@ -38,10 +35,12 @@ define Build/Compile
 endef
 
 define Package/default-settings/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.lmo $(1)/usr/lib/lua/luci/i18n/
 	$(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
+	po2lmo ./i18n/default.zh-cn.po $(1)/usr/lib/lua/luci/i18n/default.zh-cn.lmo
+	po2lmo ./i18n/more.zh-cn.po $(1)/usr/lib/lua/luci/i18n/more.zh-cn.lmo
+	po2lmo ./i18n/sqm.zh-cn.po $(1)/usr/lib/lua/luci/i18n/sqm.zh-cn.lmo
 endef
 
 $(eval $(call BuildPackage,default-settings))

From e652b67597a18208805e7626ac593db49b6376f5 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Sun, 16 Feb 2020 00:14:40 +0800
Subject: [PATCH 2/2] autocore: add cpu usage for x86

---
 package/lean/autocore/Makefile          |  2 +-
 package/lean/autocore/files/index.htm   | 15 +++++++++++++++
 package/lean/autocore/files/sbin/getcpu |  7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100755 package/lean/autocore/files/sbin/getcpu

diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile
index 47beabca8d..03db79b9f4 100644
--- a/package/lean/autocore/Makefile
+++ b/package/lean/autocore/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autocore
 PKG_VERSION:=1
-PKG_RELEASE:=26
+PKG_RELEASE:=27
 
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/lean/autocore/files/index.htm b/package/lean/autocore/files/index.htm
index 1891b26b31..8c48323c18 100644
--- a/package/lean/autocore/files/index.htm
+++ b/package/lean/autocore/files/index.htm
@@ -51,8 +51,19 @@
 		local eth_info = luci.sys.exec("ethinfo")
 
 		local user_info = tonumber(luci.sys.exec("cat /proc/net/arp | grep '0x2' | wc -l")) or 0
+		
+		local cpu_usage
+		
+		if fs.readfile("/tmp/cpuusage")  then
+				cpu_usage = luci.sys.exec("cat /tmp/cpuusage")
+		else
+				cpu_usage = "6.6%"
+		end
+		
+		luci.sys.exec("/sbin/getcpu &")
 
 		local rv = {
+			cpuusage    = cpu_usage,
 			cpuinfo    = cpu_info,
 			ethinfo    = eth_info,
 			userinfo    = user_info,
@@ -660,6 +671,9 @@
 
 			if (e = document.getElementById('cpuinfo'))
 				e.innerHTML = info.cpuinfo;
+				
+			if (e = document.getElementById('cpuusage'))
+				e.innerHTML = info.cpuusage;
 
 			if (e = document.getElementById('loadavg'))
 				e.innerHTML = String.format(
@@ -717,6 +731,7 @@
 		<tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
 		<tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr>
 		<tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr>
+		<tr><td width="33%"><%:CPU Usage%></td><td id="cpuusage">-</td></tr>
 	</table>
 </fieldset>
 
diff --git a/package/lean/autocore/files/sbin/getcpu b/package/lean/autocore/files/sbin/getcpu
new file mode 100755
index 0000000000..4541477022
--- /dev/null
+++ b/package/lean/autocore/files/sbin/getcpu
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+AT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}')
+sleep 3
+BT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}')
+
+printf "%.01f%%" $(echo $AT $BT | awk '{print (($4-$2)/($3-$1))*100}') >/tmp/cpuusage
\ No newline at end of file