Skip to content

Commit 16f248f

Browse files
authored
Merge pull request #1637 from rust-osdev/bishop-update-ovmf-r2
xtask: Update OVMF release to EDK2_STABLE202502_R2
2 parents f1141b9 + 2edbbba commit 16f248f

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

Diff for: Cargo.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: xtask/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ itertools = "0.14.0"
1515
log.workspace = true
1616
mbrman = "0.5.1"
1717
nix = { version = "0.29.0", default-features = false, features = ["fs"] }
18-
ovmf-prebuilt = "0.2.0"
18+
ovmf-prebuilt = "0.2.3"
1919
proc-macro2 = { version = "1.0.46", features = ["span-locations"] }
2020
quote = "1.0.21"
2121
regex = "1.10.2"

Diff for: xtask/src/qemu.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@ use tempfile::TempDir;
2020
#[cfg(target_os = "linux")]
2121
use {std::fs::Permissions, std::os::unix::fs::PermissionsExt};
2222

23-
/// Name of the ovmf-prebuilt release tag.
24-
const OVMF_PREBUILT_TAG: &str = "edk2-stable202402-r1";
25-
26-
/// SHA-256 hash of the release tarball.
27-
const OVMF_PREBUILT_HASH: &str = "91f3148ef146794241c77810a49cfa3e925c83eb55c5cc90f34718cc1b10e9eb";
23+
/// Name of the ovmf-prebuilt release to use by default.
24+
const OVMF_PREBUILT_SOURCE: Source = Source::EDK2_STABLE202502_R2;
2825

2926
/// Directory into which the prebuilts will be download (relative to the repo root).
3027
const OVMF_PREBUILT_DIR: &str = "target/ovmf";
@@ -104,13 +101,7 @@ impl OvmfPaths {
104101
);
105102
}
106103
} else {
107-
let prebuilt = Prebuilt::fetch(
108-
Source {
109-
tag: OVMF_PREBUILT_TAG,
110-
sha256: OVMF_PREBUILT_HASH,
111-
},
112-
OVMF_PREBUILT_DIR,
113-
)?;
104+
let prebuilt = Prebuilt::fetch(OVMF_PREBUILT_SOURCE, OVMF_PREBUILT_DIR)?;
114105

115106
Ok(prebuilt.get_file(arch.into(), file_type))
116107
}

0 commit comments

Comments
 (0)