diff options
-rw-r--r-- | build-scripts/build-android | 2 | ||||
-rw-r--r-- | build-scripts/build-android-toolchain | 6 | ||||
-rw-r--r-- | build-scripts/build-android-toolchain-linaro | 10 | ||||
-rw-r--r-- | build-scripts/helpers | 8 | ||||
-rwxr-xr-x | control/setup-control-node | 8 | ||||
-rwxr-xr-x | node/setup-build-android | 4 |
6 files changed, 19 insertions, 19 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 95c4bd7..c1dde71 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -49,7 +49,7 @@ MAKE_TARGETS="${MAKE_TARGETS-boottarball systemtarball userdatatarball}" calc_make_jobs if test -n "$TOOLCHAIN_URL"; then - wget --no-check-certificate $TOOLCHAIN_URL + wget -nv --no-check-certificate $TOOLCHAIN_URL toolchain_filename=`echo $TOOLCHAIN_URL | sed -e 's/.*\/\([^/]*\)$/\1/'` mkdir toolchain tar -C toolchain --strip-components 1 -xf $toolchain_filename diff --git a/build-scripts/build-android-toolchain b/build-scripts/build-android-toolchain index 0411d73..cb7f46f 100644 --- a/build-scripts/build-android-toolchain +++ b/build-scripts/build-android-toolchain @@ -24,20 +24,20 @@ fi if test -n "$BINUTILS_URL"; then BINUTILS_FILE=`get_url_basename "$BINUTILS_URL"` BINUTILS_VERSION=`get_tarball_version "$BINUTILS_FILE"` - wget --no-check-certificate "$BINUTILS_URL" + wget -nv --no-check-certificate "$BINUTILS_URL" sh -c "cd binutils/; tar xf ../$BINUTILS_FILE" fi if test -n "$GCC_URL"; then GCC_FILE=`get_url_basename "$GCC_URL"` GCC_VERSION=`get_tarball_version "$GCC_FILE"` - wget --no-check-certificate "$GCC_URL" + wget -nv --no-check-certificate "$GCC_URL" sh -c "cd gcc/; tar xf ../$GCC_FILE" fi WITH_SYSROOT= if test -n "$SYSROOT_NDK_URL"; then - wget --no-check-certificate "$SYSROOT_NDK_URL" + wget -nv --no-check-certificate "$SYSROOT_NDK_URL" NDK_FILE=`get_url_basename "$SYSROOT_NDK_URL"` tar xf $NDK_FILE WITH_SYSROOT=--with-sysroot=`echo $PWD/android-ndk-*/platforms/android-9/arch-arm/` diff --git a/build-scripts/build-android-toolchain-linaro b/build-scripts/build-android-toolchain-linaro index 36b29ed..5ddada7 100644 --- a/build-scripts/build-android-toolchain-linaro +++ b/build-scripts/build-android-toolchain-linaro @@ -20,7 +20,7 @@ GCC_SRC_TYPE="unk" WITH_SYSROOT= if test -n "$SYSROOT_NDK_URL"; then - wget --no-check-certificate "$SYSROOT_NDK_URL" + wget -nv --no-check-certificate "$SYSROOT_NDK_URL" NDK_FILE=`get_url_basename "$SYSROOT_NDK_URL"` tar xf $NDK_FILE WITH_SYSROOT=--with-sysroot=`echo $PWD/android-ndk-*/platforms/android-9/arch-arm/` @@ -38,7 +38,7 @@ mkdir -p gcc # FIX_GCC_URL=http://launchpad.net/gcc-linaro/4.6/4.6-2011.07/+download/gcc-linaro-4.6-2011.07-0.tar.bz2 # host/path part of FIX_GCC_URL is ignored, only filename is important (but it must be proper URL). if [ -n "$FIX_GCC_URL" ]; then - wget --no-check-certificate "$GCC_URL" + wget -nv --no-check-certificate "$GCC_URL" mv `get_url_basename "$GCC_URL"` gcc/`get_url_basename "$FIX_GCC_URL"` GCC_URL="$FIX_GCC_URL" GCC_SRC_TYPE="tarball" @@ -50,7 +50,7 @@ if [ -n "$GCC_URL" ]; then fi if [ -n "$BZR_SEED_URL" ]; then - time wget --no-check-certificate "$BZR_SEED_URL" + time wget -nv --no-check-certificate "$BZR_SEED_URL" BZR_SEED_FILE=$(get_url_basename "$BZR_SEED_URL") time tar xaf $BZR_SEED_FILE cd $(basename $BZR_SEED_FILE .tar.xz) @@ -65,7 +65,7 @@ fi function fetch_gcc() { # Fetch gcc if needed if [ ! -f gcc/$GCC_FILE ]; then - wget --no-check-certificate "$GCC_URL" + wget -nv --no-check-certificate "$GCC_URL" mv $GCC_FILE gcc/$GCC_FILE fi # Untar gcc @@ -84,7 +84,7 @@ if [ -n "$GCC_PATCH_URL" ]; then ifs_save="$IFS" IFS=";" for p in $patches; do - wget --no-check-certificate "$p" + wget -nv --no-check-certificate "$p" p_file=`get_url_basename "$p"` patch -p0 -d gcc/$GCC_URL <$p_file done diff --git a/build-scripts/helpers b/build-scripts/helpers index 9d58f1f..56094e4 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -86,9 +86,9 @@ download_another_build () { local dir=out/target/product/$TARGET_PRODUCT mkdir -p $dir pushd $dir - wget --no-check-certificate "$baseurl/target/product/$TARGET_PRODUCT/boot.tar.bz2" - wget --no-check-certificate "$baseurl/target/product/$TARGET_PRODUCT/system.tar.bz2" - wget --no-check-certificate "$baseurl/target/product/$TARGET_PRODUCT/userdata.tar.bz2" + wget -nv --no-check-certificate "$baseurl/target/product/$TARGET_PRODUCT/boot.tar.bz2" + wget -nv --no-check-certificate "$baseurl/target/product/$TARGET_PRODUCT/system.tar.bz2" + wget -nv --no-check-certificate "$baseurl/target/product/$TARGET_PRODUCT/userdata.tar.bz2" popd } @@ -121,7 +121,7 @@ unpack_external_tarball () { if [[ $p =~ $regex_is_http ]]; then # File is on a remote web server, wget it - wget --no-check-certificate $p + wget -nv --no-check-certificate $p fi if [[ $p =~ $regex_file ]]; then diff --git a/control/setup-control-node b/control/setup-control-node index cec0419..62550a5 100755 --- a/control/setup-control-node +++ b/control/setup-control-node @@ -26,11 +26,11 @@ sudo apt-get install -qq -y git-core gnupg bzr make # +++ JENKINS +++ # sudo apt-get install -qq -y python-lxml default-jre-headless daemon -wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add - +wget -nv -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add - #echo 'deb http://pkg.jenkins-ci.org/debian binary/' | sudo tee /etc/apt/sources.list.d/jenkins-ci.list > /dev/null #sudo apt-get update -qq #sudo apt-get install -qq -y jenkins -wget -q $JENKINS_DEB +wget -nv $JENKINS_DEB # This might fail due to missing dependencies sudo dpkg -i $(basename $JENKINS_DEB) || true # Make apt-get install missing dependencies @@ -57,7 +57,7 @@ sudo mkdir -p ~jenkins/plugins/ savedir=$PWD cd ~jenkins/plugins/ for url in $PLUGINS; do - sudo wget -q --no-check-certificate $url || exit 1 + sudo wget -nv --no-check-certificate $url || exit 1 done cd $savedir @@ -290,7 +290,7 @@ sudo -u www-data ./bin/manage loaddata --settings settings_prod group-fixture.js sudo apt-get install -qq -y unzip python-cssutils sudo -H -u build-system-frontend sh -xes "$@" <<\EOF cd -wget -c -q http://yui.zenfs.com/releases/yui3/yui_3.3.0.zip +wget -c -nv http://yui.zenfs.com/releases/yui3/yui_3.3.0.zip unzip -o -q yui_3.3.0.zip rm -rf lazr-js bzr get lp:~mwhudson/lazr-js/combo-mod_wsgi-config lazr-js diff --git a/node/setup-build-android b/node/setup-build-android index edb1859..e135938 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -36,7 +36,7 @@ apt-get-retry () { # get latest repo script and install it in PATH #wget http://android.git.kernel.org/repo # Use our mirror of repo -wget --no-check-certificate 'http://android.git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable' -O repo +wget -nv --no-check-certificate 'http://android.git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable' -O repo mv repo /usr/local/bin/repo chmod a+x /usr/local/bin/repo @@ -53,7 +53,7 @@ apt-get-retry install -y python-software-properties unixodbc java-common ##add-apt-repository "deb http://archive.canonical.com/ubuntu maverick partner" ##apt-get update -wget --no-check-certificate http://android-build.linaro.org/seed/sun-java6-bin_6.26-2natty1_amd64.deb \ +wget -nv --no-check-certificate http://android-build.linaro.org/seed/sun-java6-bin_6.26-2natty1_amd64.deb \ http://android-build.linaro.org/seed/sun-java6-jdk_6.26-2natty1_amd64.deb \ http://android-build.linaro.org/seed/sun-java6-jre_6.26-2natty1_all.deb |