diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 13:58:07 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 14:11:45 -0400 |
| commit | fc81e38aed2df98ed8c83b3ce7970f6434765a41 (patch) | |
| tree | 0ed58adcb31a230146652e2d2e37f14f5906b333 /meta-phosphor/recipes-phosphor/chassis | |
| parent | 9d8e46dcee0a07bc206e8980c7d9df0027935121 (diff) | |
| download | talos-openbmc-fc81e38aed2df98ed8c83b3ce7970f6434765a41.tar.gz talos-openbmc-fc81e38aed2df98ed8c83b3ce7970f6434765a41.zip | |
update upstream subtrees
A number of corequisites exist so squashing these all into one patch.
meta-ingrasys - refresh master bc513127f4..67bcaf389f
meta-hxt - refresh master 86a4df514f..8fe0d38bbb
meta-phosphor - refresh master 06c09d7cce..df6ddae3d2
meta-quanta - refresh master 4f126361a1..53f3025271
Change-Id: I3daeef2a0467d8ea4f1fd1c617e526f8b11258af
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/chassis')
6 files changed, 6 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service index e981dc06d..2ca9fe327 100644 --- a/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service +++ b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service @@ -7,4 +7,4 @@ ExecStart=/usr/bin/env obmc-phosphor-chassisd SyslogIdentifier=obmc-phosphor-chassisd [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service index 76acd19a1..cfda54a02 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service @@ -11,4 +11,4 @@ Environment="PYTHONUNBUFFERED=1" TimeoutStartSec=180s [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service index 88769c77a..26345ee5f 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service @@ -10,4 +10,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service index 784df407b..416fddc13 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service @@ -10,4 +10,4 @@ SyslogIdentifier=sync_inventory_items.py RemainAfterExit=yes [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service index 9903e6e26..21494ca5d 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service @@ -10,4 +10,4 @@ Type=dbus BusName={BUSNAME} [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index ab2a18e60..8bae112ae 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -90,7 +90,7 @@ SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" +SYSD_TGT = "multi-user.target" RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" |
