From a74dd977d6d71baf2bd581d7e02bd4d70b848164 Mon Sep 17 00:00:00 2001 From: Dmitriy Vasyura Date: Tue, 8 Sep 2026 13:13:52 -0700 Subject: [PATCH 1/2] Complete GLib sysroot development metadata Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- build-gnu-toolchain.yml | 11 ++++++++++- .../generated_package_lists/bullseye.amd64 | 16 ++++++++++++++++ .../generated_package_lists/bullseye.arm64 | 16 ++++++++++++++++ .../generated_package_lists/bullseye.armhf | 16 ++++++++++++++++ sysroot-scripts/sysroot-creator.sh | 18 +++++++++++++++++- 5 files changed, 75 insertions(+), 2 deletions(-) diff --git a/build-gnu-toolchain.yml b/build-gnu-toolchain.yml index e4c74cb..74dc4ed 100644 --- a/build-gnu-toolchain.yml +++ b/build-gnu-toolchain.yml @@ -14,7 +14,7 @@ steps: sudo apt-get update sudo apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \ python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \ - patch rsync meson ninja-build + patch rsync meson ninja-build pkg-config displayName: 'Prepare dependencies' - script: | set -e @@ -40,6 +40,15 @@ steps: ./sysroot-scripts/sysroot-creator.sh build ${{ parameters.arch }} \ `pwd`/toolchain-dir/${{ parameters.tuple }}/${{ parameters.tuple }}/sysroot displayName: 'Install additional libraries' +- script: | + set -e + sysroot=`pwd`/toolchain-dir/${{ parameters.tuple }}/${{ parameters.tuple }}/sysroot + gio_pc=`find "$sysroot/usr/lib" -path '*/pkgconfig/gio-2.0.pc' -print -quit` + test -n "$gio_pc" + PKG_CONFIG_SYSROOT_DIR="$sysroot" \ + PKG_CONFIG_LIBDIR="`dirname "$gio_pc"`:$sysroot/usr/lib/pkgconfig:$sysroot/usr/share/pkgconfig" \ + pkg-config --cflags --libs gio-2.0 + displayName: 'Validate GIO pkg-config metadata' - script: | set -e cd toolchain-dir diff --git a/sysroot-scripts/generated_package_lists/bullseye.amd64 b/sysroot-scripts/generated_package_lists/bullseye.amd64 index 6f7669d..f42e4a9 100644 --- a/sysroot-scripts/generated_package_lists/bullseye.amd64 +++ b/sysroot-scripts/generated_package_lists/bullseye.amd64 @@ -15,8 +15,12 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/lib https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5support0_1.18.3-6+deb11u3_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libb/libbsd/libbsd0_0.11.3-1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi7_3.3-6_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi-dev_3.3-6_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libm/libmd/libmd0_1.0.3-3_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1_3.1-3_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1-dev_3.1-3_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libsepol/libsepol1_3.1-1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libsepol/libsepol1-dev_3.1-1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libt/libtirpc/libtirpc3_1.3.1-1+deb11u1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libx11/libx11-6_1.7.2-1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libx11/libx11-dev_1.7.2-1_amd64.deb @@ -31,10 +35,22 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libxk https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libz/libzstd/libzstd1_1.4.8+dfsg-2.1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl1.1_1.1.1n-0+deb11u4_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl-dev_1.1.1n-0+deb11u4_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-16-0_10.36-2+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-32-0_10.36-2+deb11u1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-8-0_10.36-2+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-dev_10.36-2+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-posix2_10.36-2+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre16-3_8.39-13_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3_8.39-13_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre32-3_8.39-13_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3-dev_8.39-13_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcrecpp0v5_8.39-13_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid1_2.36.1-8+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid-dev_2.36.1-8+deb11u1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount1_2.36.1-8+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount-dev_2.36.1-8+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libuuid1_2.36.1-8+deb11u1_amd64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xorgproto/x11proto-dev_2020.1-1_all.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xz-utils/liblzma5_5.2.5-2.1~deb11u1_amd64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/z/zlib/zlib1g_1.2.11.dfsg-2+deb11u2_amd64.deb diff --git a/sysroot-scripts/generated_package_lists/bullseye.arm64 b/sysroot-scripts/generated_package_lists/bullseye.arm64 index f965d25..ee622e4 100644 --- a/sysroot-scripts/generated_package_lists/bullseye.arm64 +++ b/sysroot-scripts/generated_package_lists/bullseye.arm64 @@ -15,8 +15,12 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/lib https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5support0_1.18.3-6+deb11u3_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libb/libbsd/libbsd0_0.11.3-1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi7_3.3-6_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi-dev_3.3-6_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libm/libmd/libmd0_1.0.3-3_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1_3.1-3_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1-dev_3.1-3_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libsepol/libsepol1_3.1-1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libsepol/libsepol1-dev_3.1-1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libt/libtirpc/libtirpc3_1.3.1-1+deb11u1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libx11/libx11-6_1.7.2-1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libx11/libx11-dev_1.7.2-1_arm64.deb @@ -31,10 +35,22 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libxk https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libz/libzstd/libzstd1_1.4.8+dfsg-2.1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl1.1_1.1.1n-0+deb11u4_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl-dev_1.1.1n-0+deb11u4_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-16-0_10.36-2+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-32-0_10.36-2+deb11u1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-8-0_10.36-2+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-dev_10.36-2+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-posix2_10.36-2+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre16-3_8.39-13_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3_8.39-13_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre32-3_8.39-13_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3-dev_8.39-13_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcrecpp0v5_8.39-13_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid1_2.36.1-8+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid-dev_2.36.1-8+deb11u1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount1_2.36.1-8+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount-dev_2.36.1-8+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libuuid1_2.36.1-8+deb11u1_arm64.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xorgproto/x11proto-dev_2020.1-1_all.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xz-utils/liblzma5_5.2.5-2.1~deb11u1_arm64.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/z/zlib/zlib1g_1.2.11.dfsg-2+deb11u2_arm64.deb diff --git a/sysroot-scripts/generated_package_lists/bullseye.armhf b/sysroot-scripts/generated_package_lists/bullseye.armhf index 6d69b63..0351257 100644 --- a/sysroot-scripts/generated_package_lists/bullseye.armhf +++ b/sysroot-scripts/generated_package_lists/bullseye.armhf @@ -15,8 +15,12 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/lib https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5support0_1.18.3-6+deb11u3_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libb/libbsd/libbsd0_0.11.3-1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi7_3.3-6_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi-dev_3.3-6_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libm/libmd/libmd0_1.0.3-3_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1_3.1-3_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1-dev_3.1-3_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libsepol/libsepol1_3.1-1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libsepol/libsepol1-dev_3.1-1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libt/libtirpc/libtirpc3_1.3.1-1+deb11u1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libx11/libx11-6_1.7.2-1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libx11/libx11-dev_1.7.2-1_armhf.deb @@ -31,10 +35,22 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libx/libxk https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libz/libzstd/libzstd1_1.4.8+dfsg-2.1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl1.1_1.1.1n-0+deb11u4_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl-dev_1.1.1n-0+deb11u4_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-16-0_10.36-2+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-32-0_10.36-2+deb11u1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-8-0_10.36-2+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-dev_10.36-2+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-posix2_10.36-2+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre16-3_8.39-13_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3_8.39-13_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre32-3_8.39-13_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3-dev_8.39-13_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcrecpp0v5_8.39-13_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid1_2.36.1-8+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid-dev_2.36.1-8+deb11u1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount1_2.36.1-8+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount-dev_2.36.1-8+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libuuid1_2.36.1-8+deb11u1_armhf.deb +https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xorgproto/x11proto-dev_2020.1-1_all.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xz-utils/liblzma5_5.2.5-2.1~deb11u1_armhf.deb https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/z/zlib/zlib1g_1.2.11.dfsg-2+deb11u2_armhf.deb diff --git a/sysroot-scripts/sysroot-creator.sh b/sysroot-scripts/sysroot-creator.sh index b6c1a76..d3ae2a8 100755 --- a/sysroot-scripts/sysroot-creator.sh +++ b/sysroot-scripts/sysroot-creator.sh @@ -50,9 +50,11 @@ KEYRING_FILE="${SCRIPT_DIR}/keyring.gpg" DEBIAN_PACKAGES="\ comerr-dev krb5-multidev + libblkid-dev libblkid1 libbsd0 libcom-err2 + libffi-dev libffi7 libglib2.0-0 libglib2.0-dev @@ -68,13 +70,26 @@ DEBIAN_PACKAGES="\ libkrb5support0 liblzma5 libmd0 + libmount-dev libmount1 - libpcre3 + libpcre16-3 + libpcre2-16-0 + libpcre2-32-0 libpcre2-8-0 + libpcre2-dev + libpcre2-posix2 + libpcre3 + libpcre3-dev + libpcre32-3 + libpcrecpp0v5 libselinux1 + libselinux1-dev + libsepol1 + libsepol1-dev libssl-dev libssl1.1 libtirpc3 + libuuid1 libx11-6 libx11-dev libxau-dev @@ -86,6 +101,7 @@ DEBIAN_PACKAGES="\ libxkbfile1 libxkbfile-dev libzstd1 + uuid-dev x11proto-dev zlib1g zlib1g-dev From 90b7c98eba331aa05c35b5a9822fa2a097ce863b Mon Sep 17 00:00:00 2001 From: Dmitriy Vasyura Date: Tue, 8 Sep 2026 14:53:41 -0700 Subject: [PATCH 2/2] Retry GNU toolchain downloads with curl Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- aarch64-gcc-10.5.0-glibc-2.28.config | 6 +++--- aarch64-gcc-8.5.0-glibc-2.28.config | 6 +++--- armhf-gcc-10.5.0-glibc-2.28.config | 6 +++--- armhf-gcc-8.5.0-glibc-2.28.config | 6 +++--- build-gnu-toolchain.yml | 2 +- x86_64-gcc-10.5.0-glibc-2.28.config | 6 +++--- x86_64-gcc-8.5.0-glibc-2.28.config | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/aarch64-gcc-10.5.0-glibc-2.28.config b/aarch64-gcc-10.5.0-glibc-2.28.config index 0c1680a..416877e 100644 --- a/aarch64-gcc-10.5.0-glibc-2.28.config +++ b/aarch64-gcc-10.5.0-glibc-2.28.config @@ -65,13 +65,13 @@ CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y # # Downloading # -CT_DOWNLOAD_AGENT_WGET=y -# CT_DOWNLOAD_AGENT_CURL is not set +# CT_DOWNLOAD_AGENT_WGET is not set +CT_DOWNLOAD_AGENT_CURL=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set CT_CONNECT_TIMEOUT=10 -CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" +CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 10 --retry-delay 5 --retry-all-errors --fail --silent --show-error" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set CT_VERIFY_DOWNLOAD_DIGEST=y diff --git a/aarch64-gcc-8.5.0-glibc-2.28.config b/aarch64-gcc-8.5.0-glibc-2.28.config index 68c840b..0f06f59 100644 --- a/aarch64-gcc-8.5.0-glibc-2.28.config +++ b/aarch64-gcc-8.5.0-glibc-2.28.config @@ -65,13 +65,13 @@ CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y # # Downloading # -CT_DOWNLOAD_AGENT_WGET=y -# CT_DOWNLOAD_AGENT_CURL is not set +# CT_DOWNLOAD_AGENT_WGET is not set +CT_DOWNLOAD_AGENT_CURL=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set CT_CONNECT_TIMEOUT=10 -CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" +CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 10 --retry-delay 5 --retry-all-errors --fail --silent --show-error" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set CT_VERIFY_DOWNLOAD_DIGEST=y diff --git a/armhf-gcc-10.5.0-glibc-2.28.config b/armhf-gcc-10.5.0-glibc-2.28.config index a131e56..0b543c5 100644 --- a/armhf-gcc-10.5.0-glibc-2.28.config +++ b/armhf-gcc-10.5.0-glibc-2.28.config @@ -65,13 +65,13 @@ CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y # # Downloading # -CT_DOWNLOAD_AGENT_WGET=y -# CT_DOWNLOAD_AGENT_CURL is not set +# CT_DOWNLOAD_AGENT_WGET is not set +CT_DOWNLOAD_AGENT_CURL=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set CT_CONNECT_TIMEOUT=10 -CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" +CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 10 --retry-delay 5 --retry-all-errors --fail --silent --show-error" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set CT_VERIFY_DOWNLOAD_DIGEST=y diff --git a/armhf-gcc-8.5.0-glibc-2.28.config b/armhf-gcc-8.5.0-glibc-2.28.config index 8184b6a..62cc040 100644 --- a/armhf-gcc-8.5.0-glibc-2.28.config +++ b/armhf-gcc-8.5.0-glibc-2.28.config @@ -65,13 +65,13 @@ CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y # # Downloading # -CT_DOWNLOAD_AGENT_WGET=y -# CT_DOWNLOAD_AGENT_CURL is not set +# CT_DOWNLOAD_AGENT_WGET is not set +CT_DOWNLOAD_AGENT_CURL=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set CT_CONNECT_TIMEOUT=10 -CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" +CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 10 --retry-delay 5 --retry-all-errors --fail --silent --show-error" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set CT_VERIFY_DOWNLOAD_DIGEST=y diff --git a/build-gnu-toolchain.yml b/build-gnu-toolchain.yml index 74dc4ed..9266463 100644 --- a/build-gnu-toolchain.yml +++ b/build-gnu-toolchain.yml @@ -14,7 +14,7 @@ steps: sudo apt-get update sudo apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \ python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \ - patch rsync meson ninja-build pkg-config + patch rsync meson ninja-build pkg-config curl displayName: 'Prepare dependencies' - script: | set -e diff --git a/x86_64-gcc-10.5.0-glibc-2.28.config b/x86_64-gcc-10.5.0-glibc-2.28.config index 2f7c399..44af78c 100644 --- a/x86_64-gcc-10.5.0-glibc-2.28.config +++ b/x86_64-gcc-10.5.0-glibc-2.28.config @@ -65,13 +65,13 @@ CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y # # Downloading # -CT_DOWNLOAD_AGENT_WGET=y -# CT_DOWNLOAD_AGENT_CURL is not set +# CT_DOWNLOAD_AGENT_WGET is not set +CT_DOWNLOAD_AGENT_CURL=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set CT_CONNECT_TIMEOUT=10 -CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" +CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 10 --retry-delay 5 --retry-all-errors --fail --silent --show-error" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set CT_VERIFY_DOWNLOAD_DIGEST=y diff --git a/x86_64-gcc-8.5.0-glibc-2.28.config b/x86_64-gcc-8.5.0-glibc-2.28.config index 37a7d7c..48aa9e9 100644 --- a/x86_64-gcc-8.5.0-glibc-2.28.config +++ b/x86_64-gcc-8.5.0-glibc-2.28.config @@ -65,13 +65,13 @@ CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y # # Downloading # -CT_DOWNLOAD_AGENT_WGET=y -# CT_DOWNLOAD_AGENT_CURL is not set +# CT_DOWNLOAD_AGENT_WGET is not set +CT_DOWNLOAD_AGENT_CURL=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set CT_CONNECT_TIMEOUT=10 -CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" +CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 10 --retry-delay 5 --retry-all-errors --fail --silent --show-error" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set CT_VERIFY_DOWNLOAD_DIGEST=y