Skip to content

Commit be55b09

Browse files
committed
Remove bootimage version placeholders
1 parent 51a3223 commit be55b09

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You need a nightly [Rust](https://www.rust-lang.org) compiler and [cargo xbuild]
3838

3939
## Build
4040

41-
The simplest way to use the bootloader is in combination with the [bootimage](https://github.com/rust-osdev/bootimage) tool. This crate **requires at least bootimage PLACEHOLDER**. With the tool installed, you can add a normal cargo dependency on the `bootloader` crate to your kernel and then run `bootimage build` to create a bootable disk image. You can also execute `bootimage run` to run your kernel in [QEMU](https://www.qemu.org/) (needs to be installed).
41+
The simplest way to use the bootloader is in combination with the [bootimage](https://github.com/rust-osdev/bootimage) tool. This crate **requires at least bootimage 0.7.7**. With the tool installed, you can add a normal cargo dependency on the `bootloader` crate to your kernel and then run `bootimage build` to create a bootable disk image. You can also execute `bootimage run` to run your kernel in [QEMU](https://www.qemu.org/) (needs to be installed).
4242

4343
To compile the bootloader manually, you need to invoke `cargo xbuild` with two environment variables:
4444
* `KERNEL`: points to your kernel executable (in the ELF format)

Diff for: azure-pipelines.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ steps:
9696

9797
- script: cargo xbuild --bin bootloader --features binary --release
9898
displayName: 'Build Bootloader'
99-
env: { KERNEL: "test-kernel/target/x86_64-test-kernel/debug/test-kernel" }
99+
env:
100+
KERNEL: "test-kernel/target/x86_64-test-kernel/debug/test-kernel"
101+
KERNEL_MANIFEST: "test-kernel/Cargo.toml"
100102

101103
- script: cargo objcopy -- -I elf64-x86-64 -O binary --binary-architecture=i386:x86-64 target/x86_64-bootloader/release/bootloader target/x86_64-bootloader/release/bootloader.bin
102104
displayName: 'Convert Bootloader ELF to Binary'

Diff for: build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ fn main() {
239239
match env::var("KERNEL_MANIFEST") {
240240
Err(env::VarError::NotPresent) => {
241241
panic!("The KERNEL_MANIFEST environment variable must be set for building the bootloader.\n\n\
242-
If you use `bootimage` for building you need at least version PLACEHOLDER. You can \
242+
If you use `bootimage` for building you need at least version 0.7.7. You can \
243243
update `bootimage` by running `cargo install bootimage --force`.");
244244
}
245245
Err(env::VarError::NotUnicode(_)) => {

0 commit comments

Comments
 (0)