godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-05 14:09:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
A number of merge conflicts, but hopefully they are all sorted out now.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2020-09-02 18:07:52 +02:00
parent e3d7f5fe51 841ee767be
commit c287d789b7
352 changed files with 10966 additions and 4344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/collectd/Config.in
View File

@@ -386,6 +386,17 @@ config BR2_PACKAGE_COLLECTD_NTPD
help
Queries an NTP server and extracts parameters.
config BR2_PACKAGE_COLLECTD_NUT
bool "nut"
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_NUT
help
The NUT plugin collects uninterruptible power supply (UPS)
statistics using the Network UPS Tools (NUT).
comment "nut needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_COLLECTD_OLSRD
bool "olsrd"
help

4
package/collectd/collectd.mk
View File

@@ -18,7 +18,7 @@ COLLECTD_PLUGINS_DISABLE = \
apple_sensors aquaero ascent barometer dbi dpdkstat email \
gmond hddtemp intel_rdt ipmi java lpar \
madwifi mbmon mic multimeter netapp notify_desktop numa \
nut oracle perl pf pinba powerdns python routeros \
oracle perl pf pinba powerdns python routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
tokyotyrant turbostat uuid varnish virt vserver write_kafka \
write_mongodb xencpu xmms zfs_arc zone
@@ -106,6 +106,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),--enable-notify_email,--disable-notify_email) \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \
$(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \
$(if $(BR2_PACKAGE_COLLECTD_NUT),--enable-nut,--disable-nut) \
$(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \
$(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),--enable-onewire,--disable-onewire) \
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \
@@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \
$(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \
$(if $(BR2_PACKAGE_COLLECTD_NUT),nut) \
$(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),owfs) \
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \
$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \