* [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl"
@ 2024-07-25 15:37 Flávio Tapajós
2024-07-25 15:37 ` [Buildroot] [PATCH 2/3] package/rsyslog: extra plugins option introduced Flávio Tapajós
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Flávio Tapajós @ 2024-07-25 15:37 UTC (permalink / raw)
To: buildroot; +Cc: Flávio Tapajós, Konstantin Menyaev
From: Konstantin Menyaev <KAMenyaev@salutedevices.com>
This reverts commit cea81b6925de166e2fd2c75a51aea94420f7f06a.
rsyslog now builds successfully with musl
Signed-off-by: Konstantin Menyaev <KAMenyaev@salutedevices.com>
Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
---
package/rsyslog/Config.in | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 3ba326191a..d9e8b1ab6f 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_RSYSLOG
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # modules
- depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE
# Propagate the exact same dependency from libfastjson,
# even though rsyslog already depends on threads for itself:
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS
@@ -18,9 +17,8 @@ config BR2_PACKAGE_RSYSLOG
http://www.rsyslog.com
-comment "rsyslog needs a uClibc or glibc toolchain w/ threads, dynamic library"
+comment "rsyslog needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
- || BR2_TOOLCHAIN_USES_MUSL
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/3] package/rsyslog: extra plugins option introduced
2024-07-25 15:37 [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl" Flávio Tapajós
@ 2024-07-25 15:37 ` Flávio Tapajós
2024-07-25 15:37 ` [Buildroot] [PATCH 3/3] package/rsyslog: bump version to 8.2406.0 Flávio Tapajós
2024-08-15 20:19 ` [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl" Thomas Petazzoni via buildroot
2 siblings, 0 replies; 4+ messages in thread
From: Flávio Tapajós @ 2024-07-25 15:37 UTC (permalink / raw)
To: buildroot; +Cc: Flávio Tapajós, Konstantin Menyaev
From: Konstantin Menyaev <KAMenyaev@salutedevices.com>
By default rsyslog builds with a bunch of plugins,
most of them are not even used, despite the dependent package like lubcurl.
This option is useful in embedded systems to achieve compact footprint.
Signed-off-by: Konstantin Menyaev <KAMenyaev@salutedevices.com>
Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
---
package/rsyslog/Config.in | 10 ++++++++++
package/rsyslog/rsyslog.mk | 35 +++++++++++++++++++----------------
2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index d9e8b1ab6f..044ea861bc 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -17,6 +17,16 @@ config BR2_PACKAGE_RSYSLOG
http://www.rsyslog.com
+if BR2_PACKAGE_RSYSLOG
+
+config BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS
+ bool "extra plugins"
+ default y
+ help
+ Rsyslog extra plugins support
+
+endif # BR2_PACKAGE_RSYSLOG
+
comment "rsyslog needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index fac78795c2..ae645011ba 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -15,12 +15,15 @@ RSYSLOG_CPE_ID_VENDOR = rsyslog
RSYSLOG_IGNORE_CVES += CVE-2015-3243
RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf
RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
+
+ifeq ($(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),y)
RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \
mail omprog omruleset omstdout omuxsock \
pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare
+endif
-ifeq ($(BR2_PACKAGE_LIBRELP),y)
+ifeq ($(BR2_PACKAGE_LIBRELP)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += librelp
RSYSLOG_PLUGINS += relp
endif
@@ -33,7 +36,7 @@ RSYSLOG_CONF_OPTS += \
--disable-mmkubernetes \
--disable-mmnormalize
-ifeq ($(BR2_PACKAGE_LIBCURL),y)
+ifeq ($(BR2_PACKAGE_LIBCURL)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += libcurl
RSYSLOG_CONF_OPTS += \
--enable-clickhouse \
@@ -52,35 +55,35 @@ RSYSLOG_CONF_OPTS += \
--disable-omhttpfs
endif
-ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
+ifeq ($(BR2_PACKAGE_CIVETWEB_LIB)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += apr-util civetweb
RSYSLOG_CONF_OPTS += --enable-imhttp
else
RSYSLOG_CONF_OPTS += --disable-imhttp
endif
-ifeq ($(BR2_PACKAGE_CZMQ),y)
+ifeq ($(BR2_PACKAGE_CZMQ)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += czmq
RSYSLOG_CONF_OPTS += --enable-imczmq --enable-omczmq
else
RSYSLOG_CONF_OPTS += --disable-imczmq --disable-omczmq
endif
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
+ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += gnutls
RSYSLOG_CONF_OPTS += --enable-gnutls
else
RSYSLOG_CONF_OPTS += --disable-gnutls
endif
-ifeq ($(BR2_PACKAGE_HIREDIS),y)
+ifeq ($(BR2_PACKAGE_HIREDIS)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += hiredis
RSYSLOG_CONF_OPTS += --enable-omhiredis
else
RSYSLOG_CONF_OPTS += --disable-omhiredis
endif
-ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+ifeq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += libgcrypt
RSYSLOG_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
RSYSLOG_CONF_OPTS += --enable-libgcrypt
@@ -88,21 +91,21 @@ else
RSYSLOG_CONF_OPTS += --disable-libgcrypt
endif
-ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y)
+ifeq ($(BR2_PACKAGE_LIBMAXMINDDB)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += libmaxminddb
RSYSLOG_CONF_OPTS += --enable-mmdblookup
else
RSYSLOG_CONF_OPTS += --disable-mmdblookup
endif
-ifeq ($(BR2_PACKAGE_LIBPCAP),y)
+ifeq ($(BR2_PACKAGE_LIBPCAP)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += libpcap
RSYSLOG_CONF_OPTS += --enable-impcap
else
RSYSLOG_CONF_OPTS += --disable-impcap
endif
-ifeq ($(BR2_PACKAGE_MARIADB),y)
+ifeq ($(BR2_PACKAGE_MARIADB)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += mariadb
RSYSLOG_CONF_OPTS += --enable-mysql
RSYSLOG_CONF_ENV += ac_cv_prog_MYSQL_CONFIG=$(STAGING_DIR)/usr/bin/mysql_config
@@ -110,7 +113,7 @@ else
RSYSLOG_CONF_OPTS += --disable-mysql
endif
-ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
+ifeq ($(BR2_PACKAGE_POSTGRESQL)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += postgresql
RSYSLOG_CONF_OPTS += --enable-pgsql
RSYSLOG_CONF_ENV += ac_cv_prog_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config
@@ -118,28 +121,28 @@ else
RSYSLOG_CONF_OPTS += --disable-pgsql
endif
-ifeq ($(BR2_PACKAGE_QPID_PROTON),y)
+ifeq ($(BR2_PACKAGE_QPID_PROTON)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += qpid-proton
RSYSLOG_CONF_OPTS += --enable-omamqp1
else
RSYSLOG_CONF_OPTS += --disable-omamqp1
endif
-ifeq ($(BR2_PACKAGE_RABBITMQ_C),y)
+ifeq ($(BR2_PACKAGE_RABBITMQ_C)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += rabbitmq-c
RSYSLOG_CONF_OPTS += --enable-omrabbitmq
else
RSYSLOG_CONF_OPTS += --disable-omrabbitmq
endif
-ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_DEPENDENCIES += util-linux
RSYSLOG_CONF_OPTS += --enable-uuid
else
RSYSLOG_CONF_OPTS += --disable-uuid
endif
-ifeq ($(BR2_INIT_SYSTEMD),y)
+ifeq ($(BR2_INIT_SYSTEMD)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_CONF_OPTS += \
--enable-imjournal \
--enable-omjournal \
@@ -151,7 +154,7 @@ RSYSLOG_CONF_OPTS += \
--disable-omjournal
endif
-ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y)
+ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy)
RSYSLOG_CONF_OPTS += --enable-libdbi
RSYSLOG_DEPENDENCIES += libdbi-drivers
else
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] package/rsyslog: bump version to 8.2406.0
2024-07-25 15:37 [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl" Flávio Tapajós
2024-07-25 15:37 ` [Buildroot] [PATCH 2/3] package/rsyslog: extra plugins option introduced Flávio Tapajós
@ 2024-07-25 15:37 ` Flávio Tapajós
2024-08-15 20:19 ` [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl" Thomas Petazzoni via buildroot
2 siblings, 0 replies; 4+ messages in thread
From: Flávio Tapajós @ 2024-07-25 15:37 UTC (permalink / raw)
To: buildroot; +Cc: Flávio Tapajós
Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
---
package/rsyslog/rsyslog.hash | 2 +-
package/rsyslog/rsyslog.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash
index 212a1accea..caf411c322 100644
--- a/package/rsyslog/rsyslog.hash
+++ b/package/rsyslog/rsyslog.hash
@@ -1,5 +1,5 @@
# From http://www.rsyslog.com/downloads/download-v8-stable/
-sha256 acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba rsyslog-8.2402.0.tar.gz
+sha256 1343e0269dd32166ffde04d7ceebfa0e7146cf1dbc6962c56bf428c61f01a7df rsyslog-8.2406.0.tar.gz
# Locally calculated
sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index ae645011ba..df5852d731 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RSYSLOG_VERSION = 8.2402.0
+RSYSLOG_VERSION = 8.2406.0
RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0
RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl"
2024-07-25 15:37 [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl" Flávio Tapajós
2024-07-25 15:37 ` [Buildroot] [PATCH 2/3] package/rsyslog: extra plugins option introduced Flávio Tapajós
2024-07-25 15:37 ` [Buildroot] [PATCH 3/3] package/rsyslog: bump version to 8.2406.0 Flávio Tapajós
@ 2024-08-15 20:19 ` Thomas Petazzoni via buildroot
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-08-15 20:19 UTC (permalink / raw)
To: Flávio Tapajós; +Cc: Konstantin Menyaev, buildroot
On Thu, 25 Jul 2024 12:37:40 -0300
Flávio Tapajós <flavio.tapajos@newtesc.com.br> wrote:
> From: Konstantin Menyaev <KAMenyaev@salutedevices.com>
>
> This reverts commit cea81b6925de166e2fd2c75a51aea94420f7f06a.
>
> rsyslog now builds successfully with musl
>
> Signed-off-by: Konstantin Menyaev <KAMenyaev@salutedevices.com>
> Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
> ---
> package/rsyslog/Config.in | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
Series applied to next. I did some small improvements on PATCH 2/3:
simplified the option name, fixed the indentation, improved the commit
log.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-15 20:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-25 15:37 [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl" Flávio Tapajós
2024-07-25 15:37 ` [Buildroot] [PATCH 2/3] package/rsyslog: extra plugins option introduced Flávio Tapajós
2024-07-25 15:37 ` [Buildroot] [PATCH 3/3] package/rsyslog: bump version to 8.2406.0 Flávio Tapajós
2024-08-15 20:19 ` [Buildroot] [PATCH 1/3] Revert "rsyslog: not available on musl" Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox