diff options
6 files changed, 33 insertions, 4 deletions
diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass index b5f6e2505..6f5cf20a4 100644 --- a/meta-phosphor/classes/mrw-rev.bbclass +++ b/meta-phosphor/classes/mrw-rev.bbclass @@ -1,4 +1,4 @@ -MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git;subpath=scripts" +MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git" MRW_API_SRCREV ?= "60c8e10cbb11768cd1ba394b35cb1d6627efec42" MRW_TOOLS_SRC_URI ?= "git://github.com/openbmc/phosphor-mrw-tools" diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 7260b0e3e..575767324 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -14,6 +14,7 @@ # - obmc-inventory - OpenBMC inventory support # - obmc-leds - OpenBMC LED support # - obmc-logging-mgmt - OpenBMC logging management +# - obmc-remote-logging-mgmt - OpenBMC remote logging management # - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management @@ -38,6 +39,7 @@ FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-host-state-mgmt FEATURE_PACKAGES_obmc-inventory ?= "packagegroup-obmc-apps-inventory" FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds" FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'packagegroup-obmc-apps-logging')}" +FEATURE_PACKAGES_obmc-remote-logging-mgmt ?= "packagegroup-obmc-apps-remote-logging" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" @@ -66,6 +68,7 @@ IMAGE_FEATURES += " \ obmc-inventory \ obmc-leds \ obmc-logging-mgmt \ + obmc-remote-logging-mgmt \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ 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 +} diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb index b08db6930..1d277cf2b 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb @@ -2,9 +2,9 @@ SUMMARY = "Phosphor OpenBMC machine readable workbook API modules" DESCRIPTION = "The API for the MRW XML generated by the Serverwiz tool" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d2794c0df5b907fdace235a619d80314" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" -S = "${WORKDIR}/scripts" +S = "${WORKDIR}/git" inherit native inherit perlnative @@ -18,5 +18,5 @@ SRCREV = "${MRW_API_SRCREV}" do_install() { install -d ${D}${PERLLIBDIRS_class-native}/perl/site_perl/${PERLVERSION}/mrw - install -m 0755 Targets.pm ${D}${PERLLIBDIRS_class-native}/perl/site_perl/${PERLVERSION}/mrw/Targets.pm + install -m 0755 scripts/Targets.pm ${D}${PERLLIBDIRS_class-native}/perl/site_perl/${PERLVERSION}/mrw/Targets.pm } diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 1a178a998..d6537f54f 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -15,6 +15,7 @@ PACKAGES = " \ ${PN}-inventory \ ${PN}-leds \ ${PN}-logging \ + ${PN}-remote-logging \ ${PN}-sensors \ ${PN}-software \ ${PN}-host-check-mgmt \ @@ -83,7 +84,12 @@ RDEPENDS_${PN}-leds = " \ SUMMARY_${PN}-logging = "Logging applications" RDEPENDS_${PN}-logging = " \ phosphor-logging \ + " + +SUMMARY_${PN}-remote-logging = "Remote logging applications" +RDEPENDS_${PN}-remote-logging = " \ rsyslog \ + rsyslog-policy \ phosphor-rsyslog-config \ " |
