diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-intel/chassis')
35 files changed, 4 insertions, 754 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb index 61dfce853..4b11782e8 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb @@ -1,14 +1,8 @@ SUMMARY = "Chassis Power Control service for Intel based platform" DESCRIPTION = "Chassis Power Control service for Intel based platfrom" -SRC_URI = "git://github.com/Intel-BMC/intel-chassis-control.git;protocol=ssh" -SRCREV = "7cbb2153afedf3b7d3fa7856f0a306138c4b4297" - -SRC_URI += "file://intel-wait-power-on.sh \ - file://intel-wait-power-off.sh \ - file://intel-wait-host-on.sh \ - file://intel-wait-host-off.sh \ - " +SRC_URI = "git://git@github.com/Intel-BMC/intel-chassis-control.git;protocol=ssh" +SRCREV = "d98b80a3ce937abe6282b7b9011b47e8b2f162be" S = "${WORKDIR}/git/services/chassis/" @@ -17,239 +11,19 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit cmake pkgconfig pythonnative -inherit obmc-phosphor-dbus-service - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power@.service" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Chassis@.service" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Buttons@.service" - -# Force the standby target to run these services -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" - -POWER_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Power@.service" -#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -POWER_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Power@{0}.service" -POWER_FMT_CTRL = "../${POWER_TMPL_CTRL}:${SYSD_TGT}.wants/${POWER_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWER_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -CHASSIS_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Chassis@.service" -#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -CHASSIS_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Chassis@{0}.service" -CHASSIS_FMT_CTRL = "../${CHASSIS_TMPL_CTRL}:${SYSD_TGT}.wants/${CHASSIS_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -BUTTONS_TMPL_CTRL = "xyz.openbmc_project.Chassis.Buttons@.service" -#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -BUTTONS_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Buttons@{0}.service" -BUTTONS_FMT_CTRL = "../${BUTTONS_TMPL_CTRL}:${SYSD_TGT}.wants/${BUTTONS_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'BUTTONS_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -SYSTEMD_SERVICE_${PN} += " \ - obmc-host-start@.target \ - obmc-host-startmin@.target \ - obmc-host-stop@.target \ - obmc-host-shutdown@.target \ - obmc-host-reboot@.target \ - obmc-chassis-poweroff@.target \ - obmc-chassis-poweron@.target \ - obmc-chassis-hard-poweroff@.target \ - obmc-host-soft-reboot@.target \ - obmc-host-warm-reset@.target \ - obmc-chassis-powerreset@.target \ - " - -RESET_TGTFMT = "obmc-chassis-powerreset@{0}.target" - -RESET_ON_TMPL = "op-reset-chassis-running@.service" -RESET_ON_INSTFMT = "op-reset-chassis-running@{0}.service" -RESET_ON_FMT = "../${RESET_ON_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${RESET_ON_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -RESET_ON_CHASSIS_TMPL = "op-reset-chassis-on@.service" -RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" -RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${RESET_ON_CHASSIS_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -# Force the standby target to run the chassis reset check target -RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" -SYSD_TGT = "${SYSTEMD_DEFAULT_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')}" - -START_TMPL = "intel-power-start@.service" -START_TGTFMT = "obmc-chassis-poweron@{0}.target" -START_INSTFMT = "intel-power-start@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${START_TMPL}" - -ON_TMPL = "intel-wait-power-on@.service" -ON_TGTFMT = "obmc-chassis-poweron@{0}.target" -ON_INSTFMT = "intel-wait-power-on@{0}.service" -ON_FMT = "../${ON_TMPL}:${ON_TGTFMT}.requires/${ON_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${ON_TMPL}" - -OFF_TMPL = "intel-wait-power-off@.service" -OFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" -OFF_INSTFMT = "intel-wait-power-off@{0}.service" -OFF_FMT = "../${OFF_TMPL}:${OFF_TGTFMT}.requires/${OFF_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${OFF_TMPL}" - -STOP_TMPL = "intel-power-stop@.service" -STOP_TGTFMT = "obmc-chassis-poweroff@{0}.target" -STOP_INSTFMT = "intel-power-stop@{0}.service" -STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${STOP_TMPL}" - -WARM_RESET_TMPL = "intel-power-warm-reset@.service" -WARM_RESET_TGTFMT = "obmc-host-warm-reset@{0}.target" -WARM_RESET_INSTFMT = "intel-power-warm-reset@{0}.service" -WARM_RESET_FMT = "../${WARM_RESET_TMPL}:${WARM_RESET_TGTFMT}.requires/${WARM_RESET_INSTFMT}" -WARM_RESET_LINK_FMT = "obmc-host-warm-reset@.target:${WARM_RESET_TGTFMT}" -SYSTEMD_SERVICE_${PN} += "${WARM_RESET_TMPL}" - -# Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WARM_RESET_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WARM_RESET_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ON_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'OFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +inherit cmake systemd -#The main control target requires these power targets -START_TMPL_CTRL = "obmc-chassis-poweron@.target" -START_TGTFMT_CTRL = "obmc-host-startmin@{0}.target" -START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" -START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -HOSTON_TMPL_CTRL = "intel-wait-host-on@.service" -START_TGTFMT_CTRL = "obmc-host-startmin@{0}.target" -HOSTON_INSTFMT_CTRL = "intel-wait-host-on@{0}.service" -HOSTON_FMT_CTRL = "../${HOSTON_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${HOSTON_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOSTON_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${HOSTON_TMPL_CTRL}" - -HOSTOFF_TMPL_CTRL = "intel-wait-host-off@.service" -HOSTSTOP_TGTFMT_CTRL = "obmc-host-stop@{0}.target" -HOSTOFF_INSTFMT_CTRL = "intel-wait-host-off@{0}.service" -HOSTOFF_FMT_CTRL = "../${HOSTOFF_TMPL_CTRL}:${HOSTSTOP_TGTFMT_CTRL}.requires/${HOSTOFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOSTOFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${HOSTOFF_TMPL_CTRL}" - -# Chassis off requires host off -STOP_TMPL_CTRL = "obmc-host-stop@.target" -STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -STOP_INSTFMT_CTRL = "obmc-host-stop@{0}.target" -STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Hard power off requires chassis off -HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" -HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" -HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Hard power off requires the forceoff flag service -FORCE_OFF_TMPL_CTRL = "intel-power-forceoff@.service" -HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" -FORCE_OFF_INSTFMT_CTRL = "intel-power-forceoff@{0}.service" -FORCE_OFF_FMT_CTRL = "../${FORCE_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${FORCE_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'FORCE_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${FORCE_OFF_TMPL_CTRL}" - -# Host soft reboot to run the shutdown target -HOST_SHUTDOWN_TMPL = "obmc-host-shutdown@.target" -HOST_SOFT_REBOOT_TMPL = "obmc-host-soft-reboot@.target" -HOST_SOFT_REBOOT_TGTFMT = "obmc-host-soft-reboot@{0}.target" -HOST_SHUTDOWN_INSTFMT = "obmc-host-shutdown@{0}.target" -HOST_SOFT_REBOOT_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SHUTDOWN_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_FMT', 'OBMC_HOST_INSTANCES')}" -# And also to call the host startmin service -HOST_SOFT_REBOOT_SVC = "phosphor-reboot-host@.service" -HOST_SOFT_REBOOT_SVC_INST = "phosphor-reboot-host@{0}.service" -HOST_SOFT_REBOOT_SVC_FMT = "../${HOST_SOFT_REBOOT_SVC}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SOFT_REBOOT_SVC_INST}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" - -#Broadcast Host state -PRE_HOST_START_TMPL = "obmc-send-signal-pre-host-start@.service" -PRE_HOST_START_TGTFMT = "obmc-host-start-pre@{0}.target" -PRE_HOST_START_INSTFMT = "obmc-send-signal-pre-host-start@{0}.service" -PRE_HOST_START_FMT = "../${PRE_HOST_START_TMPL}:${PRE_HOST_START_TGTFMT}.requires/${PRE_HOST_START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${PRE_HOST_START_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" - -POST_HOST_START_TMPL = "obmc-send-signal-post-host-start@.service" -POST_HOST_START_TGTFMT = "obmc-host-started@{0}.target" -POST_HOST_START_INSTFMT = "obmc-send-signal-post-host-start@{0}.service" -POST_HOST_START_FMT = "../${POST_HOST_START_TMPL}:${POST_HOST_START_TGTFMT}.requires/${POST_HOST_START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${POST_HOST_START_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" - -HOST_STARTING_TMPL = "obmc-send-signal-host-starting@.service" -HOST_STARTING_TGTFMT = "obmc-host-starting@{0}.target" -HOST_STARTING_INSTFMT = "obmc-send-signal-host-starting@{0}.service" -HOST_STARTING_FMT = "../${HOST_STARTING_TMPL}:${HOST_STARTING_TGTFMT}.requires/${HOST_STARTING_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${HOST_STARTING_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STARTING_FMT', 'OBMC_HOST_INSTANCES')}" - -PRE_HOST_STOP_TMPL = "obmc-send-signal-pre-host-stop@.service" -PRE_HOST_STOP_TGTFMT = "obmc-host-stop-pre@{0}.target" -PRE_HOST_STOP_INSTFMT = "obmc-send-signal-pre-host-stop@{0}.service" -PRE_HOST_STOP_FMT = "../${PRE_HOST_STOP_TMPL}:${PRE_HOST_STOP_TGTFMT}.requires/${PRE_HOST_STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${PRE_HOST_STOP_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}" - -POST_HOST_STOP_TMPL = "obmc-send-signal-post-host-stop@.service" -POST_HOST_STOP_TGTFMT = "obmc-host-stopped@{0}.target" -POST_HOST_STOP_INSTFMT = "obmc-send-signal-post-host-stop@{0}.service" -POST_HOST_STOP_FMT = "../${POST_HOST_STOP_TMPL}:${POST_HOST_STOP_TGTFMT}.requires/${POST_HOST_STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${POST_HOST_STOP_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}" - -HOST_STOPPING_TMPL = "obmc-send-signal-host-stopping@.service" -HOST_STOPPING_TGTFMT = "obmc-host-stopping@{0}.target" -HOST_STOPPING_INSTFMT = "obmc-send-signal-host-stopping@{0}.service" -HOST_STOPPING_FMT = "../${HOST_STOPPING_TMPL}:${HOST_STOPPING_TGTFMT}.requires/${HOST_STOPPING_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${HOST_STOPPING_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STOPPING_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service" DEPENDS += " \ - autoconf-archive-native \ boost \ i2c-tools \ libgpiod \ - systemd \ - sdbusplus \ - sdbusplus-native \ - phosphor-dbus-interfaces \ - phosphor-dbus-interfaces-native \ - phosphor-logging \ - " -RDEPENDS_${PN} += " \ - libsystemd \ sdbusplus \ - phosphor-dbus-interfaces \ phosphor-logging \ - bash \ " -EXTRA_OECMAKE = " -DENABLE_GTEST=OFF -DCMAKE_SKIP_RPATH=ON" - # linux-libc-headers guides this way to include custom uapi headers CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" do_configure[depends] += "virtual/kernel:do_shared_workdir" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/intel-wait-power-on.sh ${D}/${bindir}/intel-wait-power-on.sh - install -m 0755 ${WORKDIR}/intel-wait-power-off.sh ${D}/${bindir}/intel-wait-power-off.sh - install -m 0755 ${WORKDIR}/intel-wait-host-on.sh ${D}/${bindir}/intel-wait-host-on.sh - install -m 0755 ${WORKDIR}/intel-wait-host-off.sh ${D}/${bindir}/intel-wait-host-off.sh -} diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service deleted file mode 100644 index 54b9befa4..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Add force power offf flag for Power%i -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-host-start@%i.target - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "mkdir -p /run/openbmc && touch /run/openbmc/host@%i-request" -SyslogIdentifier=intel-power-forceoff -StartLimitInterval=0 - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service deleted file mode 100644 index 763c11546..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Start Power%i on -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \ - /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 1" -SyslogIdentifier=intel-power-start -StartLimitInterval=0 - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service deleted file mode 100644 index d0476e9b2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Stop Power%i -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-host-start@%i.target -ConditionPathExists=/run/openbmc/chassis@%i-on - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \ - /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 0" -SyslogIdentifier=intel-power-stop -StartLimitInterval=0 - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service deleted file mode 100644 index 8d4897a25..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Power%i warm reset -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweroff@%i.target - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \ - /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 2" -SyslogIdentifier=intel-power-warm-reset - -[Install] -WantedBy=obmc-host-warm-reset@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh deleted file mode 100755 index 983f1bc8d..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for vrd_good = OFF" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!OFF" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) -done -echo "vrd_good = OFF"
\ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service deleted file mode 100644 index eedfcc78a..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Wait for Host%i to turn off -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -#After=obmc-chassis-poweroff@%i.target -Before=intel-wait-power-off@%i.service -After=intel-power-stop@%i.service -Conflicts=obmc-chassis-poweron@%i.target -ConditionPathExists=/run/openbmc/host@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-host-off.sh -ExecStartPost=/bin/sh -c "rm -rf /run/openbmc/host@%i-on" - -SyslogIdentifier=intel-wait-host-off -TimeoutSec=30 - -[Install] -RequiredBy=obmc-host-stop@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh deleted file mode 100755 index 74f6bd47b..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for vrd_good = ON" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!ON" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) -done -echo "vrd_good = ON"
\ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service deleted file mode 100644 index a1fc316c2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Wait for Host%i to turn on -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=intel-wait-power-on@%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-host-on.sh -ExecStartPost=/bin/sh -c "mkdir -p /run/openbmc/ && touch /run/openbmc/host@%i-on" - -SyslogIdentifier=intel-wait-host-on -TimeoutSec=30 - -[Install] -RequiredBy=obmc-host-startmin@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh deleted file mode 100755 index be58682cc..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for pgood = OFF" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!OFF" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) -done -echo "pgood = OFF"
\ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service deleted file mode 100644 index 0dcc897ce..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Wait for Power%i to turn off -Before=obmc-power-off@%i.target -Wants=obmc-power-stop@%i.target -Before=obmc-power-stop@%i.target -Wants=obmc-power-stop-pre@%i.target -After=obmc-power-stop-pre@%i.target -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=intel-wait-host-off@%i.service -Conflicts=obmc-chassis-poweron@%i.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-power-off.sh -ExecStartPost=/bin/rm -f /run/openbmc/chassis@%i-on -ExecStartPost=/bin/rm -f /run/openbmc/host@%i-request -SyslogIdentifier=intel-wait-power-off -TimeoutSec=15 - -[Install] -WantedBy=obmc-host-stop@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh deleted file mode 100755 index 970e5a420..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for pgood = ON" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!ON" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) -done -echo "pgood = ON"
\ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service deleted file mode 100644 index 140ee5b8d..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Wait for Power%i to turn on -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=intel-power-start@%i.service -Before=intel-wait-host-on@%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-power-on.sh - -ExecStartPost=/bin/sh -c "mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on" - -SyslogIdentifier=intel-wait-power-on -TimeoutSec=15 - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target deleted file mode 100644 index 265a48982..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Chassis%i (Hard Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-reset@%i.target -Conflicts=obmc-host-shutdown@%i.target -RefuseManualStop=yes - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target deleted file mode 100644 index 34580a21f..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Chassis%i (Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-reset@%i.target -RefuseManualStop=yes - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target deleted file mode 100644 index e95e46353..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Chassis%i (Power On) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target deleted file mode 100644 index 8d7c47e6b..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Chassis%i (Reset Check) -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target deleted file mode 100644 index c860889e3..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Reboot Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target deleted file mode 100644 index 585886b26..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Power%i Host Off -Wants=multi-user.target -RefuseManualStop=yes -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target deleted file mode 100644 index c35c3e1ae..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Soft Reboot Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target deleted file mode 100644 index 2f8c24929..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Start Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-stop@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush
\ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target deleted file mode 100644 index 69056254a..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Start Host%i Minimum -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target deleted file mode 100644 index 625eda8ee..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Stop Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush
\ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target deleted file mode 100644 index 8fc9358e2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Warm reset Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-stop@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service deleted file mode 100644 index 4e84c8783..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast host starting signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.HostStarting" -SyslogIdentifier=hoststartingsignal - -[Install] -WantedBy=obmc-host-starting@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service deleted file mode 100644 index 0f89f94a8..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast host stopping signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.HostStoping" -SyslogIdentifier=hoststoppingsignal - -[Install] -WantedBy=obmc-host-stopping@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service deleted file mode 100644 index f7e0a3bde..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast post host start signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PostHostStart" -SyslogIdentifier=posthoststartsignal - -[Install] -WantedBy=obmc-host-started@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service deleted file mode 100644 index 90007dbf2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast post host stop signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PostHostStop" -SyslogIdentifier=posthoststopsignal - -[Install] -WantedBy=obmc-host-stopped@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service deleted file mode 100644 index a57423e2c..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast pre host start signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PreHostStart" -SyslogIdentifier=prehoststartsignal - -[Install] -WantedBy=obmc-host-start-pre@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service deleted file mode 100644 index ec6f453cd..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Broadcast pre host stop signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PreHostStop" -SyslogIdentifier=prehoststopsignal - -[Install] -WantedBy=obmc-host-stop-pre@%i.target - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service deleted file mode 100644 index d3ea71639..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Start chassis%i on after BMC reset -Requires=op-reset-chassis-running@%i.service -After=op-reset-chassis-running@%i.service -After=obmc-power-reset-on@%i.target -Requires=obmc-power-reset-on@%i.target -ConditionPathExists=/run/openbmc/chassis@%i-on - -[Service] -RemainAfterExit=no -ExecStart=/bin/systemctl start obmc-host-start@%i.target - - -[Install] -WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service deleted file mode 100644 index 3280d0a40..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Check Chassis%i pgood and create a file to indicate it -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Wants=obmc-power-reset-on@%i.target -Before=obmc-power-reset-on@%i.target -Conflicts=obmc-chassis-poweroff@%i.target - -[Service] -RemainAfterExit=no -Type=oneshot -ExecStart=/bin/sh -c "if [ $(busctl get-property `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power pgood | sed 's/i\s*[1]/on/' | grep on | wc -l) != 0 ]; then mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on; fi" - -[Install] -WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service deleted file mode 100644 index e1e3baedf..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Intel Buttons%i - -[Service] -Restart=always -RestartSec=3 -ExecStart=/usr/bin/env buttons -SyslogIdentifier=buttons -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service deleted file mode 100644 index 521cb17b4..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Intel Chassis%i Control - -[Service] -Restart=always -ExecStart=/usr/bin/env chassis-control -SyslogIdentifier=chassis-control -Type=dbus -BusName={BUSNAME} -Nice=19 -TimeoutStartSec=180s - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service deleted file mode 100644 index bf83a54e2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service +++ /dev/null @@ -1,17 +0,0 @@ - -[Unit] -Description=Intel Power Control%i -Wants=mapper-wait@-xyz-openbmc_project-control-gpio-Power_Good.service -After=mapper-wait@-xyz-openbmc_project-control-gpio-Power_Good.service - -[Service] -Restart=always -RestartSec=3 -ExecStart=/usr/bin/env power-control -SyslogIdentifier=power-control -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} - |