forked from koniifer/ableos
edits to support multi-arch iso
This commit is contained in:
parent
29bcce58b3
commit
ada43910d2
|
@ -12,7 +12,7 @@ TERM_BACKDROP=008080
|
||||||
:AbleOS
|
:AbleOS
|
||||||
COMMENT=Default AbleOS boot entry.
|
COMMENT=Default AbleOS boot entry.
|
||||||
PROTOCOL=limine
|
PROTOCOL=limine
|
||||||
KERNEL_PATH=${ABLEOS_KERNEL}
|
KERNEL_PATH=${ABLEOS_KERNEL}_${ARCH}
|
||||||
# execute is an array of boot modules to execute
|
# execute is an array of boot modules to execute
|
||||||
KERNEL_CMDLINE="execute=[0,1]"
|
KERNEL_CMDLINE="execute=[0,1]"
|
||||||
# Setting a default resolution for the framebuffer
|
# Setting a default resolution for the framebuffer
|
||||||
|
|
|
@ -147,10 +147,17 @@ fn build(release: bool, target: Target) -> Result<(), Error> {
|
||||||
_ => (),
|
_ => (),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let mut path: String = "kernel".to_string();
|
||||||
let kernel_dir = match target {
|
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::Riscv64Virt => "target/riscv64-virt-ableos",
|
||||||
Target::Aarch64 => "target/aarch64-virt-ableos",
|
Target::Aarch64 => {
|
||||||
|
path.push_str("_aarch64");
|
||||||
|
"target/aarch64-virt-ableos"
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
(|| -> std::io::Result<_> {
|
(|| -> std::io::Result<_> {
|
||||||
|
@ -160,7 +167,7 @@ fn build(release: bool, target: Target) -> Result<(), Error> {
|
||||||
.join(if release { "release" } else { "debug" })
|
.join(if release { "release" } else { "debug" })
|
||||||
.join("kernel"),
|
.join("kernel"),
|
||||||
)?,
|
)?,
|
||||||
&mut fs.root_dir().create_file("kernel")?,
|
&mut fs.root_dir().create_file(&path)?,
|
||||||
)
|
)
|
||||||
.map(|_| ())
|
.map(|_| ())
|
||||||
})()
|
})()
|
||||||
|
|
Loading…
Reference in a new issue