| commit | 48628b41ffc216b87ae000b23a1bba0a81df1594 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Wed Aug 02 01:32:43 2017 -0400 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Thu Aug 24 11:31:19 2017 +0000 |
| tree | 551b7e6f73da5061c6bf4a6ef982d66cf8f165d6 | |
| parent | 26f8fbfaeee1e7e7a0a057594b3e7b1c5dbb89d1 [diff] |
Add mslverify package Add a new package from the phosphor-dbus-monitor project for the msl-verify application. msl-verify is not installed by default - machine implementations must add it to an image manually and configure when it is run. Change-Id: If1f9eeb4e72e7ef9be4bb900b641906fe3bb2a58 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend index 85c2843..1214492 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl" +OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify"
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb index d9a9c66..6aac1b5 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
@@ -15,6 +15,10 @@ phosphor-dbus-monitor \ obmc-phosphor-systemd +PACKAGE_BEFORE_PN = "phosphor-msl-verify" +SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify" +SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service" + DEPENDS += " \ ${PN}-config-native \ phosphor-logging \ @@ -27,6 +31,13 @@ phosphor-logging \ " +RDEPENDS_phosphor-msl-verify += " \ + sdbusplus \ + phosphor-dbus-interfaces \ + phosphor-logging \ + " +FILES_phosphor-msl-verify = "${sbindir}/phosphor-msl-verify" + S = "${WORKDIR}/git" EXTRA_OECONF = " \
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service new file mode 100644 index 0000000..2ef0740 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
@@ -0,0 +1,9 @@ +[Unit] +Description=Phosphor MSL Verification +After=mapper-wait@-xyz-openbmc_project-inventory.service +Wants=mapper-wait@-xyz-openbmc_project-inventory.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart={sbindir}/phosphor-msl-verify