summaryrefslogtreecommitdiff
path: root/meta-google
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2022-04-05 01:32:32 +0300
committerWilliam A. Kennington III <wak@google.com>2022-04-06 00:05:34 +0300
commit85c714a9afc771875a6345b0ddca33f06900c7e9 (patch)
treeb5581b7da0b26f82c58b24a4dfa2bd46cb0a5d2c /meta-google
parent790c9722f410d4f54a7036f8a1d680f300d4b533 (diff)
downloadopenbmc-85c714a9afc771875a6345b0ddca33f06900c7e9.tar.xz
meta-google: gbmc-update: Fix version output
If we ever have a directory with a VERSION file and version directory, it will write both versions. This is incorrect behavior. Change-Id: Ic6737836ab4c59c32dd3d9c78b76f222558d92a4 Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'meta-google')
-rw-r--r--meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh b/meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh
index 87a1219369..1831d49420 100644
--- a/meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh
+++ b/meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh
@@ -60,13 +60,17 @@ gbmc_upgrade_fetch() (
local imgdir="${sig%/*}"
if [ -f "$imgdir/VERSION" ]; then
cat "$imgdir/VERSION" || return
+ return 0
fi
# Staging packages have a directory named after the version
local vdir="${imgdir##*/}"
if [[ "$vdir" =~ ([0-9]+[.]){3}[0-9]+ ]]; then
echo "$vdir"
+ return 0
fi
+
+ return 1
)
GBMC_BR_DHCP_HOOKS+=(gbmc_upgrade_hook)