Skip to content

Deal with distfile requests being blocked by crates.io #4052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chewi merged 2 commits into from
May 29, 2026
+4 −4
Merged

Deal with distfile requests being blocked by crates.io #4052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20c9a1d
make.conf: Set a custom user-agent for wget when fetching distfiles
chewi May 28, 2026
934efee
cargo.eclass: Sync with Gentoo for crates.io fix
chewi May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk_container/src/third_party/portage-stable/eclass/cargo.eclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ _cargo_set_crate_uris() {
name="${BASH_REMATCH[1]}"
version="${BASH_REMATCH[2]}"
fi
url="https://crates.io/api/v1/crates/${name}/${version}/download -> ${name}-${version}.crate"
url="https://static.crates.io/crates/${name}/${name}-${version}.crate"
CARGO_CRATE_URIS+="${url} "

# when invoked by pkgbump, avoid fetching all the crates
Expand Down
4 changes: 1 addition & 3 deletions setup_board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,7 @@ sudo_clobber "${BOARD_ETC}/portage/make.conf" <<EOF
# Settings derived from the host environment
CBUILD="$(portageq envvar CHOST)"
HOSTCC="$(portageq envvar CHOST)-gcc"
DISTDIR="$(portageq envvar DISTDIR)"
MAKEOPTS="$(portageq envvar MAKEOPTS)"
PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)"
$(portageq envvar -v DISTDIR MAKEOPTS PORTAGE_USERNAME FETCHCOMMAND RESUMECOMMAND | sed 's:\$:\\$:g')

# Board specific settings
CHOST="${BOARD_CHOST}"
Expand Down
2 changes: 2 additions & 0 deletions update_chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ PORT_LOGDIR="/var/log/portage"
PORTAGE_BINHOST="$PORTAGE_BINHOST"
PORTAGE_USERNAME="${PORTAGE_USERNAME}"
MAKEOPTS="--jobs=${NUM_JOBS} --load-average=$((NUM_JOBS * 2))"
FETCHCOMMAND='wget -t 3 -T 60 --passive-ftp -U "Portage (Flatcar SDK ${FLATCAR_SDK_VERSION}, https://www.flatcar.org) distfile-fetch" -O "\\\${DISTDIR}/\\\${FILE}" "\\\${URI}"'
RESUMECOMMAND='wget -c -t 3 -T 60 --passive-ftp -U "Portage (Flatcar SDK ${FLATCAR_SDK_VERSION}, https://www.flatcar.org) distfile-fetch" -O "\\\${DISTDIR}/\\\${FILE}" "\\\${URI}"'

# Generally there isn't any need to add packages to @world by default.
# You can use --select to override this.
Expand Down