* [Buildroot] [PATCH 0/2] Add RELP plugin to rsyslog
@ 2020-09-21 16:58 David GOUARIN
2020-09-21 16:58 ` [Buildroot] [PATCH 1/2] packages/librelp: new package David GOUARIN
2020-09-21 16:58 ` [Buildroot] [PATCH 2/2] packages/rsyslog: add support for RELP David GOUARIN
0 siblings, 2 replies; 5+ messages in thread
From: David GOUARIN @ 2020-09-21 16:58 UTC (permalink / raw)
To: buildroot
In the form of an option in order not to draw too much dependencies for those who prefer to keep it lightweight.
David GOUARIN (2):
packages/librelp: new package.
packages/rsyslog: add support for RELP
package/Config.in | 1 +
package/librelp/Config.in | 10 ++++++++++
package/librelp/librelp.hash | 6 ++++++
package/librelp/librelp.mk | 14 ++++++++++++++
package/rsyslog/Config.in | 7 +++++++
package/rsyslog/rsyslog.mk | 6 ++++++
6 files changed, 44 insertions(+)
create mode 100644 package/librelp/Config.in
create mode 100644 package/librelp/librelp.hash
create mode 100644 package/librelp/librelp.mk
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] packages/librelp: new package.
2020-09-21 16:58 [Buildroot] [PATCH 0/2] Add RELP plugin to rsyslog David GOUARIN
@ 2020-09-21 16:58 ` David GOUARIN
2020-09-23 20:17 ` Thomas Petazzoni
2020-09-21 16:58 ` [Buildroot] [PATCH 2/2] packages/rsyslog: add support for RELP David GOUARIN
1 sibling, 1 reply; 5+ messages in thread
From: David GOUARIN @ 2020-09-21 16:58 UTC (permalink / raw)
To: buildroot
Reliable Logging Protocol library.
Signed-off-by: David GOUARIN <dgouarin@gmail.com>
---
package/Config.in | 1 +
package/librelp/Config.in | 10 ++++++++++
package/librelp/librelp.hash | 6 ++++++
package/librelp/librelp.mk | 14 ++++++++++++++
4 files changed, 31 insertions(+)
create mode 100644 package/librelp/Config.in
create mode 100644 package/librelp/librelp.hash
create mode 100644 package/librelp/librelp.mk
diff --git a/package/Config.in b/package/Config.in
index 0282a2069f..5c1001cf7f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1806,6 +1806,7 @@ menu "Networking"
source "package/zeromq/Config.in"
source "package/zmqpp/Config.in"
source "package/zyre/Config.in"
+ source "package/librelp/Config.in"
endmenu
menu "Other"
diff --git a/package/librelp/Config.in b/package/librelp/Config.in
new file mode 100644
index 0000000000..3bfe466bfa
--- /dev/null
+++ b/package/librelp/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBRELP
+ bool "librelp"
+ select BR2_PACKAGE_GNUTLS
+ # dependencies of gnutls
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_USE_WCHAR
+ help
+ Reliable Event Logging Protocol library
+
+ https://www.rsyslog.com/librelp/
diff --git a/package/librelp/librelp.hash b/package/librelp/librelp.hash
new file mode 100644
index 0000000000..b188b2bd22
--- /dev/null
+++ b/package/librelp/librelp.hash
@@ -0,0 +1,6 @@
+# From http://download.rsyslog.com/librelp/librelp-1.2.16.tar.gz
+sha256 0c235dd2a01060ad5e64438879b31ae64e7640d0e262aa1a287a2dd9bc60fd53 librelp-1.2.16.tar.gz
+
+# Hash for license file:
+sha256 1ed76f935566e93e3c3c0d9f8fad22eb6d8bbe406e2eb8470a4a2764d9fd9685 COPYING
+
diff --git a/package/librelp/librelp.mk b/package/librelp/librelp.mk
new file mode 100644
index 0000000000..6265a627cb
--- /dev/null
+++ b/package/librelp/librelp.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# librelp
+#
+################################################################################
+
+LIBRELP_VERSION = 1.2.16
+LIBRELP_SITE = http://download.rsyslog.com/librelp/librelp-1.2.16.tar.gz
+LIBRELP_LICENSE = GPL-3.0
+LIBRELP_LICENSE_FILES = COPYING
+LIBRELP_INSTALL_STAGING = YES
+LIBRELP_DEPENDENCIES = gnutls
+
+$(eval $(autotools-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] packages/rsyslog: add support for RELP
2020-09-21 16:58 [Buildroot] [PATCH 0/2] Add RELP plugin to rsyslog David GOUARIN
2020-09-21 16:58 ` [Buildroot] [PATCH 1/2] packages/librelp: new package David GOUARIN
@ 2020-09-21 16:58 ` David GOUARIN
2020-09-23 20:19 ` Thomas Petazzoni
1 sibling, 1 reply; 5+ messages in thread
From: David GOUARIN @ 2020-09-21 16:58 UTC (permalink / raw)
To: buildroot
Signed-off-by: David GOUARIN <dgouarin@gmail.com>
---
package/rsyslog/Config.in | 7 +++++++
package/rsyslog/rsyslog.mk | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 8c024e69c7..286de804e3 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -17,6 +17,13 @@ config BR2_PACKAGE_RSYSLOG
http://www.rsyslog.com
+config BR2_PACKAGE_RSYSLOG_RELP
+ bool "enable support for relp logging protocol"
+ depends on BR2_PACKAGE_RSYSLOG
+ select BR2_PACKAGE_LIBRELP
+ help
+ Enable relp rsyslog plugin.
+
comment "rsyslog needs a uClibc or glibc 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 90f21559f8..0d95ee6f36 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -14,6 +14,12 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \
mail omprog omruleset omstdout omuxsock \
pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare
+
+ifeq ($(BR2_PACKAGE_RSYSLOG_RELP),y)
+RSYSLOG_DEPENDENCIES += librelp
+RSYSLOG_PLUGINS += relp
+endif
+
RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] packages/librelp: new package.
2020-09-21 16:58 ` [Buildroot] [PATCH 1/2] packages/librelp: new package David GOUARIN
@ 2020-09-23 20:17 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2020-09-23 20:17 UTC (permalink / raw)
To: buildroot
Hello David,
Thanks for this contribution! I applied it, but after a number of
changes. See below.
On Mon, 21 Sep 2020 18:58:33 +0200
David GOUARIN <dgouarin@gmail.com> wrote:
> Reliable Logging Protocol library.
>
> Signed-off-by: David GOUARIN <dgouarin@gmail.com>
> ---
> package/Config.in | 1 +
> package/librelp/Config.in | 10 ++++++++++
> package/librelp/librelp.hash | 6 ++++++
> package/librelp/librelp.mk | 14 ++++++++++++++
> 4 files changed, 31 insertions(+)
You hard forgotten to add an entry in the DEVELOPERS file, so I've done
so.
> create mode 100644 package/librelp/Config.in
> create mode 100644 package/librelp/librelp.hash
> create mode 100644 package/librelp/librelp.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 0282a2069f..5c1001cf7f 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1806,6 +1806,7 @@ menu "Networking"
> source "package/zeromq/Config.in"
> source "package/zmqpp/Config.in"
> source "package/zyre/Config.in"
> + source "package/librelp/Config.in"
This broke the alphabetic ordering.
> diff --git a/package/librelp/Config.in b/package/librelp/Config.in
> new file mode 100644
> index 0000000000..3bfe466bfa
> --- /dev/null
> +++ b/package/librelp/Config.in
> @@ -0,0 +1,10 @@
> +config BR2_PACKAGE_LIBRELP
> + bool "librelp"
> + select BR2_PACKAGE_GNUTLS
gnutls is not at all a mandatory dependency of librelp. So I made it
optional, and dropped the depends on !BR2_STATIC_LIBS and BR2_USE_WCHAR.
> diff --git a/package/librelp/librelp.mk b/package/librelp/librelp.mk
> new file mode 100644
> index 0000000000..6265a627cb
> --- /dev/null
> +++ b/package/librelp/librelp.mk
> @@ -0,0 +1,14 @@
> +################################################################################
> +#
> +# librelp
> +#
> +################################################################################
> +
> +LIBRELP_VERSION = 1.2.16
I updated to 1.2.18
> +LIBRELP_SITE = http://download.rsyslog.com/librelp/librelp-1.2.16.tar.gz
This shouldn't be the full URL, but just the directory containing the
tarball.
> +LIBRELP_LICENSE = GPL-3.0
License is GPL-3.0+
> +LIBRELP_LICENSE_FILES = COPYING
> +LIBRELP_INSTALL_STAGING = YES
> +LIBRELP_DEPENDENCIES = gnutls
So I changed that to:
ifeq ($(BR2_PACKAGE_GNUTLS),y)
LIBRELP_DEPENDENCIES += gnutls host-pkgconf
LIBRELP_CONF_OPTS += --enable-tls
else
LIBRELP_CONF_OPTS += --disable-tls
endif
And applied with all those changes. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] packages/rsyslog: add support for RELP
2020-09-21 16:58 ` [Buildroot] [PATCH 2/2] packages/rsyslog: add support for RELP David GOUARIN
@ 2020-09-23 20:19 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2020-09-23 20:19 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 21 Sep 2020 18:58:34 +0200
David GOUARIN <dgouarin@gmail.com> wrote:
> +config BR2_PACKAGE_RSYSLOG_RELP
> + bool "enable support for relp logging protocol"
> + depends on BR2_PACKAGE_RSYSLOG
> + select BR2_PACKAGE_LIBRELP
> + help
> + Enable relp rsyslog plugin.
I dropped this option entirely.
> +ifeq ($(BR2_PACKAGE_RSYSLOG_RELP),y)
And simply made this based on the following condition:
ifeq ($(BR2_PACKAGE_LIBRELP),y)
> +RSYSLOG_DEPENDENCIES += librelp
> +RSYSLOG_PLUGINS += relp
> +endif
And I've applied with those changes. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-23 20:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-21 16:58 [Buildroot] [PATCH 0/2] Add RELP plugin to rsyslog David GOUARIN
2020-09-21 16:58 ` [Buildroot] [PATCH 1/2] packages/librelp: new package David GOUARIN
2020-09-23 20:17 ` Thomas Petazzoni
2020-09-21 16:58 ` [Buildroot] [PATCH 2/2] packages/rsyslog: add support for RELP David GOUARIN
2020-09-23 20:19 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox