Remove mtools dependency

README.md

@@ -5,7 +5,7 @@ Mostly made for learning purposes, no real-world application.
 ![xernel](status_quo.png)
 
 ## Building
-For building, you simply need a working Rust installation with the nightly toolchain installed and the `mtools` package which we use for the generation of the disk image.
+For building, you simply need a working Rust installation with the nightly toolchain installed.
 We use xtask as our workflow for building and running the kernel.
 Therefore, the command `cargo kernel` is used.
 

build/xtask/Cargo.toml

@@ -11,3 +11,4 @@ pico-args = "0.5.0"
 anyhow = "1"
 wsl = "0.1.0"
 dotenv = "0.15.0"
+fatfs = "0.3.6"

build/xtask/src/main.rs

@@ -1,8 +1,10 @@
 use anyhow::{bail, Result};
 use dotenv::dotenv;
+use fatfs::{format_volume, FormatVolumeOptions};
 use pico_args::Arguments;
-use std::env;
+use std::io::{Cursor, Read, Seek, Write};
 use std::path::{Path, PathBuf};
+use std::{env, fs, vec};
 use xshell::{cmd, Shell};
 
 const HELP: &str = "\
@@ -85,14 +87,7 @@ fn build(sh: &Shell, rl: bool, mut args: Arguments) -> Result<()> {
         .opt_value_from_str::<_, String>("--target")?
         .unwrap_or_else(|| "x86_64".to_string());
 
-    if !Path::new(
-        sh.current_dir()
-            .as_path()
-            .join("xernel/kernel/limine")
-            .as_path(),
-    )
-    .exists()
-    {
+    if !Path::new(sh.current_dir().as_path().join("xernel/kernel/limine").as_path()).exists() {
         sh.change_dir(sh.current_dir().as_path().join("xernel/kernel"));
         cmd!(
             sh,
@@ -121,34 +116,29 @@ fn build(sh: &Shell, rl: bool, mut args: Arguments) -> Result<()> {
     let build_dir = if rl { "release" } else { "debug" };
 
     let diskname = "xernel.hdd";
-    let disksize = 64.to_string();
 
-    cmd!(
-        sh,
-        "dd if=/dev/zero of={diskname} bs=1M count=0 seek={disksize}"
-    )
-    .run()?;
+    let data_vec = vec![0_u8; 64 * 1024 * 1024];
+    let mut disk = Cursor::new(data_vec);
 
-    cmd!(sh, "mformat -i {diskname} -F").run()?;
-    cmd!(
-        sh,
-        "mcopy -i {diskname} ./target/{target}/{build_dir}/xernel ::/xernel"
-    )
-    .run()?;
-    cmd!(
-        sh,
-        "mcopy -i {diskname} xernel/kernel/limine.cfg ::/limine.cfg"
-    )
-    .run()?;
+    format_volume(&mut disk, FormatVolumeOptions::new().fat_type(fatfs::FatType::Fat32))?;
 
-    cmd!(sh, "mcopy -i {diskname} ./logo.bmp ::/logo.bmp").run()?;
-    cmd!(sh, "mmd -i {diskname} ::/EFI").run()?;
-    cmd!(sh, "mmd -i {diskname} ::/EFI/BOOT").run()?;
-    cmd!(
-        sh,
-        "mcopy -i {diskname} xernel/kernel/limine/BOOTX64.EFI ::/EFI/BOOT"
-    )
-    .run()?;
+    let fs = fatfs::FileSystem::new(&mut disk, fatfs::FsOptions::new())?;
+    {
+        let root_dir = fs.root_dir();
+
+        copy_to_image(&root_dir, &format!("./target/{target}/{build_dir}/xernel"), "xernel")?;
+
+        copy_to_image(&root_dir, "./xernel/kernel/limine.cfg", "limine.cfg")?;
+        copy_to_image(&root_dir, "./logo.bmp", "logo.bmp")?;
+
+        let dir = root_dir.create_dir("EFI")?;
+        let dir = dir.create_dir("BOOT")?;
+
+        copy_to_image(&dir, "./xernel/kernel/limine/BOOTX64.EFI", "BOOTX64.EFI")?;
+    }
+    fs.unmount()?;
+
+    fs::write(diskname, disk.into_inner())?;
 
     Ok(())
 }
@@ -159,10 +149,7 @@ fn run(sh: &Shell, gdb: bool, mut args: Arguments) -> Result<()> {
     let ram = args
         .opt_value_from_str::<_, String>("--ram")?
         .unwrap_or_else(|| "128M".to_string());
-    let cpus = args
-        .opt_value_from_str::<_, u32>("--cpus")?
-        .unwrap_or(2)
-        .to_string();
+    let cpus = args.opt_value_from_str::<_, u32>("--cpus")?.unwrap_or(2).to_string();
 
     let kvm = if args.contains("--kvm") {
         &["-enable-kvm"]
@@ -174,10 +161,7 @@ fn run(sh: &Shell, gdb: bool, mut args: Arguments) -> Result<()> {
 
     let qemu_in_wsl_arg = args.contains("--wsl-qemu");
 
-    let qemu_in_wsl_env = env::var("qemu_in_wsl")
-        .unwrap_or("false".to_string())
-        .parse()
-        .unwrap();
+    let qemu_in_wsl_env = env::var("qemu_in_wsl").unwrap_or("false".to_string()).parse().unwrap();
 
     let qemu_in_wsl = qemu_in_wsl_arg || qemu_in_wsl_env;
 
@@ -242,3 +226,11 @@ fn root() -> PathBuf {
     path.pop();
     path
 }
+
+fn copy_to_image<T: Seek + Write + Read>(dir: &fatfs::Dir<T>, src_path: &str, dst_path: &str) -> Result<()> {
+    let data = fs::read(src_path)?;
+
+    dir.create_file(dst_path)?.write_all(&data)?;
+
+    Ok(())
+}