diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-03-17 13:50:55 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2017-03-20 17:08:27 +0000 |
| commit | 7f4c08737c3fa41b6992546e534d5606bd31959a (patch) | |
| tree | 9f83b3af9aa6af6b9ec7f0235e65e34d8aa7c1c5 | |
| parent | 7195781a84ee3906dd0bfea71d2fea8dfb484ef0 (diff) | |
MakeRelease.job: Add --buildnumber option.
And do not rely on BUILD_NUMBER in the environment.
Change-Id: I41e31968ffa2e34577d840d442357404edb18668
| -rwxr-xr-x | MakeRelease.job | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index 1735e102..9ec01abc 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -21,6 +21,7 @@ usage() { echo " --binariesdir XXX - Specify where to upload the generated binaries" echo " --logsdir XXX - Specify where to upload the logs" echo " --canadian - Perform a Canadian-cross build too" + echo " --buildnumber XXX - Specify build number" echo " --help" exit $ret } @@ -47,7 +48,7 @@ binariesdir= logsdir= canadian=false -OPTS="`getopt -o h -l target:,date:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian`" +OPTS="`getopt -o h -l target:,date:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian,buildnumber:`" while test $# -gt 0; do case $1 in --abedir) abe_dir=$2 ; shift ;; @@ -63,6 +64,7 @@ while test $# -gt 0; do --binariesdir) binariesdir=$2 ; shift ;; --logsdir) logsdir=$2 ; shift ;; --canadian) canadian=true ;; + --buildnumber) buildnumber=$2 ; shift ;; -h|--help) usage 0 ;; --) break ;; *) usage ;; @@ -142,7 +144,7 @@ glibc=${glibc_src:+glibc=${glibc_src}} binutils=${binutils_src:+binutils=${binutils_src}} gcc=${gcc_src:+gcc=${gcc_src}} srcs="${gcc} ${binutils} ${glibc} ${manifest}" -logfile=${user_workspace}/MakeRelease-${BUILD_NUMBER}-$(uname -m).log +logfile=${user_workspace}/MakeRelease-${buildnumber}-$(uname -m).log # Build a binary release tarball # Remove logfile if present (for some unknown reason) @@ -205,7 +207,7 @@ series_date=${series_date%-linux} series_date=${series_date%-win32} # Fileserver location of binary tarballs and build logfiles -buildid=`printf '%04d' ${BUILD_NUMBER}` +buildid=`printf '%04d' ${buildnumber}` binaries="releases/binaries/${gcc_release}-${series_date}-${buildid}/${target}" logs="releases/logs/${gcc_release}-${series_date}-${buildid}/${target}" |