diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-17 13:21:11 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-17 13:23:11 +0000 |
| commit | b62575cf7b1bc5044f8f9e0494cc9c36b9d2f57f (patch) | |
| tree | 5e54be2f4223d0963e0f371240c439ca23f7f69c | |
| parent | 53551c7177efca262665e7ee3f612f4805e760ec (diff) | |
MakeRelease.job: Don't expand buildnumber to 4 digits
... so that we can pass "--release_name 2021.01 --buildnumber 1" and
get binaries named "2021.01-1" (not "2021.01-0001").
Change-Id: I3e7aa8a85b73fc8a66d64961371a2be7ba17abf8
| -rwxr-xr-x | MakeRelease.job | 6 | ||||
| -rwxr-xr-x | tcwg-dev-build.sh | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index 954393b6..a60f8a0b 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -46,6 +46,7 @@ if test x"${debug}" = x"true"; then else export CONFIG_SHELL="/bin/bash" fi +buildnumber=0 target="" fileserver="" extra= @@ -241,9 +242,8 @@ series_date=${series_date%-linux} series_date=${series_date%-win32} # Fileserver location of binary tarballs and build logfiles -buildid=`printf '%04d' ${buildnumber}` -binaries="$artifacts_top/binaries/${gcc_release}-${series_date}-${buildid}/${target}" -logs="$artifacts_top/logs/${gcc_release}-${series_date}-${buildid}/${target}" +binaries="$artifacts_top/binaries/${gcc_release}-${series_date}-${buildnumber}/${target}" +logs="$artifacts_top/logs/${gcc_release}-${series_date}-${buildnumber}/${target}" if [ "x${binariesdir}" != "x" ] && \ [ "x${binariesdir}" != "x${binaries}" ]; then diff --git a/tcwg-dev-build.sh b/tcwg-dev-build.sh index d67244df..d3878dee 100755 --- a/tcwg-dev-build.sh +++ b/tcwg-dev-build.sh @@ -11,6 +11,7 @@ abe_branch="${abe_branch-tested}" dry_run="${dry_run-false}" manifest="${manifest-}" release_name="${release_name-default}" +buildnumber=0 target="${target-aarch64-linux-gnu}" version="${version-default}" verbose="${verbose-true}" @@ -37,9 +38,10 @@ fi # shellcheck disable=SC2154 $scripts/MakeRelease.job \ - --abedir "$(pwd)"/abe \ - --artifacts_top "$(pwd)"/artifacts \ + --abedir "$(pwd)"/abe \ + --artifacts_top "$(pwd)"/artifacts \ --release_name $release_name \ + --buildnumber $buildnumber \ --target $target \ --toolchainconfig $version \ --workspace "$(pwd)" \ |