diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
commit | 901ced0812b458fdc599fe40b0a4233d422d6df9 (patch) | |
tree | b0918e0606da0b1925b5fc9aba5e065e0a5a2f0e /meta-google | |
parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
parent | 459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 (diff) | |
download | openbmc-901ced0812b458fdc599fe40b0a4233d422d6df9.tar.xz |
Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-google')
-rwxr-xr-x | meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_isoff.sh | 4 | ||||
-rw-r--r-- | meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_isoff.sh b/meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_isoff.sh index 459eca7e2..4119801b0 100755 --- a/meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_isoff.sh +++ b/meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_isoff.sh @@ -15,7 +15,7 @@ source /usr/share/gpio-host-pwr/lib.sh || exit -gpio_build_cache 10 "$HOST_GPIO_PGOOD" || return 255 -pgood="$(gpio_get_value "$HOST_GPIO_PGOOD")" || return 255 +gpio_build_cache 10 "$HOST_GPIO_PGOOD" || exit 255 +pgood="$(gpio_get_value "$HOST_GPIO_PGOOD")" || exit 255 echo "HOST_PGOOD=$pgood" >&2 (( pgood == 0 )) diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in index 93d1a4ad2..d07b9e2f0 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in @@ -35,6 +35,7 @@ gbmc_ncsi_nft_update() { fi local ip6="$gbmc_ncsi_nft_lastip6" + local pfx= if [ -n "$ip6" ]; then contents+=" ip6 daddr $ip6/128 goto ncsi_legacy_input"$'\n' @@ -52,7 +53,7 @@ gbmc_ncsi_nft_update() { done if (( ${#ip_bytes[@]} != 0 )); then ip_bytes[8]=0xfd - local pfx="$(ip_bytes_to_str ip_bytes)" + pfx="$(ip_bytes_to_str ip_bytes)" contents+=" ip6 saddr != $pfx/72 ip6 daddr" contents+=" $pfx/72 goto ncsi_gbmc_br_pub_input"$'\n' fi |