From 19cdd87fb1479805199fe0e21d544cbf8f777d17 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 22 Jun 2021 12:57:40 +0800 Subject: [PATCH] autocore-arm: remove the dependency on lm-sensors (cherry picked from commit aeff8e17c86330a9888f939d50eb607c31dc0cb6) --- package/emortal/autocore/Makefile | 3 +-- package/emortal/autocore/files/arm/cpuinfo | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/emortal/autocore/Makefile b/package/emortal/autocore/Makefile index 1ee671257a..0aea7a36d7 100644 --- a/package/emortal/autocore/Makefile +++ b/package/emortal/autocore/Makefile @@ -21,8 +21,7 @@ define Package/autocore-arm MAINTAINER:=CN_SZTL DEPENDS:=@(TARGET_bcm27xx||TARGET_bcm53xx||TARGET_ipq40xx||TARGET_ipq806x||TARGET_mvebu||TARGET_sunxi||TARGET_rockchip) \ +TARGET_bcm27xx:bcm27xx-userland \ - +TARGET_bcm53xx:nvram \ - +TARGET_ipq40xx:lm-sensors + +TARGET_bcm53xx:nvram VARIANT:=arm endef diff --git a/package/emortal/autocore/files/arm/cpuinfo b/package/emortal/autocore/files/arm/cpuinfo index 19d76b82c4..4146bcae1a 100755 --- a/package/emortal/autocore/files/arm/cpuinfo +++ b/package/emortal/autocore/files/arm/cpuinfo @@ -20,7 +20,7 @@ fi if grep -q "bcm27xx" "/etc/openwrt_release"; then cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C" elif grep -q "ipq40xx" "/etc/openwrt_release"; then - cpu_temp="$(sensors | grep -Eo '\+[0-9]+.+C' | sed ':a;N;$!ba;s/\n/ /g;s/+//g')" + cpu_temp="$(awk '{printf("%.1f°C ", $0 / 1000)}' /sys/class/ieee80211/phy*/device/hwmon/hwmon*/temp1_input)" else [ -e "/sys/class/thermal/thermal_zone0/temp" ] && \ cpu_temp="$(awk '{printf("%.1f°C", $0 / 1000)}' /sys/class/thermal/thermal_zone0/temp)"