summaryrefslogtreecommitdiff
path: root/meta-hpe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-hpe')
-rw-r--r--meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service4
-rw-r--r--meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm.service (renamed from meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/start-ipkvm.service)0
-rw-r--r--meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend6
-rw-r--r--meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh1
-rw-r--r--meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh1
5 files changed, 7 insertions, 5 deletions
diff --git a/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service b/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service
index 2a44b9f481..411fbe9624 100644
--- a/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service
+++ b/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service
@@ -1,7 +1,7 @@
[Unit]
Description=GXP EHCI Owner Reset Service
-Wants=start-ipkvm.service
-After=start-ipkvm.service
+Wants=obmc-ikvm.service
+After=obmc-ikvm.service
StartLimitIntervalSec=0
[Service]
diff --git a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/start-ipkvm.service b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm.service
index f477507a62..f477507a62 100644
--- a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/start-ipkvm.service
+++ b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm.service
diff --git a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend
index 97d4ca39f0..bad9a92fd4 100644
--- a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend
+++ b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend
@@ -1,13 +1,13 @@
FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
-SRC_URI += " file://start-ipkvm.service "
+SRC_URI += " file://obmc-ikvm.service "
SRC_URI += " file://create_usbhid.sh "
FILES:${PN} += " \
- ${systemd_system_unitdir}/start-ipkvm.service \
+ ${systemd_system_unitdir}/obmc-ikvm.service \
${bindir}/create_usbhid.sh \
"
do_install:append () {
- install -D -m 0644 ${WORKDIR}/start-ipkvm.service ${D}${systemd_system_unitdir}
+ install -D -m 0644 ${WORKDIR}/obmc-ikvm.service ${D}${systemd_system_unitdir}
install -D -m 0755 ${WORKDIR}/create_usbhid.sh ${D}${bindir}
}
diff --git a/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh b/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh
index 3c1bb0fd3e..55dd0c73ca 100644
--- a/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh
+++ b/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC3061
dbus-monitor --system --profile "type='method_call',path='/xyz/openbmc_project/state/host0',interface='org.freedesktop.DBus.Properties',member='Set'" | awk '/xyz.openbmc_project.State.Host/ { print "DONE" }' | while read -r; do
/usr/bin/dl360Start.sh
done
diff --git a/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh b/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh
index c38c087588..99e4706a84 100644
--- a/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh
+++ b/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC3061
dbus-monitor --system --profile "type='method_call',path='/xyz/openbmc_project/state/host0',interface='org.freedesktop.DBus.Properties',member='Set'" | awk '/xyz.openbmc_project.State.Host/ { print "DONE" }' | while read -r ; do
/usr/bin/rl300Start.sh
done