diff options
Diffstat (limited to 'meta-facebook/recipes-fb')
4 files changed, 50 insertions, 49 deletions
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util index 30fa34cc8..d00dfde7f 100755 --- a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util @@ -1,83 +1,83 @@ #!/bin/bash # Usage of this utility function usage() { - echo "usage: power-util mb [on|off|status|cycle|reset]"; - echo " power-util sled-cycle" + echo "usage: power-util mb [on|off|status|cycle|reset]"; + echo " power-util sled-cycle" } power_off() { - echo "Shutting down Server $2" - 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 + echo "Shutting down Server" + 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 } power_on() { - echo "Powering on Server $2" - 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 + echo "Powering on Server" + 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 } power_status() { - st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) - if [ "$st" == "On\"" ]; then - echo "on" - else - echo "off" - fi + st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) + if [ "$st" == "On\"" ]; then + echo "on" + else + echo "off" + fi } power_reset() { - echo "Reset on server $2" - 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 + echo "Reset on server" + 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 } sled_cycle() { - i2cset -y 7 0x45 0xd9 c + i2cset -y 7 0x45 0xd9 c } -if [ $1 == "sled-cycle" ]; then - echo "SLED_CYCLE starting at $(date)" - sled_cycle - exit 0; +if [ "$1" == "sled-cycle" ]; then + echo "SLED_CYCLE starting at $(date)" + sled_cycle + exit 0; fi if [ $# -lt 2 ]; then - echo "Total number of parameter=$#" - echo "Insufficient parameter" - usage; - exit 0; + echo "Total number of parameter=$#" + echo "Insufficient parameter" + usage; + exit 0; fi -if [ $1 != "mb" ]; then - echo "Invalid parameter1=$1" - usage; - exit 0; +if [ "$1" != "mb" ]; then + echo "Invalid parameter1=$1" + usage; + exit 0; fi -if [ $2 = "on" ]; then - if [ $(power_status) == "off" ]; then - power_on +if [ "$2" = "on" ]; then + if [ "$(power_status)" == "off" ]; then + power_on fi -elif [ $2 = "off" ]; then - if [ $(power_status) == "on" ]; then - power_off +elif [ "$2" = "off" ]; then + if [ "$(power_status)" == "on" ]; then + power_off fi -elif [ $2 == "cycle" ]; then - if [ $(power_status) == "on" ]; then - power_off +elif [ "$2" == "cycle" ]; then + if [ "$(power_status)" == "on" ]; then + power_off else echo "WARNING: Powering on server" fi - power_on -elif [ $2 == "reset" ]; then - if [ $(power_status) == "on" ]; then - power_reset + power_on +elif [ "$2" == "reset" ]; then + if [ "$(power_status)" == "on" ]; then + power_reset else echo "ERROR: Server not powered on" fi -elif [ $2 == "status" ]; then - power_status +elif [ "$2" == "status" ]; then + power_status else - echo "Invalid parameter2=$2" - usage; + echo "Invalid parameter2=$2" + usage; fi exit 0; diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh index 2624abd0d..cac3b20c7 100755 --- a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh @@ -7,16 +7,16 @@ function set_gpio_active_low() { return; fi - echo $1 > /sys/class/gpio/export - echo $2 > /sys/class/gpio/gpio$1/direction + echo "$1" > /sys/class/gpio/export + echo "$2" > "/sys/class/gpio/gpio$1/direction" } GPIO_BASE=$(cat /sys/class/gpio/gpio*/base) # FM_BMC_READY_N, GPIO S1, active low -set_gpio_active_low $((${GPIO_BASE} + 144 +1)) low +set_gpio_active_low $((GPIO_BASE + 144 +1)) low # FP_PECI_MUX, active low -set_gpio_active_low $((${GPIO_BASE} + 212)) high +set_gpio_active_low $((GPIO_BASE + 212)) high exit 0; diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index ceade37d2..5dc4a60c7 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "485f9b31cbdc8e8aebdfb18729f541f41227522d" +SRCREV = "dd0415b50776fade388ac7523f8aabe6a8a9fb68" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index d9c2abd53..4b8704321 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -53,6 +53,7 @@ RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \ ipmitool \ phosphor-post-code-manager \ phosphor-host-postd \ + tzdata-core \ " SUMMARY:${PN}-system = "Facebook System" |