diff options
author | Ryan S. Arnold <ryan.arnold@linaro.org> | 2016-07-01 18:02:20 -0500 |
---|---|---|
committer | Ryan S. Arnold <ryan.arnold@linaro.org> | 2016-07-06 08:18:46 -0500 |
commit | b631d44e376a9153c6130e9fe2130a880c693dcb (patch) | |
tree | 8d76f3edb5cd38ee421e47835184362d508e7d7d | |
parent | 34f07e48278b830f7ca274b8577712f26bfbb13c (diff) |
Remove --tarbin logic from scripts/MakeRelease.job
Now that --tarsrc isn't supported by scripts/MakeRelease.job there's no
reason to support --tarbin, as it is now the default behavior. Removing
the command line option is safe, even though jenkins jobs might pass
--tarbin because the option will just be ignored.
Change-Id: I84e59d0d19beab4d5fe5bd639c19474f0cc397c0
-rwxr-xr-x | MakeRelease.job | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index d6515cbe..c6781e7c 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -3,7 +3,6 @@ usage() { echo "MakeRelease: [options]" echo " --workspace - Specify an alternate workspace" - echo " --tarbin - Build a binary tarball" echo " --target XXX - Specify the target triplet to build" echo " --date XXX - Specify a date, which becmes part pf the release name" echo " --ref XXX - Specify a Git reference directory" @@ -32,7 +31,6 @@ else export CONFIG_SHELL="/bin/bash" fi target="" -tarbin="" ref="snapshots-ref" fileserver="148.251.136.42" extra= @@ -40,11 +38,10 @@ toolchain_config="" user_workspace="${WORKSPACE:-/home/${USER:-buildslave}/workspace}" logfile=${user_workspace}/MakeRelease-${BUILD_NUMBER}.log -OPTS="`getopt -o r:t:f:d:bw:m:l:g:u:h -l target:,ref:,date:,fileserver:,tarbin:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help`" +OPTS="`getopt -o r:t:f:d:w:m:l:g:u:h -l target:,ref:,date:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help`" while test $# -gt 0; do case $1 in -w|--workspace) user_workspace=$2 ;; - -b|--tarbin) tarbin=yes ;; -t|--target) target=$2 ;; -d|--date) date=$2 ;; -r|--ref) ref=$2 ;; @@ -131,21 +128,18 @@ binutils=${binutils_src:+binutils=${binutils_src}} gcc=${gcc_src:+gcc=${gcc_src}} srcs="${gcc} ${binutils} ${glibc} ${manifest}" -# Build a binary release tarball, then run the tests on the installed binaries -if test x"${tarbin}" = x"yes"; then - # Remove if present (for some unknown reason) - rm -f ${logfile} - # Canadian cross builds require a Linux hosted cross compiler first - if test x"${canadian}" = x"true"; then - $CONFIG_SHELL ${abe_dir}/abe.sh ${update} --release ${release} ${srcs} ${platform} --build all ${libc} ${extra} >> ${logfile} - host="--host i686-w64-mingw32" - rm -fr ${local_builds}/${host}/${target}/ -# update="--disable update" - else - host="" - fi - $CONFIG_SHELL ${abe_dir}/abe.sh ${update} --release ${release} --tarbin ${srcs} ${platform} ${host} --build all ${libc} ${extra} >> ${logfile} +# Build a binary release tarball +# Remove logfile if present (for some unknown reason) +rm -f ${logfile} +# Canadian cross builds require a Linux hosted cross compiler first +if test x"${canadian}" = x"true"; then + $CONFIG_SHELL ${abe_dir}/abe.sh ${update} --release ${release} ${srcs} ${platform} --build all ${libc} ${extra} >> ${logfile} + host="--host i686-w64-mingw32" + rm -fr ${local_builds}/${host}/${target}/ +else + host="" fi +$CONFIG_SHELL ${abe_dir}/abe.sh ${update} --release ${release} --tarbin ${srcs} ${platform} ${host} --build all ${libc} ${extra} >> ${logfile} # force a failure if abe has build problems. if test $? -gt 0; then @@ -170,12 +164,11 @@ if [ x"$gcc_ver" = x"$gcc_src" ]; then gcc_ver="$release" fi binaries="/work/space/binaries/${gcc_ver}/${target}" -if test x"${tarbin}" = xyes; then - manifest="`find ${user_workspace} -name \*manifest.txt`" - ssh ${fileserver} "if test ! -d ${binaries}; then mkdir -p ${binaries}; fi" - scp ${manifest} ${fileserver}:${binaries}/ - tarballs="`find ${user_snapshots} -name \*${release}\*.xz -o -name \*${release}\*.asc`" - scp ${tarballs} ${fileserver}:${binaries}/ -fi + +manifest="`find ${user_workspace} -name \*manifest.txt`" +ssh ${fileserver} "if test ! -d ${binaries}; then mkdir -p ${binaries}; fi" +scp ${manifest} ${fileserver}:${binaries}/ +tarballs="`find ${user_snapshots} -name \*${release}\*.xz -o -name \*${release}\*.asc`" +scp ${tarballs} ${fileserver}:${binaries}/ exit 0 |