diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 6052e05a66..905e44b581 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -44,11 +44,7 @@ define Package/autocore-arm/install $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_BIN) ./files/arm/090-cover-index_htm $(1)/etc/uci-defaults/090-cover-index_htm $(INSTALL_DIR) $(1)/sbin -ifneq ($(BOARD),ipq40xx) - $(CP) ./files/arm/sbin/cpuinfo $(1)/sbin/cpuinfo -else - $(CP) ./files/arm/sbin/cpuinfo-ipq40xx $(1)/sbin/cpuinfo -endif + $(INSTALL_BIN) ./files/arm/sbin/cpuinfo $(1)/sbin/cpuinfo endef define Package/autocore-x86/install diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo b/package/lean/autocore/files/arm/sbin/cpuinfo index ff2691ecc2..88cf35d430 100755 --- a/package/lean/autocore/files/arm/sbin/cpuinfo +++ b/package/lean/autocore/files/arm/sbin/cpuinfo @@ -5,6 +5,10 @@ cpu_arch="$(cat "/proc/cpuinfo" | grep "model name" | sed -n "1p" | awk -F ': ' cpu_cores="$(cat "/proc/cpuinfo" | grep "processor" | wc -l)" cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz" -sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" +if grep -q "ipq40xx" "/etc/openwrt_release"; then + sys_temp="$(sensors | grep -Eo '\+[0-9]+.+C' | sed ':a;N;$!ba;s/\n/ /g;s/+//g')" +else + sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" +fi echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${sys_temp})" diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo-ipq40xx b/package/lean/autocore/files/arm/sbin/cpuinfo-ipq40xx deleted file mode 100755 index 329675b81c..0000000000 --- a/package/lean/autocore/files/arm/sbin/cpuinfo-ipq40xx +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -cpu_arch="$(cat "/proc/cpuinfo" | grep "model name" | sed -n "1p" | awk -F ': ' '{print $2}')" -cpu_cores="$(cat "/proc/cpuinfo" | grep "processor" | wc -l)" - -cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz" -sys_temp="$(sensors | grep -Eo '\+[0-9]+.+C' | sed ':a;N;$!ba;s/\n/ /g;s/+//g')" - -echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${sys_temp})"