Skip to content

Allow overriding the physical memory offset through an environment variable - #58

Merged
bors[bot] merged 4 commits into
masterfrom
override-phys_mem_offset
Jun 24, 2019
Merged

Allow overriding the physical memory offset through an environment variable#58
bors[bot] merged 4 commits into
masterfrom
override-phys_mem_offset

Conversation

@phil-opp

@phil-opp phil-opp commented Jun 21, 2019

Copy link
Copy Markdown
Member

The plan is that the bootimage crate gets an additional Cargo.toml config key for this property and sets the environment variable automatically.

cc @64

@64

64 commented Jun 21, 2019

Copy link
Copy Markdown
Contributor

Looks great! Thanks.

@phil-opp

Copy link
Copy Markdown
Member Author

bors r+

@bors

bors Bot commented Jun 24, 2019

Copy link
Copy Markdown
Contributor

Merge conflict (retrying...)

bors Bot added a commit that referenced this pull request Jun 24, 2019
58: Allow overriding the physical memory offset through an environment variable r=phil-opp a=phil-opp

The plan is that the `bootimage` crate gets an additional `Cargo.toml` config key for this property and sets the environment variable automatically.

cc @64

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
@bors

bors Bot commented Jun 24, 2019

Copy link
Copy Markdown
Contributor

Build failed

  • rust-osdev.bootloader

@phil-opp

Copy link
Copy Markdown
Member Author

Seems spurious (chocolatey timeout)

bors retry

bors Bot added a commit that referenced this pull request Jun 24, 2019
58: Allow overriding the physical memory offset through an environment variable r=phil-opp a=phil-opp

The plan is that the `bootimage` crate gets an additional `Cargo.toml` config key for this property and sets the environment variable automatically.

cc @64

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
@bors

bors Bot commented Jun 24, 2019

Copy link
Copy Markdown
Contributor

Build failed

  • rust-osdev.bootloader

@phil-opp

Copy link
Copy Markdown
Member Author

@phil-opp

Copy link
Copy Markdown
Member Author

Seems to be working again

bors retry

bors Bot added a commit that referenced this pull request Jun 24, 2019
58: Allow overriding the physical memory offset through an environment variable r=phil-opp a=phil-opp

The plan is that the `bootimage` crate gets an additional `Cargo.toml` config key for this property and sets the environment variable automatically.

cc @64

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
@bors

bors Bot commented Jun 24, 2019

Copy link
Copy Markdown
Contributor

Build succeeded

  • rust-osdev.bootloader

@bors
bors Bot merged commit a9b8d89 into master Jun 24, 2019
@bors
bors Bot deleted the override-phys_mem_offset branch June 24, 2019 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants