summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-03-07 21:56:24 -0700
committerMartin Roth <martinroth@google.com>2016-03-11 17:56:05 +0100
commit3f1abb84e87704eac45570bdc89e786022c06678 (patch)
treec22a0d790bf345afb496a987d496b4f3e78470a9
parent1484c03916ec7672a053f04bf0b53741189bf649 (diff)
downloadcoreboot-3f1abb84e87704eac45570bdc89e786022c06678.tar.xz
SeaBIOS: Update SeaBIOS from repo when using master branch
Previously the SeaBIOS directory would never get updated after the initial clone because the tag would always match. This can be shown by noticing that the text 'Fetching new commits from the SeaBIOS git repo' is never seen. This change will always try to pull the latest code if 'Master' is selected. Change-Id: I460e2fb0c6f683a0f85343d164880c2d9e6d95cc Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/13947 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--payloads/external/SeaBIOS/Makefile.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index c9d9199537..4b134c8057 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -15,8 +15,10 @@ seabios:
git clone http://review.coreboot.org/p/seabios.git seabios
fetch: seabios
- cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \
- then echo " Fetching new commits from the SeaBIOS git repo"; git fetch; fi
+ cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \
+ [ "$(TAG-y)" = "origin/master" ]; then \
+ echo " Fetching new commits from the SeaBIOS git repo"; \
+ git fetch; fi
checkout: fetch
echo " Checking out SeaBIOS revision $(TAG-y)"