From fc81e38aed2df98ed8c83b3ce7970f6434765a41 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
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 <bradleyb@fuzziesquirrel.com>
---
 .../state/files/phosphor-discover-system-state@.service               | 2 +-
 .../state/files/xyz.openbmc_project.State.BMC.service                 | 2 +-
 .../state/files/xyz.openbmc_project.State.Chassis.service             | 2 +-
 .../state/files/xyz.openbmc_project.State.Host.service                | 2 +-
 meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'meta-phosphor/recipes-phosphor/state')

diff --git a/meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service
index f39803899..4a5e6a7e5 100644
--- a/meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service
@@ -16,4 +16,4 @@ ExecStart=/usr/bin/env phosphor-discover-system-state --host %i
 SyslogIdentifier=phosphor-discover-system-state
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
index 057af648d..de1da5add 100644
--- a/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
+++ b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
@@ -13,4 +13,4 @@ Type=dbus
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
index 259dd16af..1cab07fcf 100644
--- a/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
+++ b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
@@ -13,4 +13,4 @@ Type=dbus
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
index 26f523eaa..780f26071 100644
--- a/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
@@ -15,4 +15,4 @@ Type=dbus
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index 5408b4750..59c743a69 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -87,14 +87,14 @@ SYSTEMD_LINK_${PN}-reset-sensor-states += "${@compose_list_zip(d, 'SENSOR_RESET_
 
 # Force the standby target to run the host reset check target
 RESET_TMPL_CTRL = "obmc-host-reset@.target"
-SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+SYSD_TGT = "multi-user.target"
 RESET_INSTFMT_CTRL = "obmc-host-reset@{0}.target"
 RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}"
 SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_HOST_INSTANCES')}"
 
 TMPL = "phosphor-discover-system-state@.service"
 INSTFMT = "phosphor-discover-system-state@{0}.service"
-FMT = "../${TMPL}:${SYSTEMD_DEFAULT_TARGET}.wants/${INSTFMT}"
+FMT = "../${TMPL}:multi-user.target.wants/${INSTFMT}"
 SYSTEMD_LINK_${PN}-discover += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}"
 
 # Force the shutdown target to run the chassis-poweroff target
-- 
cgit v1.2.3