koniifer/ableos
1
1
Fork 1
forked from AbleOS/ableos
Code Pull requests Activity

edits to support multi-arch iso

Browse source
This commit is contained in:
able 2023-09-20 12:26:36 -05:00
parent 29bcce58b3
commit ada43910d2
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
repbuild/limine.cfg
View file

@ -12,7 +12,7 @@ TERM_BACKDROP=008080
:AbleOS
COMMENT=Default AbleOS boot entry.
PROTOCOL=limine
KERNEL_PATH=${ABLEOS_KERNEL}
KERNEL_PATH=${ABLEOS_KERNEL}_${ARCH}
# execute is an array of boot modules to execute
KERNEL_CMDLINE="execute=[0,1]"
# Setting a default resolution for the framebuffer

13
repbuild/src/main.rs
View file

@ -147,10 +147,17 @@ fn build(release: bool, target: Target) -> Result<(), Error> {
_ => (),
}
let mut path: String = "kernel".to_string();
let kernel_dir = match target {
Target::X86_64 => "target/x86_64-ableos",
Target::X86_64 => {
path.push_str("_x86-64");
"target/x86_64-ableos"
}
Target::Riscv64Virt => "target/riscv64-virt-ableos",
Target::Aarch64 => "target/aarch64-virt-ableos",
Target::Aarch64 => {
path.push_str("_aarch64");
"target/aarch64-virt-ableos"
}
};
(|| -> std::io::Result<_> {
@ -160,7 +167,7 @@ fn build(release: bool, target: Target) -> Result<(), Error> {
.join(if release { "release" } else { "debug" })
.join("kernel"),
)?,
&mut fs.root_dir().create_file("kernel")?,
&mut fs.root_dir().create_file(&path)?,
)
.map(|_| ())
})()