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 --- .../recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf | 4 ++-- .../leds/phosphor-led-manager/obmc-fru-fault-monitor.service | 2 +- .../phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service | 2 +- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/leds') diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf index a300f6ace..d382d377d 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf @@ -1,3 +1,3 @@ [Unit] -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service index 4810a7e86..6b5c7b948 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service @@ -9,4 +9,4 @@ ExecStart=/usr/bin/env phosphor-fru-fault-monitor SyslogIdentifier=phosphor-fru-fault-monitor [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service index 2f9a25e91..8e852a4f8 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.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/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 3b3ac827a..8689e06c0 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -38,7 +38,7 @@ DBUS_SERVICE_${PN}-ledmanager += "xyz.openbmc_project.LED.GroupManager.service" SYSTEMD_SERVICE_${PN}-ledmanager += "obmc-led-group-start@.service obmc-led-group-stop@.service" SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:${SYSTEMD_DEFAULT_TARGET}.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" STATES = "start stop" TMPLFMT = "obmc-led-group-{0}@.service" -- cgit v1.2.3