diff options
Diffstat (limited to 'meta-facebook/recipes-phosphor')
15 files changed, 21 insertions, 24 deletions
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf index 80227cd2ab..596a35f98f 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf @@ -1,4 +1,3 @@ -local-tty = ttyS0 baud = 57600 console-id = host1 logfile = /var/log/obmc-console-host1.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf index 12380f9497..80cfea2e25 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf @@ -1,4 +1,3 @@ -local-tty = ttyS1 baud = 57600 console-id = host2 logfile = /var/log/obmc-console-host2.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf index 0e93cab8c6..827fe7999a 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf @@ -1,4 +1,3 @@ -local-tty = ttyS2 baud = 57600 console-id = host3 logfile = /var/log/obmc-console-host3.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf index 4eb9e8f6f6..36af7face5 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf @@ -1,4 +1,3 @@ -local-tty = ttyS3 baud = 57600 console-id = host4 logfile = /var/log/obmc-console-host4.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf index 9b838e8308..65885079bf 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf @@ -1,4 +1,3 @@ -local-tty = ttyS5 baud = 57600 console-id = host5 logfile = /var/log/obmc-console-host5.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf index 162bf7825d..122f66ba24 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf @@ -1,4 +1,3 @@ -local-tty = ttyS6 baud = 57600 console-id = host6 logfile = /var/log/obmc-console-host6.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf index 2b6474baf7..6dcf970550 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf @@ -1,4 +1,3 @@ -local-tty = ttyS7 baud = 57600 console-id = host7 logfile = /var/log/obmc-console-host7.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf index ea820710c9..bd6404d050 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf @@ -1,4 +1,3 @@ -local-tty = ttyS8 baud = 57600 console-id = host8 logfile = /var/log/obmc-console-host8.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf index 90891d45ab..f9326c8507 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf @@ -1,4 +1,3 @@ -local-tty = ttyS2 baud = 57600 console-id = host0 logfile = /var/log/obmc-console-host0.log diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend index 819903adb1..9b4364b92f 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -15,7 +15,6 @@ SRC_URI:append:fb-withhost = " file://obmc-chassis-hard-poweroff@.target \ PACKAGECONFIG:append = " json sensor-monitor" -EXTRA_OEMESON = "-Duse-host-power-state=enabled" RDEPENDS:${PN}-sensor-monitor = " bash" @@ -39,6 +38,7 @@ pkg_postinst:${PN}-sensor-monitor() { mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.requires mkdir -p $D/var/lib/phosphor-fan-presence +# It should be create by PSM, should we remove it? LINK="$D$systemd_system_unitdir/obmc-chassis-hard-poweroff@0.target.requires/obmc-chassis-poweroff@.target" TARGET="../obmc-chassis-poweroff@0.target" ln -s $TARGET $LINK @@ -48,5 +48,10 @@ pkg_postinst:${PN}-sensor-monitor() { ln -s $TARGET $LINK } +pkg_postinst:${PN}-sensor-monitor:harma() { + rm -f $D$systemd_system_unitdir/obmc-chassis-hard-poweroff@0.target.requires/obmc-chassis-poweroff@.target +} + + FILES:${PN}-sensor-monitor += "${libexecdir}/phosphor-fan-sensor-monitor/host-poweroff" FILES:${PN}-sensor-monitor += "${systemd_system_unitdir}" diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc index 84e4e40b40..375e36a765 100644 --- a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc +++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc @@ -18,8 +18,9 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ dbus-top \ jq \ strace \ - tmux \ tcpdump \ + tmux \ + usbutils \ wget \ " OBMC_IMAGE_EXTRA_INSTALL:append:mf-fb-secondary-emmc = " \ diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-defaults-native/fb_host_settings.override.yml b/meta-facebook/recipes-phosphor/settings/phosphor-settings-defaults-native/fb_host_settings.override.yml index 720f917918..b51b3267cc 100644 --- a/meta-facebook/recipes-phosphor/settings/phosphor-settings-defaults-native/fb_host_settings.override.yml +++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-defaults-native/fb_host_settings.override.yml @@ -4,4 +4,4 @@ PowerRestorePolicy: Default: RestorePolicy::Policy::AlwaysOn PowerRestoreDelay: - Default: 30000000 + Default: 300000000 diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service index 3a22e56b9c..9a1a9050d2 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service @@ -1,12 +1,12 @@ [Unit] Description=Power Cycle Host Server -Requires=host-gpio.service -After=host-gpio.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer + +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.Off" +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer ExecStart=sleep 6 -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.On" + SyslogIdentifier=phosphor-watchdog diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service index ddcb9dc626..bd2bd045e4 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service @@ -1,9 +1,9 @@ [Unit] Description=Shutdown Host Server -Requires=host-gpio.service -After=host-gpio.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off + +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.Off" + SyslogIdentifier=phosphor-watchdog diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service index f0f03a1cc9..5a46cc0100 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service @@ -1,10 +1,10 @@ [Unit] Description=Reset Host Server -Requires=host-gpio.service -After=host-gpio.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Reset -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer + +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.ForceWarmReboot" +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer + SyslogIdentifier=phosphor-watchdog |