* [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled
@ 2021-03-21 13:58 Fabrice Fontaine
2022-01-01 12:28 ` Joachim Wiberg
0 siblings, 1 reply; 3+ messages in thread
From: Fabrice Fontaine @ 2021-03-21 13:58 UTC (permalink / raw)
To: buildroot
Following the bump to 8.1910.0, items requiring libcurl were
disabled by default. This patch selectively enables options
which depend on libcurl when that package is enabled in the
build.
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
[Fabrice: Disable mmkubernetes which also depends on lognorm and while
at it also disable mmnormalize which is available since version 6.1.2
(from 2010) and
https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v2 -> v3:
- Disable mmnormalize and mmkubernetes
Changes v1 -> v2
[Thomas
- Flipped libcurl conditional and name of this patchset to rsyslog
package/rsyslog/rsyslog.mk | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 99e80ae268..70adcd553b 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -24,14 +24,27 @@ endif
RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
-# Disable items requiring libcurl
+# Disable items requiring lognorm
+RSYSLOG_CONF_OPTS += \
+ --disable-mmkubernetes \
+ --disable-mmnormalize
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+RSYSLOG_DEPENDENCIES += libcurl
+RSYSLOG_CONF_OPTS += --enable-elasticsearch \
+ --enable-clickhouse \
+ --enable-omhttp \
+ --enable-fmhttp \
+ --enable-imdocker \
+ --enable-omhttpfs
+else
RSYSLOG_CONF_OPTS += --disable-elasticsearch \
--disable-clickhouse \
--disable-omhttp \
--disable-fmhttp \
--disable-imdocker \
- --disable-omhttpfs \
- --disable-mmkubernetes
+ --disable-omhttpfs
+endif
ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
RSYSLOG_DEPENDENCIES += civetweb
--
2.30.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled
2021-03-21 13:58 [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled Fabrice Fontaine
@ 2022-01-01 12:28 ` Joachim Wiberg
2022-01-01 13:08 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Joachim Wiberg @ 2022-01-01 12:28 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Matt Weber, Fabrice Fontaine
On Sun, Mar 21, 2021 at 14:58, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Following the bump to 8.1910.0, items requiring libcurl were
> disabled by default. This patch selectively enables options
> which depend on libcurl when that package is enabled in the
> build.
>
> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> [Fabrice: Disable mmkubernetes which also depends on lognorm and while
> at it also disable mmnormalize which is available since version 6.1.2
> (from 2010) and
> https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf]
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Joachim Wiberg <troglobit@gmail.com>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled
2022-01-01 12:28 ` Joachim Wiberg
@ 2022-01-01 13:08 ` Yann E. MORIN
0 siblings, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2022-01-01 13:08 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Joachim Wiberg, Matt Weber, buildroot
Fabrice, All,
On 2022-01-01 13:28 +0100, Joachim Wiberg spake thusly:
> On Sun, Mar 21, 2021 at 14:58, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> > Following the bump to 8.1910.0, items requiring libcurl were
> > disabled by default. This patch selectively enables options
> > which depend on libcurl when that package is enabled in the
> > build.
> >
> > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> > [Fabrice: Disable mmkubernetes which also depends on lognorm and while
> > at it also disable mmnormalize which is available since version 6.1.2
> > (from 2010) and
> > https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf]
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
> Reviewed-by: Joachim Wiberg <troglobit@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-01 13:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-21 13:58 [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled Fabrice Fontaine
2022-01-01 12:28 ` Joachim Wiberg
2022-01-01 13:08 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.