From 84646262fb039aa0ed4384bcf2c10506e9b37819 Mon Sep 17 00:00:00 2001 From: Gunnar Mills Date: Wed, 22 Feb 2017 11:41:12 -0600 Subject: BUSNAME fix for Phosphor Version Software Manager We use type=dbus and BUSNAME in the Phosphor Version Software Manager .service file. Renamed the .service file to match the correct BUS name. Fixes openbmc/openbmc#1179 Change-Id: I63ddb805c2b85672e6e28fd5321e65727695d66f Signed-off-by: Gunnar Mills --- .../recipes-phosphor/flash/phosphor-software-manager.bb | 2 +- .../xyz.openbmc_project.Software.BMC.Version.service | 12 ++++++++++++ .../xyz.openbmc_project.Software.Version.service | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service delete mode 100644 meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb index d0c9b5e62..f1d0756e9 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -27,7 +27,7 @@ DEPENDS += "phosphor-dbus-interfaces" RDEPENDS_${PN}-version += "phosphor-dbus-interfaces sdbusplus" FILES_${PN}-version = "${sbindir}/phosphor-version-software-manager" -DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service" +DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.BMC.Version.service" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" SRCREV = "af4759e828690e51035c9d11c2a6845d9bb38406" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service new file mode 100644 index 000000000..6ed6c7fc3 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor Version Software Manager +Before=mapper-wait@-xyz-openbmc_project-software-version.service + +[Service] +ExecStart={sbindir}/phosphor-version-software-manager +Restart=always +Type=dbus +BusName={BUSNAME} + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service deleted file mode 100644 index 6ed6c7fc3..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Version Software Manager -Before=mapper-wait@-xyz-openbmc_project-software-version.service - -[Service] -ExecStart={sbindir}/phosphor-version-software-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} -- cgit v1.2.1