diff options
author | Deepak Kodihalli <dkodihal@in.ibm.com> | 2018-08-21 14:40:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-07 00:02:29 +0300 |
commit | f9e9cc6f6fb1d1c953cdd84389d930d4bc037613 (patch) | |
tree | 4142e7d25ba199425b7b1a94e684f512ce4d6205 | |
parent | 20b50ef352f967c123bee77475cb35022a40897c (diff) | |
download | openbmc-f9e9cc6f6fb1d1c953cdd84389d930d4bc037613.tar.xz |
Pull rsyslog into image
The intent is to use rsyslog for streaming journal logs off of the BMC.
Since this is the only intent (i.e at the moment there's no requirement
to employ rsyslog for local logging), modify rsyslog.conf accordingly.
(From meta-phosphor rev: a549e7540ede46686c5011ac2f7209704643a2d6)
Change-Id: I01d7dbd648da82536085f7586efcd7f1c7dd8ae0
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
4 files changed, 22 insertions, 0 deletions
diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-phosphor/recipes-extended/rsyslog/rsyslog/rsyslog.conf new file mode 100644 index 0000000000..40b3f294f2 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -0,0 +1,3 @@ +$ModLoad imuxsock + +$IncludeConfig /etc/rsyslog.d/server.conf diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf new file mode 100644 index 0000000000..5c8161b29a --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf @@ -0,0 +1,2 @@ +# Remote Logging (we use TCP for reliable delivery) +#*.* @@remote-host:port diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend new file mode 100644 index 0000000000..0a2fb33343 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -0,0 +1,16 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://rsyslog.conf \ + file://server.conf \ +" + +PACKAGECONFIG ??= " \ + rsyslogd rsyslogrt inet regexp uuid \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +do_install_append(){ + install -m 0644 -D ${WORKDIR}/server.conf \ + ${D}${sysconfdir}/rsyslog.d/server.conf +} diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 5c184babf6..e3e62884f3 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -83,6 +83,7 @@ RDEPENDS_${PN}-leds = " \ SUMMARY_${PN}-logging = "Logging applications" RDEPENDS_${PN}-logging = " \ phosphor-logging \ + rsyslog \ " SUMMARY_${PN}-sensors = "Sensor applications" |