From cfe0084965acb4bf6dedcc8031ba230b684c6510 Mon Sep 17 00:00:00 2001 From: Gunnar Mills Date: Mon, 15 May 2017 15:40:58 -0500 Subject: Create a new package for the phosphor-image-updater Change-Id: I9a5b8977072c30d7c2c8a8402ca5bf627d8b79bd Signed-off-by: Gunnar Mills --- .../recipes-phosphor/flash/phosphor-software-manager.bb | 8 ++++++++ .../xyz.openbmc_project.Software.BMC.Updater.service | 13 +++++++++++++ .../xyz.openbmc_project.Software.Version.service | 1 - .../packagegroups/packagegroup-obmc-apps.bb | 1 + meta-phosphor/conf/distro/include/phosphor-defaults.inc | 8 +++++++- 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.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 7aa0cbc42..0092882fc 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SOFTWARE_MGR_PACKAGES = " \ ${PN}-version \ ${PN}-download-mgr \ + ${PN}-updater \ " PACKAGES =+ "${SOFTWARE_MGR_PACKAGES}" PACKAGES_remove = "${PN}" @@ -42,11 +43,18 @@ RDEPENDS_${PN}-download-mgr += " \ phosphor-dbus-interfaces \ sdbusplus \ " +RDEPENDS_${PN}-updater += " \ + phosphor-logging \ + phosphor-dbus-interfaces \ + sdbusplus \ +" FILES_${PN}-version += "${sbindir}/phosphor-version-software-manager" FILES_${PN}-download-mgr += "${sbindir}/phosphor-download-manager" +FILES_${PN}-updater += "${sbindir}/phosphor-image-updater" DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service" DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" +DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" SRCREV = "4e48fd582e86bd8246a5602dde4b5f644ae03d11" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service new file mode 100644 index 000000000..e43b005fd --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service @@ -0,0 +1,13 @@ +[Unit] +Description=OpenBMC Software Update Manager +Wants=xyz.openbmc_project.Software.Version.service +Before=xyz.openbmc_project.Software.Version.service + +[Service] +ExecStart={sbindir}/phosphor-image-updater +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 index 741f586ad..0825ebfa0 100644 --- 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 @@ -1,6 +1,5 @@ [Unit] Description=Phosphor Version Software Manager -Before=mapper-wait@-xyz-openbmc_project-software-version.service [Service] ExecStartPre=/bin/sh -c 'mkdir -p /tmp/images' diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 69f9a25f8..f570c060c 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -85,6 +85,7 @@ SUMMARY_${PN}-software = "Software applications" RDEPENDS_${PN}-software = " \ ${VIRTUAL-RUNTIME_obmc-bmc-code-mgr} \ ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ + ${VIRTUAL-RUNTIME_obmc-bmc-updater} \ " SUMMARY_${PN}-debug-collector = "BMC debug collector" RDEPENDS_${PN}-debug-collector = " \ diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 62ae25387..3dc3d3ce6 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -80,7 +80,7 @@ VIRTUAL-RUNTIME_obmc-leds-sysfs ?= "phosphor-led-sysfs" # obmc-bmc-code-mgr # -# Provides an implementation of the xyz.openbmc_project.Software.BMC.Version +# Provides an implementation of the xyz.openbmc_project.Software.Version # interface. VIRTUAL-RUNTIME_obmc-bmc-code-mgr ?= "phosphor-software-manager-version" @@ -90,6 +90,12 @@ VIRTUAL-RUNTIME_obmc-bmc-code-mgr ?= "phosphor-software-manager-version" # interface. VIRTUAL-RUNTIME_obmc-bmc-download-mgr ?= "phosphor-software-manager-download-mgr" +# obmc-bmc-updater +# +# Provides an implementation of the xyz.openbmc_project.Software.Activation +# interface. +VIRTUAL-RUNTIME_obmc-bmc-updater ?= "phosphor-software-manager-updater" + PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging" PREFERRED_PROVIDER_virtual/obmc-net-ipmi ?= "phosphor-ipmi-net" -- cgit v1.2.1