From 44fd5e0d3b755984a19d45122453c546988f5a4f Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Thu, 4 Apr 2019 13:06:43 -0700 Subject: meta-ibm: move all services to multi-user.target Instead of obmc-standby.target, use multi-user.target. (From meta-ibm rev: 85cff8cc9e66049d8ac26271c13f82d894ac572f) Change-Id: I03c3d41c031343fa584511889c70e3def92cb83d Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service | 2 +- meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend | 2 +- meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb | 2 +- .../recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend | 2 +- .../recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service | 2 +- meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend | 2 +- .../recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 2 +- .../recipes-phosphor/network/network/ncsi-netlink.service | 2 +- .../witherspoon-power-supply-monitor@.service | 2 +- .../recipes-phosphor/power/witherspoon-pfault-analysis_git.bb | 2 +- .../meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service index 7452b9182..e72d33af9 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service @@ -10,4 +10,4 @@ ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} SyslogIdentifier=phosphor-cooling-type [Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} +RequiredBy=multi-user.target diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend index 86ed1d4a2..e388748c3 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -9,7 +9,7 @@ PACKAGECONFIG += "cooling-type" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" -COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}" +COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb index 90513b4d1..cd2bab996 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb @@ -23,7 +23,7 @@ ID_BUTTON_SERVICE = "id_button" TMPL = "phosphor-gpio-monitor@.service" INSTFMT = "phosphor-gpio-monitor@{0}.service" -TGT = "${SYSTEMD_DEFAULT_TARGET}" +TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "id-button-pressed.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend index c1d50e6ff..0165929a6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend @@ -9,7 +9,7 @@ ENV_FILES = "obmc/sync_inventory_item/{0}" SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENV_FILES', 'ITEMS')}" TMPL = "obmc-sync-inventory-item@.service" -TGT = "${SYSTEMD_DEFAULT_TARGET}" +TGT = "multi-user.target" ETH_SVC = "system-chassis-motherboard-bmc-ethernet.service" UUID_SVC = "system-chassis-motherboard-uuid.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service index 9086efb77..c1f5ae293 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service @@ -12,4 +12,4 @@ ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${ SyslogIdentifier=phosphor-cooling-type [Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} +RequiredBy=multi-user.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend index c70cbc8a3..7467d36ec 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -9,7 +9,7 @@ PACKAGECONFIG += "cooling-type" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" -COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}" +COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index b60a64b10..0fa11050b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" -POWERSUPPLY_TGT = "${SYSTEMD_DEFAULT_TARGET}" +POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" SYSTEMD_LINK_${PN}-presence += "${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service index f49114dcb..44b34195e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service @@ -10,4 +10,4 @@ SyslogIdentifier=ncsi-netlink Type=oneshot [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service index ba4e368e4..56e2d218a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service @@ -12,4 +12,4 @@ ExecStart=/usr/bin/env witherspoon-psu-monitor --path=${{DEVPATH}} --instance=${ SyslogIdentifier=witherspoon-psu-monitor [Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} +RequiredBy=multi-user.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb index 7f55ecf35..c50765795 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb @@ -32,7 +32,7 @@ SYSTEMD_LINK_${PN} += "${SEQ_MONITOR_FMT} ${SEQ_PGOOD_FMT}" PSU_MONITOR_TMPL = "witherspoon-power-supply-monitor@.service" PSU_MONITOR_INSTFMT = "witherspoon-power-supply-monitor@{0}.service" -PSU_MONITOR_TGT = "${SYSTEMD_DEFAULT_TARGET}" +PSU_MONITOR_TGT = "multi-user.target" PSU_MONITOR_FMT = "../${PSU_MONITOR_TMPL}:${PSU_MONITOR_TGT}.requires/${PSU_MONITOR_INSTFMT}" FILES_witherspoon-psu-monitor = "${sbindir}/witherspoon-psu-monitor" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c10e4aa27..e9ddccd97 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -34,7 +34,7 @@ SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_ITEMS')}" SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_OCCITEMS')}" SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/wspoon.conf" -SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:${SYSTEMD_DEFAULT_TARGET}.wants/phosphor-max31785-msl@wspoon.service" +SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@wspoon.service" SYSTEMD_SERVICE_${PN} += "max31785-hwmon-helper@.service" -- cgit v1.2.1