elfein
/
ableos
forked from AbleOS/ableos
1
0
Fork 0
Code Pull Requests Activity

Moved hardcoded repbuild file includes to system_config (toml)

exes_in_sysconfig
elfeiin 2024-04-23 21:02:54 -07:00
parent 43cc7ab636
commit d63ef6c597
Signed by: elfein
GPG Key ID: A53FDD4FD091A276
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
repbuild/src/main.rs
View File

@ -260,18 +260,8 @@ TERM_BACKDROP={}
.attach_printable("Copying Limine (ARM): have you pulled the submodule?")?,
&mut bootdir.create_file("bootaa64.efi")?,
)?;
// TODO: Remove this and replace it with pulling executables from the system_config
for fpath in [
"sysdata/background.bmp",
"target/test-programs/failure.hbf",
"target/test-programs/ecall.hbf",
"target/test-programs/main.hbf",
"target/test-programs/serial_driver.hbf",
"target/test-programs/vfs_test.hbf",
"target/test-programs/sds_test.hbf",
"target/test-programs/limine_framebuffer_driver.hbf",
"target/test-programs/keyboard_driver.hbf",
] {
let to_copy = data.get("bundle").unwrap_or(Value::Array(vec![])).as_array().unwrap();
for fpath in to_copy {
let path = Path::new(fpath);
io::copy(
&mut File::open(path)?,

12
sysdata/system_config.toml
View File

@ -48,3 +48,15 @@ cmd_line = "height=10 width=10 arch=${ARCH}"
[boot.limine.ableos.modules.serial_driver]
path = "boot:///serial_driver.hbf"
cmd_line = "arch=${ARCH}"
bundle = [
"sysdata/background.bmp",
"target/test-programs/failure.hbf",
"target/test-programs/ecall.hbf",
"target/test-programs/main.hbf",
"target/test-programs/serial_driver.hbf",
"target/test-programs/vfs_test.hbf",
"target/test-programs/sds_test.hbf",
"target/test-programs/limine_framebuffer_driver.hbf",
"target/test-programs/keyboard_driver.hbf"
]