Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5468 from u1f35c/master

Browse source 
utils/collectd: Re-add option to enable encrypted network output
This commit is contained in:
Hannu Nyman 2018-01-18 18:32:03 +02:00 committed by GitHub
commit ed2d1923ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
utils/collectd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.8.0 PKG_VERSION:=5.8.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://collectd.org/files/ \ PKG_SOURCE_URL:=https://collectd.org/files/ \
@ -203,6 +203,14 @@ define Package/collectd/description
and provides mechanismns to store the values in a variety of ways. and provides mechanismns to store the values in a variety of ways.
endef endef
define Package/collectd/config
config PACKAGE_COLLECTD_ENCRYPTED_NETWORK
bool "Enable ability to use encrypted networking"
default n
depends on PACKAGE_collectd
select PACKAGE_collectd-mod-network
endef
ifneq ($(CONFIG_avr32),) ifneq ($(CONFIG_avr32),)
TARGET_CFLAGS += -fsigned-char TARGET_CFLAGS += -fsigned-char
endif endif
@ -214,7 +222,6 @@ CONFIGURE_ARGS+= \
--enable-daemon \ --enable-daemon \
--with-nan-emulation \ --with-nan-emulation \
--with-libyajl=no \ --with-libyajl=no \
--without-libgcrypt \
--without-perl-bindings \ --without-perl-bindings \
--without-libudev --without-libudev
@ -223,6 +230,16 @@ CONFIGURE_VARS+= \
LDFLAGS="$$$$LDFLAGS -lm -lz" \ LDFLAGS="$$$$LDFLAGS -lm -lz" \
KERNEL_DIR="$(LINUX_DIR)" \ KERNEL_DIR="$(LINUX_DIR)" \
ifneq ($(CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK),)
CONFIGURE_ARGS+= \
--with-libgcrypt=$(STAGING_DIR)/usr
CONFIGURE_VARS+= \
GCRYPT_LIBS="-lgcrypt"
else
CONFIGURE_ARGS+= \
--without-libgcrypt
endif
CONFIGURE_PLUGIN= \ CONFIGURE_PLUGIN= \
$(foreach m, $(1), \ $(foreach m, $(1), \
$(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \ $(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \
@ -353,7 +370,7 @@ $(eval $(call BuildPlugin,match-value,value match,match_value,))
$(eval $(call BuildPlugin,memory,physical memory usage input,memory,)) $(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
$(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus)) $(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus))
$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:libmnl)) $(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:libmnl))
$(eval $(call BuildPlugin,network,network input/output,network,)) $(eval $(call BuildPlugin,network,network input/output,network,+PACKAGE_COLLECTD_ENCRYPTED_NETWORK:libgcrypt))
$(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl)) $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
$(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,)) $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut-common)) $(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut-common))