diff --git a/Cargo.lock b/Cargo.lock index cecdca65..340058a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -951,7 +951,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fbuild-bench-fastled-examples" -version = "2.5.19" +version = "2.5.20" dependencies = [ "fbuild-core", "fbuild-library-select", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "fbuild-build" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "blake3", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "fbuild-build-arm" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "blake3", @@ -1036,7 +1036,7 @@ dependencies = [ [[package]] name = "fbuild-build-engine" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "blake3", @@ -1069,7 +1069,7 @@ dependencies = [ [[package]] name = "fbuild-build-esp" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "blake3", @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "fbuild-build-mcu" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "blake3", @@ -1137,7 +1137,7 @@ dependencies = [ [[package]] name = "fbuild-cli" -version = "2.5.19" +version = "2.5.20" dependencies = [ "blake3", "clap", @@ -1169,7 +1169,7 @@ dependencies = [ [[package]] name = "fbuild-config" -version = "2.5.19" +version = "2.5.20" dependencies = [ "fbuild-core", "fbuild-paths", @@ -1184,7 +1184,7 @@ dependencies = [ [[package]] name = "fbuild-core" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "fs2", @@ -1211,7 +1211,7 @@ dependencies = [ [[package]] name = "fbuild-daemon" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "axum", @@ -1248,7 +1248,7 @@ dependencies = [ [[package]] name = "fbuild-deploy" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "espflash", @@ -1276,7 +1276,7 @@ dependencies = [ [[package]] name = "fbuild-header-scan" -version = "2.5.19" +version = "2.5.20" dependencies = [ "criterion", "fbuild-paths", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "fbuild-library" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "axum", @@ -1317,7 +1317,7 @@ dependencies = [ [[package]] name = "fbuild-library-select" -version = "2.5.19" +version = "2.5.20" dependencies = [ "bincode", "blake3", @@ -1338,7 +1338,7 @@ dependencies = [ [[package]] name = "fbuild-packages" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "axum", @@ -1370,7 +1370,7 @@ dependencies = [ [[package]] name = "fbuild-packages-fetch" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "axum", @@ -1399,7 +1399,7 @@ dependencies = [ [[package]] name = "fbuild-paths" -version = "2.5.19" +version = "2.5.20" dependencies = [ "blake3", "fbuild-core", @@ -1411,7 +1411,7 @@ dependencies = [ [[package]] name = "fbuild-python" -version = "2.5.19" +version = "2.5.20" dependencies = [ "base64", "fbuild-core", @@ -1433,7 +1433,7 @@ dependencies = [ [[package]] name = "fbuild-serial" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "base64", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "fbuild-test-support" -version = "2.5.19" +version = "2.5.20" dependencies = [ "fbuild-config", "fbuild-core", @@ -1476,7 +1476,7 @@ dependencies = [ [[package]] name = "fbuild-toolchain" -version = "2.5.19" +version = "2.5.20" dependencies = [ "async-trait", "axum", diff --git a/Cargo.toml b/Cargo.toml index 373f1913..098b8d11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ exclude = [ libraries = [{ path = "dylints/*" }] [workspace.package] -version = "2.5.19" +version = "2.5.20" edition = "2021" rust-version = "1.95.0" license = "AGPL-3.0-only" diff --git a/crates/fbuild-toolchain/src/toolchain/esp_qemu_runtime.rs b/crates/fbuild-toolchain/src/toolchain/esp_qemu_runtime.rs index 573f436e..90cb54fe 100644 --- a/crates/fbuild-toolchain/src/toolchain/esp_qemu_runtime.rs +++ b/crates/fbuild-toolchain/src/toolchain/esp_qemu_runtime.rs @@ -167,13 +167,13 @@ fn runtime_arch(host: HostPlatform) -> Result<&'static str> { /// SHA-256 of each published bundle. An architecture without an entry has no /// bundle yet: report that plainly instead of downloading something unpinned. /// -/// aarch64 is built by `.github/workflows/qemu-runtime-bundle.yml` on a native -/// arm64 runner — Docker Desktop's arm64 emulation cannot run dpkg's -/// maintainer scripts, so it cannot be produced from an x86_64 developer -/// workstation the way the x86_64 bundle was. +/// Both are built by `.github/workflows/qemu-runtime-bundle.yml`; aarch64 needs +/// its native arm64 runner because Docker Desktop's arm64 emulation cannot run +/// dpkg's maintainer scripts. fn runtime_sha256(arch: &str) -> Result<&'static str> { match arch { "x86_64" => Ok("b3318ccf60df8e17a42b5b0f61180440f56337fadb0babe867bff1f3dfecd99f"), + "aarch64" => Ok("1782782a25f1a375c03bcdc1aafb7444f46d5f2fa40d66793dd530b76c62da0a"), other => Err(FbuildError::PackageError(format!( "no QEMU runtime-library bundle is published for linux-{other} yet (tracked in the {RUNTIME_RELEASE_TAG} release).\n\ Install the QEMU runtime libraries from your distribution — on Debian/Ubuntu: libslirp0, libsdl2-2.0-0, libpixman-1-0." diff --git a/pyproject.toml b/pyproject.toml index 18f4d399..9cd0f26d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "fbuild" -version = "2.5.19" +version = "2.5.20" description = "PlatformIO-compatible embedded build tool (Rust implementation)" readme = "README.md" license = "AGPL-3.0-only"