* [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig
@ 2021-01-22 15:43 Joachim Wiberg
2021-01-22 15:43 ` [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 Joachim Wiberg
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Joachim Wiberg @ 2021-01-22 15:43 UTC (permalink / raw)
To: buildroot
Hi!
This series bumps sysklogd to the latest version, fixes an issue with
fetching from GitHub (release tarballs exist), and finally adds some
menuconfig options enabling the native logger tool and controlling
the back-off time for unreachable remote syslog servers.
Cheers
/Joachim
Joachim Wiberg (3):
package/sysklogd: bump to verson 2.2.0
package/sysklogd: add menuconfig support for enabling native logger
package/sysklogd: menuconfig support for remote syslog retry delay
...RCE_required_for_O_CLOEXEC_on_uClibc.patch | 44 -------------------
package/sysklogd/Config.in | 30 +++++++++++++
package/sysklogd/sysklogd.hash | 2 +-
package/sysklogd/sysklogd.mk | 12 ++---
package/sysklogd/syslogd.service | 3 +-
5 files changed, 40 insertions(+), 51 deletions(-)
delete mode 100644 package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch
--
2.25.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 2021-01-22 15:43 [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Joachim Wiberg @ 2021-01-22 15:43 ` Joachim Wiberg 2021-01-24 9:36 ` Yann E. MORIN 2021-01-22 15:43 ` [Buildroot] [PATCH 2/3] package/sysklogd: add menuconfig support for enabling native logger Joachim Wiberg ` (2 subsequent siblings) 3 siblings, 1 reply; 10+ messages in thread From: Joachim Wiberg @ 2021-01-22 15:43 UTC (permalink / raw) To: buildroot - Prefer maintainer provided package, not GitHub generated archive - Local backport of O_CLOEXEC patch not needed anymore, in v2.2.0 - Install to /usr, with config in /etc and logs in /var - Update systemd unit file - New daemon path, /usr/sbin - Add support for /etc/default/syslogd, same as SysV init script Signed-off-by: Joachim Wiberg <troglobit@gmail.com> --- ...RCE_required_for_O_CLOEXEC_on_uClibc.patch | 44 ------------------- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 8 ++-- package/sysklogd/syslogd.service | 3 +- 4 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch diff --git a/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch b/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch deleted file mode 100644 index 684b6b3e4c..0000000000 --- a/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 93117e58016de6f604e67263b5135adbba032367 Mon Sep 17 00:00:00 2001 -From: Joachim Wiberg <troglobit@gmail.com> -Date: Sun, 30 Aug 2020 11:41:45 +0200 -Subject: [PATCH] Define _GNU_SOURCE, required for O_CLOEXEC on uClibc - -When building sysklogd on a uClibc system we must define _GNU_SOURCE to -get O_CLOEXEC. - -Since _GNU_SOURCE is also required for asprintf() with GLIBC, as used by -the pidfile() replacement function, we drop it from there and rely on -AM_CPPFLAGS for all sources. - -Signed-off-by: Joachim Wiberg <troglobit@gmail.com> -Signed-off-by: Andreas Hilse <andreas.hilse@googlemail.com> ---- - lib/pidfile.c | 1 - - src/Makefile.am | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/pidfile.c b/lib/pidfile.c -index a26de73..886a29c 100644 ---- a/lib/pidfile.c -+++ b/lib/pidfile.c -@@ -31,7 +31,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ - #include <sys/stat.h> /* utimensat() */ - #include <sys/time.h> /* utimensat() on *BSD */ - #include <sys/types.h> -diff --git a/src/Makefile.am b/src/Makefile.am -index 9b80a02..1909ada 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -36,7 +36,7 @@ endif - AM_CFLAGS = -W -Wall -Wextra - AM_CFLAGS += -Wno-unused-result -Wno-unused-parameter -fno-strict-aliasing - AM_CPPFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DRUNSTATEDIR=\"@runstatedir@\" --AM_CPPFLAGS += -D_BSD_SOURCE -D_DEFAULT_SOURCE -+AM_CPPFLAGS += -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE - - syslogd_SOURCES = syslogd.c syslogd.h socket.c socket.h syslog.h - syslogd_SOURCES += timer.c timer.h queue.h compat.h diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 978a670d30..91550aa0dc 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 09fe1edca882a9ae976cdbf516786edc1629347b9507d45dc005d9d969f94702 sysklogd-2.1.2.tar.gz +sha256 60546ae50a9f30b31c19ed9a3ad788ce5798025b0f9a0d552c1a04d5eeac494d sysklogd-2.2.0.tar.gz sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 200738897d..fc54ab6936 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,14 +4,12 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.1.2 -SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) +SYSKLOGD_VERSION = 2.2.0 +SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE SYSKLOGD_CPE_ID_VALID = YES -# From git -SYSKLOGD_AUTORECONF = YES -SYSKLOGD_CONF_OPTS = --exec-prefix=/ --without-logger +SYSKLOGD_CONF_OPTS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ diff --git a/package/sysklogd/syslogd.service b/package/sysklogd/syslogd.service index 1bf1bb3bd9..0e14369596 100644 --- a/package/sysklogd/syslogd.service +++ b/package/sysklogd/syslogd.service @@ -3,7 +3,8 @@ Description=System Logging Service Requires=syslog.socket [Service] -ExecStart=/sbin/syslogd -m 0 -F +EnvironmentFile=-/etc/default/syslogd +ExecStart=/usr/sbin/syslogd -m 0 -F $SYSLOGD_ARGS StandardOutput=null Restart=on-failure -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 2021-01-22 15:43 ` [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 Joachim Wiberg @ 2021-01-24 9:36 ` Yann E. MORIN 2021-01-24 15:22 ` Joachim Wiberg 0 siblings, 1 reply; 10+ messages in thread From: Yann E. MORIN @ 2021-01-24 9:36 UTC (permalink / raw) To: buildroot Joachim, All, On 2021-01-22 16:43 +0100, Joachim Wiberg spake thusly: > - Prefer maintainer provided package, not GitHub generated archive > - Local backport of O_CLOEXEC patch not needed anymore, in v2.2.0 > - Install to /usr, with config in /etc and logs in /var > - Update systemd unit file > - New daemon path, /usr/sbin > - Add support for /etc/default/syslogd, same as SysV init script This patch does four different things; 1. bumps the version, switching to maintainer's archive 2. removes the --without-logger configure option 3. changes the ./configure options for prefix et al. (more on that later) 4. extends the systemd service unit to include the environment This should have been four patches. However, as already discussed in a review for mrouted, the --prefix, --sysconfdir, and --localstatedir are already the value passed by the autotools-package infra, so aer not needed. But wy do you want to switch the logger from / to /usr ? See commit 33642d8d959 (package/sysklogd: fix installation path of the daemons), where the installation path was changed: 1. to match the paths tht are used in the init scripts 2. to match the location where busybox would install its applet So your patch breaks that, because it does not update the two init scripts, and will let busybox install its applet in /sbin. Granted, there should have been a comment above the _CONF_OPTS line to explain that was intentional. Finally, why is the --without-logger option removed entirely in this patch, when your patch 2 makes it a configurable option? I've applied the version bump and the systemd stuff as two separate patches, and dropped the rest. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Joachim Wiberg <troglobit@gmail.com> > --- > ...RCE_required_for_O_CLOEXEC_on_uClibc.patch | 44 ------------------- > package/sysklogd/sysklogd.hash | 2 +- > package/sysklogd/sysklogd.mk | 8 ++-- > package/sysklogd/syslogd.service | 3 +- > 4 files changed, 6 insertions(+), 51 deletions(-) > delete mode 100644 package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch > > diff --git a/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch b/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch > deleted file mode 100644 > index 684b6b3e4c..0000000000 > --- a/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 93117e58016de6f604e67263b5135adbba032367 Mon Sep 17 00:00:00 2001 > -From: Joachim Wiberg <troglobit@gmail.com> > -Date: Sun, 30 Aug 2020 11:41:45 +0200 > -Subject: [PATCH] Define _GNU_SOURCE, required for O_CLOEXEC on uClibc > - > -When building sysklogd on a uClibc system we must define _GNU_SOURCE to > -get O_CLOEXEC. > - > -Since _GNU_SOURCE is also required for asprintf() with GLIBC, as used by > -the pidfile() replacement function, we drop it from there and rely on > -AM_CPPFLAGS for all sources. > - > -Signed-off-by: Joachim Wiberg <troglobit@gmail.com> > -Signed-off-by: Andreas Hilse <andreas.hilse@googlemail.com> > ---- > - lib/pidfile.c | 1 - > - src/Makefile.am | 2 +- > - 2 files changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/lib/pidfile.c b/lib/pidfile.c > -index a26de73..886a29c 100644 > ---- a/lib/pidfile.c > -+++ b/lib/pidfile.c > -@@ -31,7 +31,6 @@ > - * POSSIBILITY OF SUCH DAMAGE. > - */ > - > --#define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ > - #include <sys/stat.h> /* utimensat() */ > - #include <sys/time.h> /* utimensat() on *BSD */ > - #include <sys/types.h> > -diff --git a/src/Makefile.am b/src/Makefile.am > -index 9b80a02..1909ada 100644 > ---- a/src/Makefile.am > -+++ b/src/Makefile.am > -@@ -36,7 +36,7 @@ endif > - AM_CFLAGS = -W -Wall -Wextra > - AM_CFLAGS += -Wno-unused-result -Wno-unused-parameter -fno-strict-aliasing > - AM_CPPFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DRUNSTATEDIR=\"@runstatedir@\" > --AM_CPPFLAGS += -D_BSD_SOURCE -D_DEFAULT_SOURCE > -+AM_CPPFLAGS += -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE > - > - syslogd_SOURCES = syslogd.c syslogd.h socket.c socket.h syslog.h > - syslogd_SOURCES += timer.c timer.h queue.h compat.h > diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash > index 978a670d30..91550aa0dc 100644 > --- a/package/sysklogd/sysklogd.hash > +++ b/package/sysklogd/sysklogd.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 09fe1edca882a9ae976cdbf516786edc1629347b9507d45dc005d9d969f94702 sysklogd-2.1.2.tar.gz > +sha256 60546ae50a9f30b31c19ed9a3ad788ce5798025b0f9a0d552c1a04d5eeac494d sysklogd-2.2.0.tar.gz > sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE > diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk > index 200738897d..fc54ab6936 100644 > --- a/package/sysklogd/sysklogd.mk > +++ b/package/sysklogd/sysklogd.mk > @@ -4,14 +4,12 @@ > # > ################################################################################ > > -SYSKLOGD_VERSION = 2.1.2 > -SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) > +SYSKLOGD_VERSION = 2.2.0 > +SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) > SYSKLOGD_LICENSE = BSD-3-Clause > SYSKLOGD_LICENSE_FILES = LICENSE > SYSKLOGD_CPE_ID_VALID = YES > -# From git > -SYSKLOGD_AUTORECONF = YES > -SYSKLOGD_CONF_OPTS = --exec-prefix=/ --without-logger > +SYSKLOGD_CONF_OPTS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var > > define SYSKLOGD_INSTALL_SAMPLE_CONFIG > $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ > diff --git a/package/sysklogd/syslogd.service b/package/sysklogd/syslogd.service > index 1bf1bb3bd9..0e14369596 100644 > --- a/package/sysklogd/syslogd.service > +++ b/package/sysklogd/syslogd.service > @@ -3,7 +3,8 @@ Description=System Logging Service > Requires=syslog.socket > > [Service] > -ExecStart=/sbin/syslogd -m 0 -F > +EnvironmentFile=-/etc/default/syslogd > +ExecStart=/usr/sbin/syslogd -m 0 -F $SYSLOGD_ARGS > StandardOutput=null > Restart=on-failure > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 2021-01-24 9:36 ` Yann E. MORIN @ 2021-01-24 15:22 ` Joachim Wiberg 2021-01-24 15:28 ` Yann E. MORIN 0 siblings, 1 reply; 10+ messages in thread From: Joachim Wiberg @ 2021-01-24 15:22 UTC (permalink / raw) To: buildroot Hi Yann, On Sun, Jan 24, 2021 at 10:36, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > On 2021-01-22 16:43 +0100, Joachim Wiberg spake thusly: > This patch does four different things; > 1. bumps the version, switching to maintainer's archive > 2. removes the --without-logger configure option > 3. changes the ./configure options for prefix et al. (more on that later) > 4. extends the systemd service unit to include the environment > This should have been four patches. Aha, splitting it up even furhter makes sense, thank you! > However, as already discussed in a review for mrouted, the --prefix, > --sysconfdir, and --localstatedir are already the value passed by the > autotools-package infra, so aer not needed. But wy do you want to switch > the logger from / to /usr ? Possibly I got confused by /sbin vs /usr/sbin for system daemons/tools, in particular with BR2_ROOTFS_MERGED_USR. I went about it backwards and thought it applied to all non-BusyBox tools. Sorry about that. I realize now that I was completely wrong and for tools/daemons that replece functionality that BusyBox provides the package must install each tool and daemon to the BusyBox path. I apologize for the confusion and head scratching this has caused! > See commit 33642d8d959 (package/sysklogd: fix installation path of the > daemons), where the installation path was changed: > 1. to match the paths tht are used in the init scripts > 2. to match the location where busybox would install its applet > So your patch breaks that, because it does not update the two init > scripts, and will let busybox install its applet in /sbin. I see, for past sysklogd that worked. Now we provide the logger tool as well, and --exec-prefix=/ changes to /bin/logger and /sbin/syslogd. Since BusyBox logger is in /usr/bin, I believe we need to change the SYSKLOGD_CONF_OPTS to use --bindir and --sbindir instead. I'll post another patch shortly. > Granted, there should have been a comment above the _CONF_OPTS line to > explain that was intentional. I understand. Thank yhou for explaining. > Finally, why is the --without-logger option removed entirely in this > patch, when your patch 2 makes it a configurable option? Yes, that was sloppy. > I've applied the version bump and the systemd stuff as two separate > patches, and dropped the rest. It looks great! Best regards /Joachim ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 2021-01-24 15:22 ` Joachim Wiberg @ 2021-01-24 15:28 ` Yann E. MORIN 2021-01-24 15:51 ` Joachim Wiberg 0 siblings, 1 reply; 10+ messages in thread From: Yann E. MORIN @ 2021-01-24 15:28 UTC (permalink / raw) To: buildroot Joachim, All On 2021-01-24 16:22 +0100, Joachim Wiberg spake thusly: > I apologize for the confusion and head scratching this has caused! No need for an apology ;-) > I see, for past sysklogd that worked. Now we provide the logger tool > as well, and --exec-prefix=/ changes to /bin/logger and /sbin/syslogd. > Since BusyBox logger is in /usr/bin, Ah, this is the kind of explanations that should go in a commit message! Indeed, a commit message that just describes the changes is not very helpful. What is important in a commit message is to explain what the problem is and why the change fixes it. > I believe we need to change the > SYSKLOGD_CONF_OPTS to use --bindir and --sbindir instead. > I'll post another patch shortly. 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 2021-01-24 15:28 ` Yann E. MORIN @ 2021-01-24 15:51 ` Joachim Wiberg 0 siblings, 0 replies; 10+ messages in thread From: Joachim Wiberg @ 2021-01-24 15:51 UTC (permalink / raw) To: buildroot Hi Yann! On Sun, Jan 24, 2021 at 16:28, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > On 2021-01-24 16:22 +0100, Joachim Wiberg spake thusly: >> I apologize for the confusion and head scratching this has caused! > No need for an apology ;-) You're too kind :) >> I see, for past sysklogd that worked. Now we provide the logger tool >> as well, and --exec-prefix=/ changes to /bin/logger and /sbin/syslogd. >> Since BusyBox logger is in /usr/bin, > Ah, this is the kind of explanations that should go in a commit message! Yup > Indeed, a commit message that just describes the changes is not very > helpful. What is important in a commit message is to explain what the > problem is and why the change fixes it. This is exactly what I'm preaching to our junior devs (sometimes on a daily basis) at $DAYJOB. So it's a painful realization that when push comes to shove, I'm no better myself LOL :-) Best regards /Joachim ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/3] package/sysklogd: add menuconfig support for enabling native logger 2021-01-22 15:43 [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Joachim Wiberg 2021-01-22 15:43 ` [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 Joachim Wiberg @ 2021-01-22 15:43 ` Joachim Wiberg 2021-01-22 15:43 ` [Buildroot] [PATCH 3/3] package/sysklogd: menuconfig support for remote syslog retry delay Joachim Wiberg 2021-01-24 9:40 ` [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Yann E. MORIN 3 siblings, 0 replies; 10+ messages in thread From: Joachim Wiberg @ 2021-01-22 15:43 UTC (permalink / raw) To: buildroot Installs to /usr/bin and thus replaces the BusyBox logger if enabled. Signed-off-by: Joachim Wiberg <troglobit@gmail.com> --- package/sysklogd/Config.in | 17 +++++++++++++++++ package/sysklogd/sysklogd.mk | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index 90649caa83..52bed0cc18 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -13,7 +13,24 @@ config BR2_PACKAGE_SYSKLOGD https://github.com/troglobit/sysklogd/ +if BR2_PACKAGE_SYSKLOGD + +config BR2_PACKAGE_SYSKLOGD_LOGGER + bool "logger tool" + help + Generate log messages from scripts or from the command line. + + This version of logger is receommended for use with sysklogd. + It makes use of the new syslogp() API for RFC5424 style logs, + e.g. MSGID, strucutred data (SD), etc. + + The BusyBox, or util-linux, logger tools can also be used, but + are limited to RFC3164 style messages. + +endif + comment "sysklogd needs a toolchain w/ threads" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index fc54ab6936..235219c4fc 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -11,6 +11,10 @@ SYSKLOGD_LICENSE_FILES = LICENSE SYSKLOGD_CPE_ID_VALID = YES SYSKLOGD_CONF_OPTS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var +# Disable/Enable utilities +SYSKLOGD_CONF_OPTS += \ + $(if $(BR2_PACKAGE_SYSKLOGD_LOGGER),--with-logger,--without-logger) + define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ $(TARGET_DIR)/etc/syslog.conf -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/3] package/sysklogd: menuconfig support for remote syslog retry delay 2021-01-22 15:43 [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Joachim Wiberg 2021-01-22 15:43 ` [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 Joachim Wiberg 2021-01-22 15:43 ` [Buildroot] [PATCH 2/3] package/sysklogd: add menuconfig support for enabling native logger Joachim Wiberg @ 2021-01-22 15:43 ` Joachim Wiberg 2021-01-24 9:40 ` [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Yann E. MORIN 3 siblings, 0 replies; 10+ messages in thread From: Joachim Wiberg @ 2021-01-22 15:43 UTC (permalink / raw) To: buildroot Signed-off-by: Joachim Wiberg <troglobit@gmail.com> --- package/sysklogd/Config.in | 13 +++++++++++++ package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index 52bed0cc18..91db7b348c 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -15,6 +15,19 @@ config BR2_PACKAGE_SYSKLOGD if BR2_PACKAGE_SYSKLOGD +config BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY + int "Retry delay (sec)" + default "180" + help + Retry delay (seconds) for sending to remote syslog servers. + + When set up to forward logs to a remote syslog server, the + network may not always be available. E.g., default interface + down, or no route to the remote server. This setting controls + the back-off time before retrying. + + Default: 180 seconds + config BR2_PACKAGE_SYSKLOGD_LOGGER bool "logger tool" help diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 235219c4fc..3dbf886361 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -12,7 +12,7 @@ SYSKLOGD_CPE_ID_VALID = YES SYSKLOGD_CONF_OPTS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var # Disable/Enable utilities -SYSKLOGD_CONF_OPTS += \ +SYSKLOGD_CONF_OPTS += --with-suspend-time=$(BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY) \ $(if $(BR2_PACKAGE_SYSKLOGD_LOGGER),--with-logger,--without-logger) define SYSKLOGD_INSTALL_SAMPLE_CONFIG -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig 2021-01-22 15:43 [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Joachim Wiberg ` (2 preceding siblings ...) 2021-01-22 15:43 ` [Buildroot] [PATCH 3/3] package/sysklogd: menuconfig support for remote syslog retry delay Joachim Wiberg @ 2021-01-24 9:40 ` Yann E. MORIN 2021-01-24 15:25 ` Joachim Wiberg 3 siblings, 1 reply; 10+ messages in thread From: Yann E. MORIN @ 2021-01-24 9:40 UTC (permalink / raw) To: buildroot Joachim, All, On 2021-01-22 16:43 +0100, Joachim Wiberg spake thusly: > Hi! > > This series bumps sysklogd to the latest version, fixes an issue with > fetching from GitHub (release tarballs exist), and finally adds some > menuconfig options enabling the native logger tool and controlling > the back-off time for unreachable remote syslog servers. > > Cheers > /Joachim > > Joachim Wiberg (3): > package/sysklogd: bump to verson 2.2.0 > package/sysklogd: add menuconfig support for enabling native logger > package/sysklogd: menuconfig support for remote syslog retry delay All three patches applied to master, thanks. Please review my comments and rework on patch 1. I also slightly reworked patch 2 to use the more traditional ifew-else-endif block rather than the $(if) construct. Thanks! Regards, Yann E. MORIN. > ...RCE_required_for_O_CLOEXEC_on_uClibc.patch | 44 ------------------- > package/sysklogd/Config.in | 30 +++++++++++++ > package/sysklogd/sysklogd.hash | 2 +- > package/sysklogd/sysklogd.mk | 12 ++--- > package/sysklogd/syslogd.service | 3 +- > 5 files changed, 40 insertions(+), 51 deletions(-) > delete mode 100644 package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig 2021-01-24 9:40 ` [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Yann E. MORIN @ 2021-01-24 15:25 ` Joachim Wiberg 0 siblings, 0 replies; 10+ messages in thread From: Joachim Wiberg @ 2021-01-24 15:25 UTC (permalink / raw) To: buildroot On Sun, Jan 24, 2021 at 10:40, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > On 2021-01-22 16:43 +0100, Joachim Wiberg spake thusly: >> package/sysklogd: bump to verson 2.2.0 >> package/sysklogd: add menuconfig support for enabling native logger >> package/sysklogd: menuconfig support for remote syslog retry delay > All three patches applied to master, thanks. > Please review my comments and rework on patch 1. I also slightly > reworked patch 2 to use the more traditional ifew-else-endif block > rather than the $(if) construct. Looks good, much better with your rework. Only issue, as I mentioned in the previous thread, is the install path for the logger tool, which I'm posting another patch for. Thank you! :) Regards /Joachim ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-01-24 15:51 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-01-22 15:43 [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Joachim Wiberg 2021-01-22 15:43 ` [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 Joachim Wiberg 2021-01-24 9:36 ` Yann E. MORIN 2021-01-24 15:22 ` Joachim Wiberg 2021-01-24 15:28 ` Yann E. MORIN 2021-01-24 15:51 ` Joachim Wiberg 2021-01-22 15:43 ` [Buildroot] [PATCH 2/3] package/sysklogd: add menuconfig support for enabling native logger Joachim Wiberg 2021-01-22 15:43 ` [Buildroot] [PATCH 3/3] package/sysklogd: menuconfig support for remote syslog retry delay Joachim Wiberg 2021-01-24 9:40 ` [Buildroot] [PATCH 0/3] package/sysklogd: version bump, some fixes, and more menuconfig Yann E. MORIN 2021-01-24 15:25 ` Joachim Wiberg
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.