[Buildroot] [PATCH 16/50] package/busybox: invert dependency with rsyslogd

Carlos Santos casantos at datacom.com.br
Fri Jul 6 01:58:35 UTC 2018


> From: "Yann Morin" <yann.morin.1998 at free.fr>
> To: "buildroot" <buildroot at buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998 at free.fr>
> Sent: Monday, July 2, 2018 6:11:50 PM
> Subject: [Buildroot] [PATCH 16/50] package/busybox: invert dependency with rsyslogd

Should be "rsyslog", not "rsyslogd", in the commit title.

> Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
> ---
> package/busybox/busybox.mk | 1 +
> package/rsyslog/rsyslog.mk | 5 -----
> 2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 7686667884..3a19500ad3 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
> 
> # Packages that provide commands that may also be busybox applets:
> BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslogd) \
> 	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
> 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
> 	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
> diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
> index e32505be22..61e08ba765 100644
> --- a/package/rsyslog/rsyslog.mk
> +++ b/package/rsyslog/rsyslog.mk
> @@ -17,11 +17,6 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
> RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
> 	$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
> 
> -# Build after BusyBox
> -ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> -RSYSLOG_DEPENDENCIES += busybox
> -endif
> -
> ifeq ($(BR2_PACKAGE_GNUTLS),y)
> RSYSLOG_DEPENDENCIES += gnutls
> RSYSLOG_CONF_OPTS += --enable-gnutls
> --
> 2.14.1

-- 
Carlos Santos (Casantos) - DATACOM, P&D


More information about the buildroot mailing list