Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user