diff options
Diffstat (limited to 'meta-phosphor')
4 files changed, 3 insertions, 9 deletions
diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf index d5084b11c..faeeae0c4 100644 --- a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf +++ b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf @@ -2,3 +2,5 @@ # This service is restarted when an rsyslog property is set, so # disable rate limiting to allow it to always be restarted. StartLimitIntervalSec=0 +# 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 deleted file mode 100644 index 5c8161b29..000000000 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf +++ /dev/null @@ -1,2 +0,0 @@ -# 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 index 0a2fb3334..3901844ae 100644 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -2,15 +2,9 @@ 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 3ac04e062..0eaf3998e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "3f9cb09427ddb0d4e885db2f81da65b724e0285e" +SRCREV = "e165ea956c5557c2b470869d252c80744227b00f" S = "${WORKDIR}/git" |