Merge pull request #3077 from MilhouseVH/le90_fix_cputemp

kodi: use project specific cputemp scripts for all projects
LibreELEC · Nov 11, 2018 · fa55839 · fa55839
2 parents e8e2816 + 0af4984
commit fa55839
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 25 deletions.
diff --git a/packages/mediacenter/kodi/config/advancedsettings.xml b/packages/mediacenter/kodi/config/advancedsettings.xml
@@ -1,4 +1,7 @@
 <advancedsettings>
+  <cputempcommand>/usr/bin/cputemp</cputempcommand>
+  <gputempcommand>/usr/bin/gputemp</gputempcommand>
+
   <showexitbutton>false</showexitbutton>
   <remotedelay>1</remotedelay>
   <samba>

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
@@ -274,8 +274,6 @@ post_makeinstall_target() {
     cp $PKG_DIR/scripts/service-addon-wrapper $INSTALL/usr/sbin
 
   mkdir -p $INSTALL/usr/bin
-    cp $PKG_DIR/scripts/cputemp $INSTALL/usr/bin
-      ln -sf cputemp $INSTALL/usr/bin/gputemp
     cp $PKG_DIR/scripts/kodi-remote $INSTALL/usr/bin
     cp $PKG_DIR/scripts/setwakeup.sh $INSTALL/usr/bin
 

diff --git a/projects/Amlogic/filesystem/usr/bin/cputemp b/projects/Amlogic/filesystem/usr/bin/cputemp
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
+echo "$(( $TEMP / 1000 )) C"
diff --git a/projects/Amlogic/filesystem/usr/bin/gputemp b/projects/Amlogic/filesystem/usr/bin/gputemp
@@ -0,0 +1 @@
+/usr/bin/cputemp
diff --git a/projects/Amlogic/kodi/advancedsettings.xml b/projects/Amlogic/kodi/advancedsettings.xml
diff --git a/packages/mediacenter/kodi/scripts/cputemp → projects/Generic/filesystem/usr/bin/cputemp b/packages/mediacenter/kodi/scripts/cputemp → projects/Generic/filesystem/usr/bin/cputemp
@@ -4,9 +4,6 @@
 # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
-# inspired by
-# https://github.com/xtranophilist/gnome-shell-extension-cpu-temperature/blob/master/extension.js
-
 TEMP=0
 
 if [ $(basename "$0") = "gputemp" -o "$1" = "gpu" ]; then
@@ -29,7 +26,6 @@ if [ $(basename "$0") = "gputemp" -o "$1" = "gpu" ]; then
     done
 
     TEMP="$(( $TEMP / 1000 ))"
-
   fi
 fi
 
@@ -50,11 +46,6 @@ if [ "$1" = "cpu" -o "$TEMP" = "0" ]; then
     TEMP="$(cat /sys/class/hwmon/hwmon0/device/temp1_input)"
   fi
 
-  # used on RaspberryPi and 3.14 kernel amlogic
-  if [ "$TEMP" = "0" -a -f /sys/class/thermal/thermal_zone0/temp ]; then
-    TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
-  fi
-
   TEMP="$(( $TEMP / 1000 ))"
 fi
 

diff --git a/projects/Generic/filesystem/usr/bin/gputemp b/projects/Generic/filesystem/usr/bin/gputemp
@@ -0,0 +1 @@
+/usr/bin/cputemp
diff --git a/projects/Generic/kodi/advancedsettings.xml b/projects/Generic/kodi/advancedsettings.xml
@@ -1,6 +1,4 @@
 <advancedsettings>
-  <cputempcommand>cputemp</cputempcommand>
-  <gputempcommand>gputemp</gputempcommand>
   <video>
     <latency>
       <delay>0</delay>

diff --git a/projects/RPi/filesystem/usr/bin/cputemp b/projects/RPi/filesystem/usr/bin/cputemp
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
+echo "$(( $TEMP / 1000 )) C"
diff --git a/projects/RPi/filesystem/usr/bin/gputemp b/projects/RPi/filesystem/usr/bin/gputemp
@@ -0,0 +1 @@
+/usr/bin/cputemp
diff --git a/projects/Rockchip/filesystem/usr/bin/cputemp b/projects/Rockchip/filesystem/usr/bin/cputemp
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
+echo "$(( $TEMP / 1000 )) C"
diff --git a/projects/Rockchip/filesystem/usr/bin/gputemp b/projects/Rockchip/filesystem/usr/bin/gputemp
@@ -0,0 +1 @@
+/usr/bin/cputemp
diff --git a/projects/WeTek_Core/filesystem/usr/bin/cputemp b/projects/WeTek_Core/filesystem/usr/bin/cputemp
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
+echo "$(( $TEMP / 1000 )) C"
diff --git a/projects/WeTek_Core/filesystem/usr/bin/gputemp b/projects/WeTek_Core/filesystem/usr/bin/gputemp
@@ -0,0 +1 @@
+/usr/bin/cputemp
diff --git a/projects/WeTek_Core/kodi/advancedsettings.xml b/projects/WeTek_Core/kodi/advancedsettings.xml
diff --git a/projects/WeTek_Play/filesystem/usr/bin/cputemp b/projects/WeTek_Play/filesystem/usr/bin/cputemp
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
+echo "$(( $TEMP / 1000 )) C"
diff --git a/projects/WeTek_Play/filesystem/usr/bin/gputemp b/projects/WeTek_Play/filesystem/usr/bin/gputemp
@@ -0,0 +1 @@
+/usr/bin/cputemp
diff --git a/projects/WeTek_Play/kodi/advancedsettings.xml b/projects/WeTek_Play/kodi/advancedsettings.xml