mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 22:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from flatcar-linux/dongsu/catalyst-rust-alpha

Browse Source 
build_library/catalyst: Update virtual/rust during catalyst stage1 for alpha
This commit is contained in:
Dongsu Park 2020-06-18 12:06:50 +02:00 committed by GitHub
commit 4e109a49cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build_library/catalyst.sh
View File

@ -121,6 +121,15 @@ target: stage1
# stage1 packages aren't published, save in tmp
pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages
update_seed: yes
# Install virtual/rust to avoid version conflicts that happen in case of
# rust versions in the SDK being different from those in the new ebuilds.
# /usr/share/catalyst/targets/stage1/stage1-chroot.sh installs gcc and
# its dependencies, including dev-lang/rust, while virtual/rust does not
# get updated. That results in version conflicts between virtual/rust and
# dev-lang/rust. To avoid such an issue, we should update virtual/rust
# before building stage1. Since virtual/rust automatically pulls in
# dev-lang/rust, we do not need to explicitly specify dev-lang/rust here.
update_seed_command: --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc virtual/rust
EOF
catalyst_stage_default
}

2
build_library/catalyst_toolchains.sh
View File

@ -39,7 +39,7 @@ build_target_toolchain() {
export clst_myemergeopts="$( echo "$clst_myemergeopts" | sed -e 's/--newuse//' )"
PORTAGE_CONFIGROOT="$ROOT" \
run_merge --root="$ROOT" --sysroot="$ROOT" dev-lang/rust
run_merge --root="$ROOT" --sysroot="$ROOT" virtual/rust
}
configure_crossdev_overlay / /tmp/crossdev

4
build_library/toolchain_util.sh
View File

@ -335,9 +335,9 @@ install_cross_toolchain() {
# because the standard Rust packages don't include the arm64 cross target.
FILTERED="$(echo $PORTAGE_BINHOST | tr ' ' '\n' | grep toolchain | sed 's#toolchain/#toolchain-arm64/#g' | xargs echo)"
# If no aarch64 folder exists, try to remove any existing Rust packages.
[ ! -d /usr/lib/rust-*/rustlib/aarch64-unknown-linux-gnu ] && ($sudo emerge -C dev-lang/rust || true)
[ ! -d /usr/lib/rust-*/rustlib/aarch64-unknown-linux-gnu ] && ($sudo emerge -C virtual/rust dev-lang/rust || true)
# Building from source is also ok because the cross-compiler got installed.
$sudo PORTAGE_BINHOST="$FILTERED" emerge "${emerge_flags[@]}" dev-lang/rust
$sudo PORTAGE_BINHOST="$FILTERED" emerge "${emerge_flags[@]}" virtual/rust
fi
fi