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

build_library/catalyst: Update virtual/rust during catalyst stage1

Browse Source 
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 also `virtual/rust` when building stage1. Since `virtual/rust`
automatically pulls in `dev-lang/rust`, we do not need to explicitly
specify `dev-lang/rust` here.
This commit is contained in:
Dongsu Park 2020-06-10 17:41:11 +02:00
parent c666ae5614
commit 8047522874
1 changed files with 9 additions and 0 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 # stage1 packages aren't published, save in tmp
pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages
update_seed: yes 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 EOF
catalyst_stage_default catalyst_stage_default
} }