bump to 3.5.0

This commit is contained in:
LEAN-ESX 2019-11-26 08:09:08 -08:00
parent e32f62519b
commit 40937b855c
3 changed files with 32 additions and 56 deletions

View File

@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lm-sensors
PKG_VERSION:=3.3.5
PKG_RELEASE:=4
PKG_VERSION:=3.5.0
PKG_RELEASE:=6
PKG_VERSION_SUBST=$(subst .,-,$(PKG_VERSION))
PKG_SOURCE_URL:=https://codeload.github.com/lm-sensors/lm-sensors/tar.gz/V$(PKG_VERSION_SUBST)?
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION_SUBST)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/groeck/lm-sensors.git
PKG_SOURCE_VERSION:=f8cdcc35bff0785aecf49d9a8484a71ce3ebee4f
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_MIRROR_HASH:=892e9e2eed78e27fb7a08e8ce78b1164a3d101ba79a9e04f1c1273940d48cf17
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
PKG_CPE_ID:=cpe:/a:lm_sensors:lm_sensors
PKG_BUILD_PARALLEL:=1
@ -26,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/lm-sensors/Default
DEPENDS:=+sysfsutils
URL:=http://www.lm-sensors.org/
URL:=https://hwmon.wiki.kernel.org/lm_sensors
endef
define Package/lm-sensors
@ -42,7 +43,12 @@ define Package/lm-sensors-detect
SECTION:=utils
CATEGORY:=Utilities
TITLE:=lm-sensors-detect
DEPENDS+=+lm-sensors +perl +perlbase-essential +perlbase-fcntl +perlbase-file +perlbase-xsloader
DEPENDS+=+lm-sensors \
+PACKAGE_lm-sensors-detect:perl \
+PACKAGE_lm-sensors-detect:perlbase-essential \
+PACKAGE_lm-sensors-detect:perlbase-fcntl \
+PACKAGE_lm-sensors-detect:perlbase-file \
+PACKAGE_lm-sensors-detect:perlbase-xsloader
endef
define Package/libsensors
@ -50,6 +56,7 @@ define Package/libsensors
SECTION:=libs
CATEGORY:=Libraries
TITLE:=libsensors
ABI_VERSION:=5
endef
define Package/lm-sensors/description
@ -113,7 +120,7 @@ endef
define Package/libsensors/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib
endef
$(eval $(call BuildPackage,lm-sensors))

View File

@ -0,0 +1,13 @@
--- a/prog/sensors/main.c 2014-01-22 00:11:15.000000000 -0800
+++ b/prog/sensors/main.c 2019-11-25 17:54:16.000000000 -0800
@@ -315,10 +315,6 @@
print_bus_list();
} else if (optind == argc) { /* No chip name on command line */
if (!do_the_real_work(NULL, &err)) {
- fprintf(stderr,
- "No sensors found!\n"
- "Make sure you loaded all the kernel drivers you need.\n"
- "Try sensors-detect to find out which these are.\n");
err = 1;
}
} else {

View File

@ -1,44 +0,0 @@
--- a/prog/dump/isadump.c
+++ b/prog/dump/isadump.c
@@ -38,7 +38,7 @@
/* To keep glibc2 happy */
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+#if !defined(__UCLIBC__)
#include <sys/io.h>
#else
#include <asm/io.h>
--- a/prog/dump/isaset.c
+++ b/prog/dump/isaset.c
@@ -34,7 +34,7 @@
/* To keep glibc2 happy */
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+#if !defined(__UCLIBC__)
#include <sys/io.h>
#else
#include <asm/io.h>
--- a/prog/dump/superio.c
+++ b/prog/dump/superio.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+#if !defined(__UCLIBC__)
#include <sys/io.h>
#else
#include <asm/io.h>
--- a/prog/dump/util.c
+++ b/prog/dump/util.c
@@ -12,7 +12,7 @@
#include "util.h"
/* To keep glibc2 happy */
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+#if !defined(__UCLIBC__)
#include <sys/io.h>
#else
#include <asm/io.h>