diff --git a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk index 3727dee0ea..46b554082a 100644 --- a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lm_sensors" -PKG_VERSION="e8afbda10fba571c816abddcb5c8180afc435bba" -PKG_SHA256="255b9a9b30c7969b3df0460392a807239c18b15baac1ff33ff5fef3b1cc1169d" +PKG_VERSION="3.6.0" +PKG_SHA256="0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197" PKG_ARCH="arm x86_64" PKG_LICENSE="GPL" -PKG_SITE="http://secure.netroedge.com/~lm78/" -PKG_URL="https://github.com/groeck/lm-sensors/archive/${PKG_VERSION}.tar.gz" +PKG_SITE="https://hwmon.wiki.kernel.org" +PKG_URL="https://github.com/groeck/lm-sensors/archive/V${PKG_VERSION//./-}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Provides user-space support for the hardware monitoring drivers." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/lm_sensors/patches/lm_sensors-02-PR192.patch b/packages/addons/addon-depends/system-tools-depends/lm_sensors/patches/lm_sensors-02-PR192.patch deleted file mode 100644 index aa177b5493..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/lm_sensors/patches/lm_sensors-02-PR192.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ee1aba92d670701b2aa3d798f1c3c84061eca554 Mon Sep 17 00:00:00 2001 -From: Lucas Magasweran -Date: Wed, 7 Aug 2019 14:43:23 +0200 -Subject: [PATCH] makefile: use target arch when determining what programs to - compile - -`uname -m` lists the host machine architecture. To support cross-compilation -the Makefile should detect the compiler's target architecture. This approach -uses the `gcc`/`clang` compatible `-dumpmachine` option and parses the first -word in the tuple representing the target architecture. - -Renaming `MACHINE` to `ARCH` to match cross-compiler conventions for -specifying the target architecture (e.g. -`make ARCH=arm CC=arm-linux-gnueabi-gcc`) - -Just like for PPC the `isadump` and `isaset` tools should not be compiled -on ARM. This has the side affect of "fixing" the ARM build with glibc-2.30, -which removed `sys/io.h` I/O port functions. - -Fixes #190 - -Signed-off-by: Lucas Magasweran ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 2f5859f0..47ffe788 100644 ---- a/Makefile -+++ b/Makefile -@@ -77,7 +77,7 @@ LIBINCLUDEDIR := $(INCLUDEDIR)/sensors - # manual pages will be installed. - MANDIR := $(PREFIX)/man - --MACHINE := $(shell uname -m) -+ARCH := $(firstword $(subst -, ,$(shell $(CC) -dumpmachine))) - - # Extra non-default programs to build; e.g., sensord - #PROG_EXTRA := sensord -@@ -109,7 +109,7 @@ BUILD_STATIC_LIB := 1 - SRCDIRS := lib prog/detect prog/pwm \ - prog/sensors ${PROG_EXTRA:%=prog/%} etc - # Only build isadump and isaset on x86 machines. --ifneq (,$(findstring $(MACHINE), i386 i486 i586 i686 x86_64)) -+ifneq (,$(findstring $(ARCH), i386 i486 i586 i686 x86_64)) - SRCDIRS += prog/dump - endif - SRCDIRS += lib/test