meta-phosphor: master refresh c9d91120a2..1795f38b6f

Update meta-phosphor to master HEAD.

Adriana Kobylak (2):
      rsyslog-policy: Add rsyslog-override.conf
      Move remote logging features to their own category

Brad Bishop (2):
      phosphor: rsyslog: remove obmc-phosphor-license
      phosphor: mrw-api: fetch all of serverwiz

Change-Id: Ic342bda5d19272b2806f65c7082189d4a79c69d8
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

2 files changed, 20 insertions, 0 deletions

diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf
new file mode 100644
index 000000000..d5084b11c
--- /dev/null
+++ b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf
@@ -0,0 +1,4 @@
+[Unit]
+# This service is restarted when an rsyslog property is set, so
+# disable rate limiting to allow it to always be restarted.
+StartLimitIntervalSec=0
diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog-policy.bb b/meta-phosphor/recipes-extended/rsyslog/rsyslog-policy.bb
new file mode 100644
index 000000000..96eee0796
--- /dev/null
+++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog-policy.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Policy configuration for rsyslog"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+DEPENDS += "rsyslog"
+
+FILES_${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf"
+
+SRC_URI += "file://rsyslog-override.conf"
+
+do_install() {
+    install -d ${D}${systemd_system_unitdir}/rsyslog.service.d
+    install -m 0644 ${WORKDIR}/rsyslog-override.conf \
+        ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf
+}