* [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency
2023-11-28 13:43 Flávio Tapajós
@ 2023-11-28 13:43 ` Flávio Tapajós
2023-11-28 14:07 ` Baruch Siach via buildroot
0 siblings, 1 reply; 6+ messages in thread
From: Flávio Tapajós @ 2023-11-28 13:43 UTC (permalink / raw)
To: buildroot; +Cc: Flávio Tapajós
Needed in order to use omlibdbi module
Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
---
package/rsyslog/Config.in | 1 +
package/rsyslog/rsyslog.mk | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 3ba326191a..e07db818e2 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -13,6 +13,7 @@ config BR2_PACKAGE_RSYSLOG
select BR2_PACKAGE_LIBESTR
select BR2_PACKAGE_LIBLOGGING
select BR2_PACKAGE_LIBFASTJSON
+ select BR2_PACKAGE_LIBDBI_DRIVERS
help
Rsyslog is a powerful and flexible syslog implementation
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index cf9f2c0e79..8ea92ea785 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -151,6 +151,13 @@ RSYSLOG_CONF_OPTS += \
--disable-omjournal
endif
+ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y)
+RSYSLOG_CONF_OPTS += --enable-libdbi
+RSYSLOG_DEPENDENCIES += libdbi-drivers
+else
+RSYSLOG_CONF_OPTS += --disable-libdbi
+endif
+
define RSYSLOG_INSTALL_INIT_SYSTEMD
$(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \
$(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency
2023-11-28 13:43 ` [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency Flávio Tapajós
@ 2023-11-28 14:07 ` Baruch Siach via buildroot
0 siblings, 0 replies; 6+ messages in thread
From: Baruch Siach via buildroot @ 2023-11-28 14:07 UTC (permalink / raw)
To: Flávio Tapajós; +Cc: buildroot
Hi Flávio,
On Tue, Nov 28 2023, Flávio Tapajós wrote:
> Needed in order to use omlibdbi module
>
> Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
> ---
> package/rsyslog/Config.in | 1 +
> package/rsyslog/rsyslog.mk | 7 +++++++
> 2 files changed, 8 insertions(+)
>
> diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
> index 3ba326191a..e07db818e2 100644
> --- a/package/rsyslog/Config.in
> +++ b/package/rsyslog/Config.in
> @@ -13,6 +13,7 @@ config BR2_PACKAGE_RSYSLOG
> select BR2_PACKAGE_LIBESTR
> select BR2_PACKAGE_LIBLOGGING
> select BR2_PACKAGE_LIBFASTJSON
> + select BR2_PACKAGE_LIBDBI_DRIVERS
The code below indicates that BR2_PACKAGE_LIBDBI_DRIVERS is an optional
dependency. No need to force 'select' in that case. The user can enable
BR2_PACKAGE_LIBDBI_DRIVERS for the omlibdbi functionality.
baruch
> help
> Rsyslog is a powerful and flexible syslog implementation
>
> diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
> index cf9f2c0e79..8ea92ea785 100644
> --- a/package/rsyslog/rsyslog.mk
> +++ b/package/rsyslog/rsyslog.mk
> @@ -151,6 +151,13 @@ RSYSLOG_CONF_OPTS += \
> --disable-omjournal
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y)
> +RSYSLOG_CONF_OPTS += --enable-libdbi
> +RSYSLOG_DEPENDENCIES += libdbi-drivers
> +else
> +RSYSLOG_CONF_OPTS += --disable-libdbi
> +endif
> +
> define RSYSLOG_INSTALL_INIT_SYSTEMD
> $(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \
> $(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0
@ 2023-11-29 11:02 Flávio Tapajós
2023-11-29 11:02 ` [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency Flávio Tapajós
2023-12-02 8:38 ` [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0 Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Flávio Tapajós @ 2023-11-29 11:02 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 4049590bb8..90df3e054f 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 a6d731e46ad3d64f6ad4b19bbf1bf56ca4760a44a24bb96823189dc2e71f7028 rsyslog-8.2204.1.tar.gz
+sha256 20d9ce792bf0a7ed0703dbf0941490f8be655f48b55b4bebdc0827bbb0ddbf11 rsyslog-8.2310.0.tar.gz
# Locally calculated
sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 84fd2d2e5e..cf9f2c0e79 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RSYSLOG_VERSION = 8.2204.1
+RSYSLOG_VERSION = 8.2310.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.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency
2023-11-29 11:02 [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0 Flávio Tapajós
@ 2023-11-29 11:02 ` Flávio Tapajós
2023-12-02 8:39 ` Peter Korsgaard
2023-12-02 8:38 ` [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0 Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: Flávio Tapajós @ 2023-11-29 11:02 UTC (permalink / raw)
To: buildroot; +Cc: Flávio Tapajós
Needed in order to use omlibdbi module
Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
---
DEVELOPERS | 1 +
package/rsyslog/rsyslog.mk | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/DEVELOPERS b/DEVELOPERS
index 1f26e9bc81..2f3eedf8a0 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1078,6 +1078,7 @@ F: package/python-pymodbus/
N: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
F: configs/asus_tinker-s_rk3288_defconfig
F: board/asus/tinker-s/
+F: package/rsyslog/
N: Florian Fainelli <f.fainelli@gmail.com>
F: package/cpulimit/
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index cf9f2c0e79..8ea92ea785 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -151,6 +151,13 @@ RSYSLOG_CONF_OPTS += \
--disable-omjournal
endif
+ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y)
+RSYSLOG_CONF_OPTS += --enable-libdbi
+RSYSLOG_DEPENDENCIES += libdbi-drivers
+else
+RSYSLOG_CONF_OPTS += --disable-libdbi
+endif
+
define RSYSLOG_INSTALL_INIT_SYSTEMD
$(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \
$(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0
2023-11-29 11:02 [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0 Flávio Tapajós
2023-11-29 11:02 ` [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency Flávio Tapajós
@ 2023-12-02 8:38 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2023-12-02 8:38 UTC (permalink / raw)
To: Flávio Tapajós; +Cc: buildroot
>>>>> "Flávio" == Flávio Tapajós <flavio.tapajos@newtesc.com.br> writes:
> Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
Committed to next, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency
2023-11-29 11:02 ` [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency Flávio Tapajós
@ 2023-12-02 8:39 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2023-12-02 8:39 UTC (permalink / raw)
To: Flávio Tapajós; +Cc: buildroot
>>>>> "Flávio" == Flávio Tapajós <flavio.tapajos@newtesc.com.br> writes:
> Needed in order to use omlibdbi module
> Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
> ---
> DEVELOPERS | 1 +
> package/rsyslog/rsyslog.mk | 7 +++++++
> 2 files changed, 8 insertions(+)
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 1f26e9bc81..2f3eedf8a0 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1078,6 +1078,7 @@ F: package/python-pymodbus/
> N: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
> F: configs/asus_tinker-s_rk3288_defconfig
> F: board/asus/tinker-s/
> +F: package/rsyslog/
I've split the DEVELOPERS addition in a separate commit and applied to
next, thanks.
> N: Florian Fainelli <f.fainelli@gmail.com>
> F: package/cpulimit/
> diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
> index cf9f2c0e79..8ea92ea785 100644
> --- a/package/rsyslog/rsyslog.mk
> +++ b/package/rsyslog/rsyslog.mk
> @@ -151,6 +151,13 @@ RSYSLOG_CONF_OPTS += \
> --disable-omjournal
> endif
> +ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y)
> +RSYSLOG_CONF_OPTS += --enable-libdbi
> +RSYSLOG_DEPENDENCIES += libdbi-drivers
> +else
> +RSYSLOG_CONF_OPTS += --disable-libdbi
> +endif
> +
> define RSYSLOG_INSTALL_INIT_SYSTEMD
> $(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \
> $(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service
> --
> 2.43.0
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-02 8:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-29 11:02 [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0 Flávio Tapajós
2023-11-29 11:02 ` [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency Flávio Tapajós
2023-12-02 8:39 ` Peter Korsgaard
2023-12-02 8:38 ` [Buildroot] [PATCH 1/2] package/rsyslog: bump version to 8.2310.0 Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2023-11-28 13:43 Flávio Tapajós
2023-11-28 13:43 ` [Buildroot] [PATCH 2/2] package/rsyslog: add libdbi-drivers optional dependency Flávio Tapajós
2023-11-28 14:07 ` Baruch Siach via buildroot
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.