Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
COLLECTD_VERSION = 5.5.2
|
||||
COLLECTD_VERSION = 5.7.1
|
||||
COLLECTD_SITE = http://collectd.org/files
|
||||
COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2
|
||||
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
|
||||
@@ -14,13 +14,13 @@ COLLECTD_LICENSE_FILES = COPYING
|
||||
|
||||
# These require unmet dependencies, are fringe, pointless or deprecated
|
||||
COLLECTD_PLUGINS_DISABLE = \
|
||||
amqp apple_sensors aquaero ascent barometer dbi email \
|
||||
gmond hddtemp ipmi java libvirt lpar lvm madwifi mbmon \
|
||||
mic multimeter netapp notify_desktop notify_email numa \
|
||||
amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \
|
||||
gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lvm \
|
||||
madwifi mbmon mic multimeter netapp notify_desktop numa \
|
||||
nut onewire oracle perl pf pinba powerdns python redis routeros \
|
||||
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
|
||||
tokyotyrant turbostat uuid varnish virt vserver write_kafka \
|
||||
write_mongodb write_redis xmms zfs_arc
|
||||
write_mongodb write_redis xencpu xmms zfs_arc zone
|
||||
|
||||
COLLECTD_CONF_ENV += LIBS="-lm"
|
||||
|
||||
@@ -35,11 +35,13 @@ COLLECTD_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CONNTRACK),--enable-conntrack,--disable-conntrack) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CPU),--enable-cpu,--disable-cpu) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CPUFREQ),--enable-cpufreq,--disable-cpufreq) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CPUSLEEP),--enable-cpusleep,--disable-cpusleep) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CSV),--enable-csv,--disable-csv) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \
|
||||
@@ -55,8 +57,10 @@ COLLECTD_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_FHCOUNT),--enable-fhcount,--disable-fhcount) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_FILECOUNT),--enable-filecount,--disable-filecount) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_GPS),--enable-gps,--disable-gps) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \
|
||||
@@ -70,6 +74,7 @@ COLLECTD_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MODBUS),--enable-modbus,--disable-modbus) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MQTT),--enable-mqtt,--disable-mqtt) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MYSQL),--enable-mysql,--disable-mysql) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NETLINK),--enable-netlink,--disable-netlink) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \
|
||||
@@ -77,6 +82,7 @@ COLLECTD_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NGINX),--enable-nginx,--disable-nginx) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NOTIFICATION),--enable-target_notification,--disable-target_notification) \
|
||||
$(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_OLSRD),--enable-olsrd,--disable-olsrd) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \
|
||||
@@ -113,6 +119,7 @@ COLLECTD_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITESENSU),--enable-write_sensu,--disable-write_sensu) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITETSDB),--enable-write_tsdb,--disable-write_tsdb) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_ZOOKEEPER),--enable-zookeeper,--disable-zookeeper)
|
||||
@@ -126,10 +133,12 @@ COLLECTD_DEPENDENCIES = \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \
|
||||
@@ -137,12 +146,13 @@ COLLECTD_DEPENDENCIES = \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_POSTGRESQL),postgresql) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),libtool protobuf-c) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),libtool riemann-c-client) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl)
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c)
|
||||
|
||||
# include/library fixups
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
@@ -152,7 +162,7 @@ ifeq ($(BR2_PACKAGE_MYSQL),y)
|
||||
COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_NETSNMP),y)
|
||||
COLLECTD_CONF_OPTS += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config
|
||||
COLLECTD_CONF_OPTS += --with-libnetsnmp=$(STAGING_DIR)/usr
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
|
||||
COLLECTD_CONF_OPTS += --with-libpq=$(STAGING_DIR)/usr/bin/pg_config
|
||||
@@ -165,8 +175,7 @@ endif
|
||||
# network can use libgcrypt
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
COLLECTD_DEPENDENCIES += libgcrypt
|
||||
COLLECTD_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr
|
||||
COLLECTD_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
|
||||
COLLECTD_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr/bin/libgcrypt-config
|
||||
else
|
||||
COLLECTD_CONF_OPTS += --with-libgcrypt=no
|
||||
endif
|
||||
@@ -180,7 +189,7 @@ endef
|
||||
COLLECTD_POST_PATCH_HOOKS += COLLECTD_DROP_WERROR
|
||||
|
||||
define COLLECTD_INSTALL_TARGET_CMDS
|
||||
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
rm -f $(TARGET_DIR)/usr/bin/collectd-nagios
|
||||
rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user