* [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options
@ 2016-12-20 0:05 James Knight
2016-12-20 0:05 ` [Buildroot] [PATCH 2/2] rsyslog: enable journal plugins when using systemd James Knight
2016-12-20 9:10 ` [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: James Knight @ 2016-12-20 0:05 UTC (permalink / raw)
To: buildroot
The configuration flags `--enable-systemd` and `--disable-systemd` do
not exist in rsyslog (and may have never existed; most likely copy-paste
from other packages which have said options); removing the options.
Signed-off-by: James Knight <james.knight@rockwellcollins.com>
---
package/rsyslog/rsyslog.mk | 3 ---
1 file changed, 3 deletions(-)
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index a0875b7..9e74e49 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -66,11 +66,8 @@ endif
ifeq ($(BR2_INIT_SYSTEMD),y)
RSYSLOG_CONF_OPTS += \
- --enable-systemd \
--with-systemdsystemunitdir=/usr/lib/systemd/system
RSYSLOG_DEPENDENCIES += systemd
-else
-RSYSLOG_CONF_OPTS += --disable-systemd
endif
define RSYSLOG_INSTALL_INIT_SYSV
--
2.8.4.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] rsyslog: enable journal plugins when using systemd
2016-12-20 0:05 [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options James Knight
@ 2016-12-20 0:05 ` James Knight
2016-12-20 9:10 ` Peter Korsgaard
2016-12-20 9:10 ` [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: James Knight @ 2016-12-20 0:05 UTC (permalink / raw)
To: buildroot
The rsyslog package provides input and output plugins for journald which
are disabled by default. The following adds the option to include
`imjournal` and `omjournal` modules when building for a systemd target.
Signed-off-by: James Knight <james.knight@rockwellcollins.com>
---
package/rsyslog/rsyslog.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 9e74e49..3254d99 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -66,8 +66,14 @@ endif
ifeq ($(BR2_INIT_SYSTEMD),y)
RSYSLOG_CONF_OPTS += \
+ --enable-imjournal \
+ --enable-omjournal \
--with-systemdsystemunitdir=/usr/lib/systemd/system
RSYSLOG_DEPENDENCIES += systemd
+else
+RSYSLOG_CONF_OPTS += \
+ --disable-imjournal \
+ --disable-omjournal
endif
define RSYSLOG_INSTALL_INIT_SYSV
--
2.8.4.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options
2016-12-20 0:05 [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options James Knight
2016-12-20 0:05 ` [Buildroot] [PATCH 2/2] rsyslog: enable journal plugins when using systemd James Knight
@ 2016-12-20 9:10 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2016-12-20 9:10 UTC (permalink / raw)
To: buildroot
>>>>> "James" == James Knight <james.knight@rockwellcollins.com> writes:
> The configuration flags `--enable-systemd` and `--disable-systemd` do
> not exist in rsyslog (and may have never existed; most likely copy-paste
> from other packages which have said options); removing the options.
> Signed-off-by: James Knight <james.knight@rockwellcollins.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] rsyslog: enable journal plugins when using systemd
2016-12-20 0:05 ` [Buildroot] [PATCH 2/2] rsyslog: enable journal plugins when using systemd James Knight
@ 2016-12-20 9:10 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2016-12-20 9:10 UTC (permalink / raw)
To: buildroot
>>>>> "James" == James Knight <james.knight@rockwellcollins.com> writes:
> The rsyslog package provides input and output plugins for journald which
> are disabled by default. The following adds the option to include
> `imjournal` and `omjournal` modules when building for a systemd target.
> Signed-off-by: James Knight <james.knight@rockwellcollins.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-12-20 9:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-20 0:05 [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options James Knight
2016-12-20 0:05 ` [Buildroot] [PATCH 2/2] rsyslog: enable journal plugins when using systemd James Knight
2016-12-20 9:10 ` Peter Korsgaard
2016-12-20 9:10 ` [Buildroot] [PATCH 1/2] rsyslog: remove non-existent enable/disable systemd options Peter Korsgaard
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.