aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStu Tomlinson <stu@nosnilmot.com>2022-11-16 10:18:12 +0000
committerStu Tomlinson <stu@nosnilmot.com>2022-11-16 13:41:57 +0000
commited678f58d35a71ca693e4744961ede306524d029 (patch)
treea39615c5fb0095f83fc294615a3b37344671bf1b
parentmake-binaries: Bump zlib version to 1.2.13 (diff)
make-binaries: reduce log output
Reduce log output from make-binaries: - quieter curl downloads - quiet build of crosstool-ng - disable crosstool-ng progress bar
-rwxr-xr-xtools/make-binaries39
1 files changed, 20 insertions, 19 deletions
diff --git a/tools/make-binaries b/tools/make-binaries
index aef291309..751c03c1b 100755
--- a/tools/make-binaries
+++ b/tools/make-binaries
@@ -260,6 +260,7 @@ create_common_config()
CT_LINUX_V_3_16=y
CT_GLIBC_V_2_17=y
CT_GLIBC_KERNEL_VERSION_NONE=y
+ CT_LOG_PROGRESS_BAR=n
EOF
}
#.
@@ -332,7 +333,7 @@ create_data_dir()
mkdir "$data_dir" "$data_dir/database" "$data_dir/logs"
mv "$code_dir/conf" "$data_dir"
chmod 'o-rwx' "$data_dir/"*
- curl -o "$data_dir/conf/cacert.pem" 'https://curl.se/ca/cacert.pem'
+ curl --no-progress-meter -o "$data_dir/conf/cacert.pem" 'https://curl.se/ca/cacert.pem'
sed -i '/^loglevel:/a\
\
ca_file: /opt/ejabberd/conf/cacert.pem\
@@ -452,7 +453,7 @@ build_toolchain()
info "Building Crosstool-NG $crosstool_vsn ..."
cd "$src_dir/$crosstool_dir"
./configure --prefix="$bootstrap_dir"
- make
+ make V=0
make install
cd "$OLDPWD"
fi
@@ -843,23 +844,23 @@ else
info 'Downloading dependencies ...'
cd "$src_dir"
- curl -LO "http://crosstool-ng.org/download/crosstool-ng/$crosstool_tar"
- curl -LO "https://ftp.gnu.org/gnu/termcap/$termcap_tar"
- curl -LO "https://github.com/libexpat/libexpat/releases/download/R_$(printf '%s' "$expat_vsn" | sed 's/\./_/g')/$expat_tar"
- curl -LO "https://zlib.net/fossils/$zlib_tar"
- curl -LO "https://pyyaml.org/download/libyaml/$yaml_tar"
- curl -LO "https://www.openssl.org/source/$ssl_tar"
- curl -LO "https://github.com/erlang/otp/releases/download/OTP-$otp_vsn/$otp_tar"
- curl -LO "https://github.com/elixir-lang/elixir/archive/v$elixir_vsn.tar.gz"
- curl -LO "https://github.com/linux-pam/linux-pam/releases/download/v$pam_vsn/$pam_tar"
- curl -LO "https://download.sourceforge.net/libpng/$png_tar"
- curl -LO "https://www.ijg.org/files/$jpeg_tar"
- curl -LO "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$webp_tar"
- curl -LO "https://github.com/libgd/libgd/releases/download/gd-$gd_vsn/$gd_tar"
- curl -LO "http://www.unixodbc.org/$odbc_tar"
- curl -LO "https://www.sqlite.org/$(date '+%Y')/$sqlite_tar" \
- || curl -LO "https://www.sqlite.org/$(date -d '1 year ago' '+%Y')/$sqlite_tar" \
- || curl -LO "https://www.sqlite.org/$(date -d '2 years ago' '+%Y')/$sqlite_tar"
+ curl --no-progress-meter -LO "https://github.com/crosstool-ng/crosstool-ng/releases/download/$crosstool_dir/$crosstool_tar"
+ curl --no-progress-meter -LO "https://ftp.gnu.org/gnu/termcap/$termcap_tar"
+ curl --no-progress-meter -LO "https://github.com/libexpat/libexpat/releases/download/R_$(printf '%s' "$expat_vsn" | sed 's/\./_/g')/$expat_tar"
+ curl --no-progress-meter -LO "https://zlib.net/fossils/$zlib_tar"
+ curl --no-progress-meter -LO "https://pyyaml.org/download/libyaml/$yaml_tar"
+ curl --no-progress-meter -LO "https://www.openssl.org/source/$ssl_tar"
+ curl --no-progress-meter -LO "https://github.com/erlang/otp/releases/download/OTP-$otp_vsn/$otp_tar"
+ curl --no-progress-meter -LO "https://github.com/elixir-lang/elixir/archive/v$elixir_vsn.tar.gz"
+ curl --no-progress-meter -LO "https://github.com/linux-pam/linux-pam/releases/download/v$pam_vsn/$pam_tar"
+ curl --no-progress-meter -LO "https://download.sourceforge.net/libpng/$png_tar"
+ curl --no-progress-meter -LO "https://www.ijg.org/files/$jpeg_tar"
+ curl --no-progress-meter -LO "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$webp_tar"
+ curl --no-progress-meter -LO "https://github.com/libgd/libgd/releases/download/gd-$gd_vsn/$gd_tar"
+ curl --no-progress-meter -LO "http://www.unixodbc.org/$odbc_tar"
+ curl --no-progress-meter -LO "https://www.sqlite.org/$(date '+%Y')/$sqlite_tar" \
+ || curl --no-progress-meter -LO "https://www.sqlite.org/$(date -d '1 year ago' '+%Y')/$sqlite_tar" \
+ || curl --no-progress-meter -LO "https://www.sqlite.org/$(date -d '2 years ago' '+%Y')/$sqlite_tar"
cd "$OLDPWD"
fi