rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
bsp/buildroot/package/collectd/0002-gps-plugin-fix-build-with-newer-gpsd.patch Normal file
View File

@@ -0,0 +1,43 @@
From 991a6d3fd38c2435d94de3853fda36b3330cf6ab Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 9 Oct 2018 19:57:21 +0300
Subject: [PATCH] gps plugin: fix build with newer gpsd
gpsd version 3.18 changed the prototype of gps_read(). Make the
gps_read() call depend on GPSD_API_MAJOR_VERSION to fix that.
This fixes build failures like:
gps.c: In function 'cgps_thread':
gps.c:144:11: error: too few arguments to function 'gps_read'
if (gps_read(&gpsd_conn) == -1) {
^~~~~~~~
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: https://github.com/collectd/collectd/pull/2947
src/gps.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gps.c b/src/gps.c
index 1d32d0492617..b22c3a2e5ecd 100644
--- a/src/gps.c
+++ b/src/gps.c
@@ -141,7 +141,12 @@ static void *cgps_thread(void *pData) {
continue;
}
- if (gps_read(&gpsd_conn) == -1) {
+#if GPSD_API_MAJOR_VERSION > 6
+ if (gps_read(&gpsd_conn, NULL, 0) == -1)
+#else
+ if (gps_read(&gpsd_conn) == -1)
+#endif
+ {
WARNING("gps plugin: incorrect data! (err_count: %d)", err_count);
err_count++;
--
2.19.1

89
bsp/buildroot/package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch Normal file
View File

@@ -0,0 +1,89 @@
From 069796bd76dd1ab0089a64f7c9c2a3c9f1475414 Mon Sep 17 00:00:00 2001
From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Mon, 3 Dec 2018 18:34:14 +0700
Subject: [PATCH] sensors: Removed checks for upper limit of
SENSORS_API_VERSION
That makes no more sense after lm-sensors got new maintainers.
Issue: #3006
[Vadim Kochan: backported to support 5.7.1 version]
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
---
src/sensors.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/sensors.c b/src/sensors.c
index 8f1824d..409dc38 100644
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -149,7 +149,7 @@ typedef struct featurelist {
static char *conffile = SENSORS_CONF_PATH;
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
typedef struct featurelist {
const sensors_chip_name *chip;
const sensors_feature *feature;
@@ -159,11 +159,6 @@ typedef struct featurelist {
static char *conffile = NULL;
static _Bool use_labels = 0;
-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-
-#else /* if SENSORS_API_VERSION >= 0x500 */
-#error "This version of libsensors is not supported yet. Please report this " \
- "as bug."
#endif
static featurelist_t *first_feature = NULL;
@@ -223,7 +218,7 @@ static int sensors_config(const char *key, const char *value) {
if (IS_TRUE(value))
ignorelist_set_invert(sensor_list, 0);
}
-#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#if (SENSORS_API_VERSION >= 0x400)
else if (strcasecmp(key, "UseLabels") == 0) {
use_labels = IS_TRUE(value) ? 1 : 0;
}
@@ -353,7 +348,7 @@ static int sensors_load_conf(void) {
} /* while sensors_get_detected_chips */
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
chip_num = 0;
while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
const sensors_feature *feature;
@@ -404,7 +399,7 @@ static int sensors_load_conf(void) {
} /* while (subfeature) */
} /* while (feature) */
} /* while (chip) */
-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
+#endif /* (SENSORS_API_VERSION >= 0x400) */
if (first_feature == NULL) {
sensors_cleanup();
@@ -479,7 +474,7 @@ static int sensors_read(void) {
} /* for fl = first_feature .. NULL */
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
double value;
int status;
@@ -518,7 +513,7 @@ static int sensors_read(void) {
sensors_submit(plugin_instance, type, type_instance, value);
} /* for fl = first_feature .. NULL */
-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
+#endif /* (SENSORS_API_VERSION >= 0x400) */
return (0);
} /* int sensors_read */
--
2.14.1

12
bsp/buildroot/package/collectd/Config.in
View File

@@ -383,6 +383,7 @@ config BR2_PACKAGE_COLLECTD_PING
config BR2_PACKAGE_COLLECTD_POSTGRESQL
bool "postgresql"
depends on BR2_USE_WCHAR # postgresql
select BR2_PACKAGE_POSTGRESQL
help
Connects to and executes SQL statements on a PostgreSQL
@@ -390,6 +391,9 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL
configuration, the returned values are then converted into
collectd “value lists”.
comment "postgresql support needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR
config BR2_PACKAGE_COLLECTD_PROCESSES
bool "processes"
help
@@ -559,7 +563,7 @@ config BR2_PACKAGE_COLLECTD_RIEMANN
# riemann-c-client -> protobuf-c
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
depends on BR2_HOST_GCC_AT_LEAST_4_5
depends on BR2_HOST_GCC_AT_LEAST_4_8
select BR2_PACKAGE_RIEMANN_C_CLIENT
select BR2_PACKAGE_LIBTOOL
help
@@ -588,15 +592,15 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS
bool "write_prometheus"
depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c
depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf-c
depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf-c
select BR2_PACKAGE_LIBMICROHTTPD
select BR2_PACKAGE_PROTOBUF_C
help
Publishes values using an embedded HTTP server, in a format
compatible with Prometheus' collectd_exporter.
comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.5"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_5
comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.8"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_8
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
config BR2_PACKAGE_COLLECTD_WRITESENSU

9
bsp/buildroot/package/collectd/collectd.mk
View File

@@ -42,6 +42,7 @@ COLLECTD_CONF_OPTS += \
--with-nan-emulation \
--with-fp-layout=$(COLLECTD_FP_LAYOUT) \
--with-perl-bindings=no \
--disable-werror \
$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \
$(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \
$(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \
@@ -194,14 +195,6 @@ else
COLLECTD_CONF_OPTS += --with-libgcrypt=no
endif
# released software should not break on minor warnings
define COLLECTD_DROP_WERROR
$(SED) 's/-Werror//' \
$(@D)/src/Makefile.in $(@D)/src/libcollectdclient/Makefile.in
endef
COLLECTD_POST_PATCH_HOOKS += COLLECTD_DROP_WERROR
define COLLECTD_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
rm -f $(TARGET_DIR)/usr/bin/collectd-nagios