From 3e264b0f9ef78d60e27aef09724f131000dbd29b Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Wed, 22 May 2019 07:37:24 -0500 Subject: rsyslogd: Install default server config This reverts commit 37bc1a3568f2e87987be05243627a984dc051de1. In addition, it changes the default rsyslog server config to ignore all messages. Also bumps up phosphor-logging: phosphor-logging: srcrev bump f59854e94b..0a0b5ea558 Santosh Puranik (1): rsyslod: Change disable action Tested: Verified that the default rsyslog behavior is to now ignore all messages. (From meta-phosphor rev: 138108a05f68ada8b990024bbaa8b68b135d6aeb) Signed-off-by: Santosh Puranik Change-Id: Iba11dfa153eaeef17417c82ab26f9a26fe5f9125 Signed-off-by: Brad Bishop --- meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf | 3 --- meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf | 1 + meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend | 6 ++++++ meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 - 5 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf create mode 100644 meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf deleted file mode 100644 index 458f52f274..0000000000 --- a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -# This file exists only if remote logging has been configured -ConditionPathExists=/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..cf47ba3060 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf @@ -0,0 +1 @@ +*.* ~ diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend index 3901844ae5..0a2fb33343 100644 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -2,9 +2,15 @@ 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/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 89d71ae3c9..f710ed087f 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -53,7 +53,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "f59854e94b077630200117b390c4e943d588be31" +SRCREV = "0a0b5ea558adeb109a3ac52e55ad720e188adb90" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index c783d00ce0..238ee293e3 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -92,7 +92,6 @@ RDEPENDS_${PN}-logging = " \ SUMMARY_${PN}-remote-logging = "Remote logging applications" RDEPENDS_${PN}-remote-logging = " \ rsyslog \ - rsyslog-policy \ phosphor-rsyslog-config \ " -- cgit v1.2.3