Commit d89a2610 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

rsyslog: libuuid is an optional dependency, not a required one 



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 37d41013

package/rsyslog/Config.in

+0 −4
Original line number Diff line number Diff line
@@ -4,12 +4,8 @@ config BR2_PACKAGE_RSYSLOG 
	select BR2_PACKAGE_LIBESTR

	select BR2_PACKAGE_LIBLOGGING

	select BR2_PACKAGE_JSON_C

	select BR2_PACKAGE_UTIL_LINUX

	select BR2_PACKAGE_UTIL_LINUX_LIBUUID

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_LARGEFILE # util-linux

	depends on BR2_USE_MMU # fork()

	depends on BR2_USE_WCHAR # util-linux

	help

	  Rsyslog is a powerful and flexible syslog implementation

package/rsyslog/rsyslog.mk

+8 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ RSYSLOG_VERSION = 7.6.5 
RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog

RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0

RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20

RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c util-linux host-pkgconf

RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf



RSYSLOG_CONF_OPT = --disable-testbench \

		   --enable-cached-man-pages
@@ -30,6 +30,13 @@ else 
	RSYSLOG_CONF_OPT += --enable-libgcrypt=no

endif



ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)

	RSYSLOG_DEPENDENCIES += util-linux

	RSYSLOG_CONF_OPT += --enable-uuid

else

	RSYSLOG_CONF_OPT += --disable-uuid

endif



define RSYSLOG_INSTALL_INIT_SYSV

	[ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \

		$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \