| commit | efb04a1963ee03f7db756cb33ae52f024ffda086 | [log] [tgz] |
|---|---|---|
| author | Josh D. King <jdking@us.ibm.com> | Thu Apr 06 15:56:37 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Thu Apr 20 15:43:45 2017 +0000 |
| tree | d7dc1bf3dddc378580651944e965b256240fe15b | |
| parent | b9ee536d0aae31718054ddad187a93d761d9dea2 [diff] |
Refactor action target names Host-start-stop The target change is: obmc-chassis-stop -> obmc-host-stop obmc-chassis-start -> obmc-host-start Removed CHASSIS_FMT and CHASSIS_LINK_FMT because they are no longer needed. CHASSIS_POWER_FMT_2 did not change because its used for obmc-chassis-reset. Deleted files obmc-chassis-start@.target and obmc-chassis-stop@.target because they are no longer needed. I moved over their contents to obmc-host-start and obmc-host-stop. Updated phosphor-state-manager.bb and skeleton-rev.bbclass to have correct commit id. Change-Id: I26cba4153038f39d60e8d450a05969a216848abe Signed-off-by: Josh D. King <jdking@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb index 03a63e5..bab0b63 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb
@@ -24,7 +24,7 @@ TMPL = "op-inventory-upload@.service" INSTFMT = "op-inventory-upload@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service index 39c1cfc..2da73e3 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service
@@ -2,7 +2,7 @@ Description=Inventory Upload Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Restart=no @@ -12,4 +12,4 @@ Environment="PYTHONUNBUFFERED=1" [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target