diff options
| -rwxr-xr-x | MakeRelease.job | 28 | ||||
| -rwxr-xr-x | tcwg-dev-build.sh | 7 |
2 files changed, 22 insertions, 13 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index abef1aa2..88f5d65f 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -60,8 +60,9 @@ glibc_src= manifest_src= toolchain_config= artifacts_top="releases" +manifest_validation=true -OPTS="`getopt -o h -l target:,release_name:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian,buildnumber:,artifacts_top:`" +OPTS="`getopt -o h -l target:,release_name:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian,buildnumber:,artifacts_top:,manifest_validation:`" while test $# -gt 0; do case $1 in --abedir) abe_dir=$2 ; shift ;; @@ -79,6 +80,7 @@ while test $# -gt 0; do --canadian) canadian=true ;; --buildnumber) buildnumber=$2 ; shift ;; --artifacts_top) artifacts_top=$2; shift ;; + --manifest_validation) manifest_validation=$2; shift ;; -h|--help) usage 0 ;; --) break ;; *) usage ;; @@ -271,16 +273,18 @@ done rsync -a "${tarballs[@]}" ${fileserver:+$fileserver:}${binaries}/ -echo "Starting manifest validation." -git clone --depth 1 git://git.linaro.org/toolchain/abe-tests.git -for manifest in "${manifests[@]}"; do - ./abe-tests/validate-manifest.pl "${manifest}" - if test $? -ne 0; then - echo "Manifest validation failed." - exit 1 - else - echo "Manifest validation passed." - fi -done +if $manifest_validation; then + echo "Starting manifest validation." + git clone --depth 1 git://git.linaro.org/toolchain/abe-tests.git + for manifest in "${manifests[@]}"; do + ./abe-tests/validate-manifest.pl "${manifest}" + if test $? -ne 0; then + echo "Manifest validation failed." + exit 1 + else + echo "Manifest validation passed." + fi + done +fi exit 0 diff --git a/tcwg-dev-build.sh b/tcwg-dev-build.sh index 8e1cf107..34da4fdd 100755 --- a/tcwg-dev-build.sh +++ b/tcwg-dev-build.sh @@ -23,10 +23,15 @@ if [ x"$release_name" = x"default" ]; then release_name="$(date +%Y%m%d-%H_%M_%S)" fi +if [ x"$target" = x"native" ]; then + manifest_validation_opt="--manifest_validation false" +fi + $scripts/MakeRelease.job \ --abedir `pwd`/abe \ --artifacts_top `pwd`/artifacts \ --release_name $release_name \ --target $target \ --toolchainconfig $version \ - --workspace `pwd` + --workspace `pwd` \ + $manifest_validation_opt |