summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2017-12-01 16:43:24 -0600
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-01-18 15:27:29 +0000
commit485fbbf83979d38203fee2e120d04d725749162b (patch)
tree35563a97bb762e7b168e1523860fff69f3dde902
parentd86d4f244f753a6ab9b5783eb3f783f943f0fa2f (diff)
downloadtalos-openbmc-485fbbf83979d38203fee2e120d04d725749162b.tar.gz
talos-openbmc-485fbbf83979d38203fee2e120d04d725749162b.zip
Software.BMC.Updater: Add dependency to op-vpd-parser
The BMC updater service searches for the BMC inventory object to create a version association. The BMC object is created by the op-vpd-parser, so waiting for this service ensures that the BMC object is present when the BMC updater service starts. Add this dependency via a systemd override since the op-vpd-parser is an openpower package. Witherspoon is the only system that currently includes this package. Resolves openbmc/openbmc#2698 Resolves openbmc/openbmc#2494 Change-Id: I869ec8717a6bf22a1f0da19167eb0f186c05014e Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager.bbappend4
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf3
2 files changed, 7 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager.bbappend
new file mode 100644
index 000000000..c1799f127
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SYSTEMD_OVERRIDE_${PN}-updater += \
+ "software-bmc-updater.conf:xyz.openbmc_project.Software.BMC.Updater.service.d/software-bmc-updater.conf"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf
new file mode 100644
index 000000000..587476244
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/phosphor-software-manager/software-bmc-updater.conf
@@ -0,0 +1,3 @@
+[Unit]
+Wants=op-vpd-parser.service
+After=op-vpd-parser.service
OpenPOWER on IntegriCloud