Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse bootloader configuration from kernel's Cargo.toml #73

Merged
merged 5 commits into from Aug 6, 2019

Conversation

@64
Copy link
Contributor

commented Aug 5, 2019

As discussed in rust-osdev/bootimage#44.

Requires support from the bootimage crate (so it knows where to find the kernel's Cargo.toml), and is also a breaking change as it removes support for the old environment variable BOOTLOADER_PHYSICAL_MEMORY_OFFSET.

@64

This comment has been minimized.

Copy link
Contributor Author

commented Aug 5, 2019

CI fails as expected since the bootimage crate doesn't pass KERNEL_MANIFEST right now.

README.md Outdated Show resolved Hide resolved
build.rs Outdated Show resolved Hide resolved
Copy link
Member

left a comment

Looks very good to me, thanks a lot!

The CI uses the manual build process instead of bootimage, so we need to update the azure-pipelines.yml to additionally pass the new KERNEL_MANIFEST environment variable. The relevant line is:

env: { KERNEL: "test-kernel/target/x86_64-test-kernel/debug/test-kernel" }

@64

This comment has been minimized.

Copy link
Contributor Author

commented Aug 6, 2019

Let me fix that warning...

@phil-opp

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

Thanks!

@phil-opp phil-opp merged commit 31b6ef1 into rust-osdev:master Aug 6, 2019
4 checks passed
4 checks passed
rust-osdev.bootloader Build #20190806.2 succeeded
Details
rust-osdev.bootloader (Job linux) Job linux succeeded
Details
rust-osdev.bootloader (Job mac) Job mac succeeded
Details
rust-osdev.bootloader (Job windows) Job windows succeeded
Details
phil-opp added a commit that referenced this pull request Aug 7, 2019
@phil-opp

This comment has been minimized.

Copy link
Member

commented Aug 7, 2019

Published as version 0.8.0

@64 64 deleted the 64:parse-toml branch Sep 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.