deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/collectd: add config option for lua 

collectd has sub-options for all its different plugins and features,
so let's do the same for the lua functionality, instead of using
automatic dependencies.

Signed-off-by: Tom Marcuzzi <tom.marcuzzi@orolia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020.02.x
Tom Marcuzzi 2020-01-27 17:28:15 +00:00 committed by Thomas Petazzoni
parent 8330cfe5c5
commit ed459a71d3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/collectd/Config.in
View File

@ -63,6 +63,13 @@ config BR2_PACKAGE_COLLECTD_LOGSTASH
help
Writes log messages formatted as logstash JSON events.
config BR2_PACKAGE_COLLECTD_LUA
bool "lua"
select BR2_PACKAGE_LUA
help
Embeds a Lua interpreter into collectd and provides an
interface to collectd's plugin system.
config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL
bool "notify_email"
depends on !BR2_STATIC_LIBS # libesmtp

9
package/collectd/collectd.mk
View File

@ -89,6 +89,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \
$(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \
$(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \
$(if $(BR2_PACKAGE_COLLECTD_LVM),--enable-lvm,--disable-lvm) \
$(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \
@ -162,6 +163,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \
$(if $(BR2_PACKAGE_COLLECTD_LUA),lua) \
$(if $(BR2_PACKAGE_COLLECTD_LVM),lvm2) \
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \
$(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \
@ -213,13 +215,6 @@ else
COLLECTD_CONF_OPTS += --with-libgcrypt=no
endif
ifeq ($(BR2_PACKAGE_LUA),y)
COLLECTD_DEPENDENCIES += lua
COLLECTD_CONF_OPTS += --enable-lua
else
COLLECTD_CONF_OPTS += --disable-lua
endif
define COLLECTD_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
rm -f $(TARGET_DIR)/usr/bin/collectd-nagios