Merge pull request #9347 from antonlacon/use-curl

buildsystem: replace wget with curl
This commit is contained in:
Rudi Heitbaum
2024-10-19 11:09:47 +11:00
committed by GitHub
7 changed files with 15 additions and 18 deletions

View File

@@ -58,6 +58,7 @@ dep_map=(
[bash]=bash
[bc]=bc
[bzip2]=bzip2
[curl]=curl
[diff]=diffutils
[gawk]=gawk
[gcc]=gcc
@@ -74,7 +75,6 @@ dep_map=(
[sed]=sed
[tar]=tar
[unzip]=unzip
[wget]=wget
[xz]=xz-utils
[zip]=zip
[zstd]=zstd

View File

@@ -21,21 +21,21 @@ build_msg "CLR_GET" "GET" "${1} (archive)" "indent"
pkg_lock_status "GETPKG" "${PKG_NAME}" "unpack" "downloading package..."
PACKAGE_MIRROR="${DISTRO_MIRROR}/${PKG_NAME}/${PKG_SOURCE_NAME}"
[ "${VERBOSE}" != "yes" ] && WGET_OPT=-q
WGET_CMD="wget --output-file=- --timeout=30 --tries=3 --no-check-certificate -c ${WGET_OPT} --progress=bar:force --show-progress -O ${PACKAGE}"
[ "${VERBOSE}" != "yes" ] && GET_OPT="--silent --show-error"
GET_CMD="curl ${GET_OPT} --connect-timeout 30 --retry 3 --continue-at - --location --max-redirs 5 --output ${PACKAGE}"
# unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries
unset LD_LIBRARY_PATH
rm -f "${STAMP_URL}" "${STAMP_SHA}"
NBWGET=10
NBGET=10
NBCHKS=2
while [ ${NBWGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
while [ ${NBGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
for url in "${PKG_URL}" "${PACKAGE_MIRROR}"; do
rm -f "${PACKAGE}"
[[ "${url}" =~ ^[fF][tT][pP]:* ]] && WGET_FTP=--passive-ftp || WGET_FTP=
if ${WGET_CMD} ${WGET_FTP} "${url}"; then
if ${GET_CMD} "${url}"; then
CALC_SHA256=$(sha256sum "${PACKAGE}" | cut -d" " -f1)
[ -z "${PKG_SHA256}" -o "${PKG_SHA256}" = "${CALC_SHA256}" ] && break 2
@@ -49,10 +49,10 @@ while [ ${NBWGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
fi
fi
done
NBWGET=$((NBWGET - 1))
NBGET=$((NBGET - 1))
done
if [ ${NBWGET} -eq 0 -o ${NBCHKS} -eq 0 ]; then
if [ ${NBGET} -eq 0 -o ${NBCHKS} -eq 0 ]; then
die "\nCannot get ${1} sources : ${PKG_URL}\nTry later!"
else
build_msg "CLR_INFO" "INFO" "Calculated checksum: ${CALC_SHA256}"