From fc81e38aed2df98ed8c83b3ce7970f6434765a41 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sat, 6 Apr 2019 13:58:07 -0400 Subject: 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 --- .../systemd/obmc-targets/obmc-chassis-hard-poweroff@.target | 4 ++-- .../systemd/obmc-targets/obmc-chassis-powered-off@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-host-reboot@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-host-reset@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-host-start@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-host-started@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-host-starting@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-host-startmin@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-host-stop@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-host-stopped@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-host-stopping@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-power-off@.target | 2 +- meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-power-start@.target | 2 +- .../recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target | 4 ++-- .../recipes-core/systemd/obmc-targets/obmc-power-stop@.target | 2 +- 24 files changed, 37 insertions(+), 37 deletions(-) (limited to 'meta-phosphor/recipes-core/systemd') diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target index 48fc44169..a033f6050 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Hard Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target index 84c1ddab1..c043f3744 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Powered Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target index 080d72456..69209e64a 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target index 55f6d919b..cd7c2fc49 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Power On) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target index 8d7c47e6b..03036f301 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target @@ -4,4 +4,4 @@ Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStop=yes [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target index 4f10419ab..900995b9f 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target @@ -1,6 +1,6 @@ [Unit] Description=Quiesce Target -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target RefuseManualStop=yes Conflicts=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target index dc280ea65..a01b94251 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target @@ -1,7 +1,7 @@ [Unit] Description=Reboot Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service Conflicts=obmc-host-startmin@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target index ca95d843c..84d870163 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target @@ -4,4 +4,4 @@ Conflicts=obmc-host-stop@%i.target RefuseManualStop=yes [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target index 4768a567f..012d364a1 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target @@ -1,6 +1,6 @@ [Unit] Description=Power%i Host Off -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target RefuseManualStop=yes OnFailure=obmc-chassis-poweroff@%i.target OnFailureJobMode=flush diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target index 2bc270c14..fe5514618 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Start Host%i (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target index 144b63387..790ef6af9 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target @@ -1,7 +1,7 @@ [Unit] Description=Start Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service Conflicts=obmc-host-stop@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target index eb0a9383b..fcd51be89 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Started) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-host-starting@%i.target Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target index 408139dd4..52e7bea83 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Starting) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-host-start-pre@%i.target Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target index 6e924adcd..fc93cdce4 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target @@ -1,7 +1,7 @@ [Unit] Description=Start Host%i Minimum -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service Conflicts=obmc-host-stop@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target index e88d3ea58..9fc3296b1 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Stop Host%i (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Before=obmc-host-stopping@%i.target Conflicts=obmc-host-startmin@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target index 8e99bccdb..d8f3cc938 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target @@ -1,7 +1,7 @@ [Unit] Description=Stop Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service After=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target index 74039fc25..c9689790b 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Stopped) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target Wants=obmc-host-stopping@%i.target After=obmc-host-stopping@%i.target Before=obmc-power-stop-pre@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target index f087dea72..41c4b7f95 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Stopping) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target Wants=obmc-host-stop-pre@%i.target After=obmc-host-stop-pre@%i.target Before=obmc-host-stopped@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target index c47b21e47..7fda29b1e 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target @@ -1,6 +1,6 @@ [Unit] Description=Power%i (Off) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-power-stop@%i.target Conflicts=obmc-chassis-poweron@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target index 52135ffc9..b55d90907 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target @@ -1,6 +1,6 @@ [Unit] Description=Power%i (On) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-power-start@%i.target Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target index 1a1ea6319..2b5fdbbd7 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Power%i On (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target index a977d5ad3..720548e2d 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target @@ -1,7 +1,7 @@ [Unit] Description=Power%i On After=obmc-power-start-pre@%i.target -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target index 50d5050bb..5460914b2 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Power%i Off (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=obmc-host-stopped@%i.target After=obmc-host-stopped@%i.target Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target index f0429d786..fc22eb1f3 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target @@ -2,7 +2,7 @@ Description=Power%i Off Wants=obmc-power-stop-pre@%i.target After=obmc-power-stop-pre@%i.target -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target Conflicts=obmc-chassis-poweron@%i.target Conflicts=fsi-disable.service RefuseManualStart=yes -- cgit v1.2.3