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

bootstrap_sdk: skip uploading non-existent directory to fix Rust builds

Browse Source 
Previously before https://github.com/kinvolk/flatcar-scripts/pull/134,
`bootstrap_sdk` was looking at the wrong path
(/usr/lib/rust-*/rustlib/aarch64-unknown-linux-gnu instead of
/usr/lib/rustlib/aarch64-unknown-linux-gnu). As a result, Rust got always
removed and rebuilt in `install_cross_rust`, which resulted in
`flatcar-sdk/crossdev/dev-lang/rust/rust-1.54.0-1.xpak` being created.

Now legitimate changes of https://github.com/kinvolk/flatcar-scripts/pull/134
prevent the rebuild from happening. The path already exists in a stage4
SDK build, because the seed stage already has cross-compilers so the
Rust upgrade has all the right cross-paths.

That's why SDK builds with only stage4 failed when it tries uploading Rust
packages like the following. On the other hand, full SDK builds with stage1
to 4 worked well, because in that case Rust is rebuilt anyway.

```
INFO    bootstrap_sdk: Uploading cross toolchain packages to
gs://flatcar-jenkins/developer/sdk/amd64/2021.08.04+dev-flatcar-master-3209
CommandException: No URLs matched:
/mnt/host/source/src/build/catalyst/packages/flatcar-sdk/crossdev/*
CommandException: No URLs matched:
/tmp/tmp.xyjXbCFhUc//mnt/host/source/src/build/catalyst/packages/flatcar-sdk/crossdev/*.sig
CommandException: 2 files/objects could not be transferred.
```

To fix that, we have to skip uploading packages when the crossdev
directory does not exist.

Debugged and suggested by @jepio
This commit is contained in:
Dongsu Park 2021-08-09 16:32:32 +02:00
parent a8a57c733b
commit 4d59b8715b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap_sdk
View File

@ -233,9 +233,11 @@ if [[ "$STAGES" =~ stage4 ]]; then
sign_and_upload_files "packages" "${def_upload_path}" "pkgs/" \ sign_and_upload_files "packages" "${def_upload_path}" "pkgs/" \
"${BINPKGS}"/* "${BINPKGS}"/*
# Upload the SDK toolchain packages if [ -d "${BINPKGS}/crossdev" ]; then
sign_and_upload_files "cross toolchain packages" "${def_upload_path}" \ # Upload the SDK toolchain packages
"toolchain/" "${BINPKGS}/crossdev"/* sign_and_upload_files "cross toolchain packages" "${def_upload_path}" \
"toolchain/" "${BINPKGS}/crossdev"/*
fi
fi fi
command_completed command_completed