diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-08-02 08:32:43 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-24 14:31:19 +0300 |
| commit | 48628b41ffc216b87ae000b23a1bba0a81df1594 (patch) | |
| tree | 551b7e6f73da5061c6bf4a6ef982d66cf8f165d6 | |
| parent | 26f8fbfaeee1e7e7a0a057594b3e7b1c5dbb89d1 (diff) | |
| download | openbmc-48628b41ffc216b87ae000b23a1bba0a81df1594.tar.xz | |
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>
3 files changed, 21 insertions, 1 deletions
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 85c284372..12144922a 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 d9a9c6678..6aac1b584 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 @@ inherit autotools \ 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 @@ RDEPENDS_${PN} += " \ 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 000000000..2ef074077 --- /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 |