diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2018-10-19 12:51:14 +0800 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2018-10-19 06:46:38 +0100 |
| commit | 341ba900ba0b7414d0d405f6c2c6639c531a38e3 (patch) | |
| tree | 6f8c595cec724b37b3a8a6ee430b472c62654dbc | |
| parent | 861ab72179c2ec8cbd5923bfcbd86a9e26b9f2f7 (diff) | |
atf-build.sh: fix to calculate atf version
commit 1a0f11213a539a5d0c5d05bfaa68ccc75cb340aa
Author: Soby Mathew <soby.mathew@arm.com>
Date: Mon Oct 1 16:16:34 2018 +0100
Update the version to 2.0
Change-Id: Icbc556d47a58d0870577b1bf1cd27cc5827fd56d
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Since ARM Trusted Firmware version is updated to 2.0, the calculation
of ATF is wrong. It could only calculate version for 1.x.
Update the calculation to support 2.x or n.x.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
| -rwxr-xr-x | atf-build.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/atf-build.sh b/atf-build.sh index fb80ad0..30af714 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -27,7 +27,11 @@ function check_atf_buildver MINOR=`grep "^VERSION_MINOR" Makefile | sed 's/.*:= *\([0-9]*\).*/\1/'` [ $? -ne 0 ] && return 1 - if [ "$MAJOR" -eq 1 -a "$MINOR" -ge 2 ]; then + if [ "$MAJOR" -eq 1 ]; then + if [ "$MINOR" -ge 2 ]; then + ATF_BUILDVER=2 + fi + else ATF_BUILDVER=2 fi } |