diff --git a/package/emortal/autocore/Makefile b/package/emortal/autocore/Makefile index dbb1606716..65a6e13ecd 100644 --- a/package/emortal/autocore/Makefile +++ b/package/emortal/autocore/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_FLAGS:=nonshared -PKG_RELEASE:=41 +PKG_RELEASE:=42 PKG_CONFIG_DEPENDS:= \ CONFIG_TARGET_bcm27xx \ diff --git a/package/emortal/autocore/files/cpuinfo b/package/emortal/autocore/files/cpuinfo index b0b4aefe4b..71664cccb7 100755 --- a/package/emortal/autocore/files/cpuinfo +++ b/package/emortal/autocore/files/cpuinfo @@ -25,10 +25,7 @@ case "$DISTRIB_TARGET" in "mvebu"/*) cpu_freq="$(mhz | awk -F 'cpu_MHz=' '{printf("%.fMHz",$2)}')" ;; "rockchip"/*) - cpu_freq="$(awk '{printf("%.fMHz", $0 / 1000)}' "$CPUFREQ_PATH/policy0/cpuinfo_cur_freq")" - [ ! -e "$CPUFREQ_PATH/policy4/cpuinfo_cur_freq" ] || \ - big_cpu_freq="$(awk '{printf("%.fMHz ", $0 / 1000)}' "$CPUFREQ_PATH/policy4/cpuinfo_cur_freq")" - ;; + cpu_freq="$(awk '{printf("%.fMHz ", $0 / 1000)}' "$CPUFREQ_PATH"/policy*/cpuinfo_cur_freq | awk '$1=$1')" ;; "x86"/*) cpu_freq="$(awk -F ': ' '/MHz/ {print $2}' "$CPUINFO_PATH" | head -n1)MHz" ;; *) @@ -53,13 +50,13 @@ case "$DISTRIB_TARGET" in ;; esac -if [ -z "$big_cpu_freq$cpu_freq" ] && [ -n "$cpu_temp" ]; then +if [ -z "$cpu_freq" ] && [ -n "$cpu_temp" ]; then echo -n "$cpu_arch x $cpu_cores ($cpu_temp)" -elif [ -z "$cpu_temp" ] && [ -n "$big_cpu_freq$cpu_freq" ] || \ +elif [ -z "$cpu_temp" ] && [ -n "$cpu_freq" ] || \ grep -Eq "ipq|mediatek" "/etc/openwrt_release"; then - echo -n "$cpu_arch x $cpu_cores ($big_cpu_freq$cpu_freq)" -elif [ -n "$cpu_temp" ] && [ -n "$big_cpu_freq$cpu_freq" ]; then - echo -n "$cpu_arch x $cpu_cores ($big_cpu_freq$cpu_freq, ${cpu_temp})" + echo -n "$cpu_arch x $cpu_cores ($cpu_freq)" +elif [ -n "$cpu_temp" ] && [ -n "$cpu_freq" ]; then + echo -n "$cpu_arch x $cpu_cores ($cpu_freq, ${cpu_temp})" else echo -n "$cpu_arch x $cpu_cores" fi