Add basic example

- showcase an OS that boots a minimal kernel using bootloader
- update usage guides

Signed-off-by: Pepper Gray <hello@peppergray.xyz>

Author: peppergrayxyz

.github/workflows/ci.yml

@@ -85,6 +85,26 @@ jobs:
         if: runner.os == 'Linux'
         run: cargo test --no-default-features --features bios
 
+  examples:
+    name: Build examples
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Swatinem/rust-cache@v2
+      - uses: r7kamura/rust-problem-matchers@v1.1.0
+      - name: Install QEMU (Linux)
+        run: sudo apt update && sudo apt install qemu-system-x86
+      - name: "Build basic example"
+        run: cargo build
+        working-directory: examples/basic
+      - name: "Run basic example (bios)"
+        run: cargo run -- bios || [ $? -eq 33 ]
+        working-directory: docs/tutorial
+      - name: "Run basic example (uefi)"
+        run: cargo run -- uefi || [ $? -eq 33 ]
+        working-directory: docs/tutorial
+
   fmt:
     name: Check Formatting
     runs-on: ubuntu-latest

README.md

@@ -14,12 +14,21 @@ You need a nightly [Rust](https://www.rust-lang.org) compiler with the `llvm-too
 
 To use this crate, you need to adjust your kernel to be bootable first. Then you can create a bootable disk image from your compiled kernel. These steps are explained in detail below.
 
+### Migrating from older bootloader version
+
 If you're already using an older version of the `bootloader` crate, follow our [migration guides](docs/migration).
 
-### Kernel
+### Starting from scratch
+
+Our [basic example](examples/basic/basic-os.md) showcases an OS that boots a minimal kernel using `bootloader`.
+
+### Using an existing kernel
 
-To make your kernel compatible with `bootloader`:
+To combine your kernel with `bootloader` and create a bootable disk image, follow these steps:
 
+#### Make your kernel compatible with `bootloader`
+
+- Move your full kernel code into a `kernel` subdirectory.
 - Add a dependency on the `bootloader_api` crate in your kernel's `Cargo.toml`.
 - Your kernel binary should be `#![no_std]` and `#![no_main]`.
 - Define an entry point function with the signature `fn kernel_main(boot_info: &'static mut bootloader_api::BootInfo) -> !`. The function name can be arbitrary.
@@ -35,37 +44,56 @@ To make your kernel compatible with `bootloader`:
     };
     bootloader_api::entry_point!(kernel_main, config = &CONFIG);
     ```
-- Compile your kernel to an ELF executable by running **`cargo build --target x86_64-unknown-none`**. You might need to run `rustup target add x86_64-unknown-none` before to download precompiled versions of the `core` and `alloc` crates.
+- Compile your kernel to an ELF executable by running **`cargo build --target x86_64-unknown-none`**. You might need to run `rustup target add x86_64-unknown-none` before to download precompiled versions of the `core` and `alloc` crates. You can add `x86_64-unknown-none` as default target and add it to your toolchain so that `cargo build` takes care of this.
+    ```toml
+    # .cargo/config.toml
+    [build]
+    target = "x86_64-unknown-none"
+    ```
+    ```sh
+    $ cargo build
+    ```
 - Thanks to the `entry_point` macro, the compiled executable contains a special section with metadata and the serialized config, which will enable the `bootloader` crate to load it.
 
-### Booting
-
-To combine your kernel with a bootloader and create a bootable disk image, follow these steps:
+#### Setup the workspace
 
-- Move your full kernel code into a `kernel` subdirectory.
 - Create a new `os` crate at the top level that defines a [workspace](https://doc.rust-lang.org/cargo/reference/workspaces.html).
-- Add a `build-dependencies` on the `bootloader` crate.
-- Create a [`build.rs`](https://doc.rust-lang.org/cargo/reference/build-scripts.html) build script.
-- Set up an [artifact dependency](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies) to add your `kernel` crate as a `build-dependency`:
-  ```toml
-  # in Cargo.toml
-  [build-dependencies]
-  kernel = { path = "kernel", artifact = "bin", target = "x86_64-unknown-none" }
-  ```
-  ```toml
-  # .cargo/config.toml
-
-  [unstable]
-  # enable the unstable artifact-dependencies feature, see
-  # https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies
-  bindeps = true
-  ```
-  Alternatively, you can use [`std::process::Command`](https://doc.rust-lang.org/stable/std/process/struct.Command.html) to invoke the build command of your kernel in the `build.rs` script. 
-- Obtain the path to the kernel executable. When using an artifact dependency, you can retrieve this path using `std::env::var_os("CARGO_BIN_FILE_MY_KERNEL_my-kernel")`
-- Use `bootloader::UefiBoot` and/or `bootloader::BiosBoot` to create a bootable disk image with your kernel.
+    ```sh
+    $ cargo new os --bin
+    ```
+- Add your kernel as a workspace member 
+    ```toml
+    # in Cargo.toml
+    [workspace]
+    resolver = "3"
+    members = ["kernel"]
+    ```
+- Enable the workspace to build your kernel:
+  - Set up an [artifact dependency](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies) to add your `kernel` crate as a `build-dependency`:
+      ```toml
+      # in Cargo.toml
+      [build-dependencies]
+      kernel = { path = "kernel", artifact = "bin", target = "x86_64-unknown-none" }
+      ```
+      Enable the unstable artifact-dependencies feature:
+      ```toml
+      # .cargo/config.toml
+      [unstable]
+      bindeps = true
+      ```
+      Experimental features are only available on the nightly channel:
+      ```toml
+      # rust-toolchain.toml
+      [toolchain]
+      channel = "nightly"
+      targets = ["x86_64-unknown-none"]
+      ```
+  - Alternatively, you can use [`std::process::Command`](https://doc.rust-lang.org/stable/std/process/struct.Command.html) to invoke the build command of your kernel in the `build.rs` script. 
+- Create a [`build.rs`](https://doc.rust-lang.org/cargo/reference/build-scripts.html) build script in the `os` crate. See our [disk image creation template](docs/create-disk-image.md) for a more detailed example.
+  - Obtain the path to the kernel executable. When using an artifact dependency, you can retrieve this path using `std::env::var_os("CARGO_BIN_FILE_MY_KERNEL_my-kernel")`
+  - Use `bootloader::UefiBoot` and/or `bootloader::BiosBoot` to create a bootable disk image with your kernel.
 - Do something with the bootable disk images in your `main.rs` function. For example, run them with QEMU.
-
-See our [disk image creation template](docs/create-disk-image.md) for a more detailed example.
+  
 
 ## Architecture
 

docs/create-disk-image.md

@@ -5,83 +5,18 @@ The [`bootloader`](https://docs.rs/bootloader/0.11) crate provides simple functi
 A good way to implement this is to move your kernel into a `kernel` subdirectory. Then you can create 
 a new `os` crate at the top level that defines a [workspace](https://doc.rust-lang.org/cargo/reference/workspaces.html). The root package has build-dependencies on the `kernel` [artifact](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies) and on the bootloader crate. This allows you to create the bootable disk image in a [cargo build script](https://doc.rust-lang.org/cargo/reference/build-scripts.html) and launch the created image in QEMU in the `main` function.
 
-The files could look like this:
-
-```toml
-# .cargo/config.toml
-
-[unstable]
-# enable the unstable artifact-dependencies feature, see
-# https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies
-bindeps = true
-```
-
-```toml
-# Cargo.toml
-
-[package]
-name = "os"         # or any other name
-version = "0.1.0"
-
-[build-dependencies]
-bootloader = "0.11"
-test-kernel = { path = "kernel", artifact = "bin", target = "x86_64-unknown-none" }
-
-[dependencies]
-# used for UEFI booting in QEMU
-ovmf-prebuilt = "0.1.0-alpha.1"
-
-[workspace]
-members = ["kernel"]
-```
-
-```rust
-// build.rs
-
-use std::path::PathBuf;
-
-fn main() {
-    // set by cargo, build scripts should use this directory for output files
-    let out_dir = PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
-    // set by cargo's artifact dependency feature, see
-    // https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies
-    let kernel = PathBuf::from(std::env::var_os("CARGO_BIN_FILE_KERNEL_kernel").unwrap());
-
-    // create an UEFI disk image (optional)
-    let uefi_path = out_dir.join("uefi.img");
-    bootloader::UefiBoot::new(&kernel).create_disk_image(&uefi_path).unwrap();
-
-    // create a BIOS disk image
-    let bios_path = out_dir.join("bios.img");
-    bootloader::BiosBoot::new(&kernel).create_disk_image(&bios_path).unwrap();
-
-    // pass the disk image paths as env variables to the `main.rs`
-    println!("cargo:rustc-env=UEFI_PATH={}", uefi_path.display());
-    println!("cargo:rustc-env=BIOS_PATH={}", bios_path.display());
-}
-```
-
-```rust
-// src/main.rs
-
-fn main() {
-    // read env variables that were set in build script
-    let uefi_path = env!("UEFI_PATH");
-    let bios_path = env!("BIOS_PATH");
-    
-    // choose whether to start the UEFI or BIOS image
-    let uefi = true;
-
-    let mut cmd = std::process::Command::new("qemu-system-x86_64");
-    if uefi {
-        cmd.arg("-bios").arg(ovmf_prebuilt::ovmf_pure_efi());
-        cmd.arg("-drive").arg(format!("format=raw,file={uefi_path}"));
-    } else {
-        cmd.arg("-drive").arg(format!("format=raw,file={bios_path}"));
-    }
-    let mut child = cmd.spawn().unwrap();
-    child.wait().unwrap();
-}
-```
-
-Now you should be able to use `cargo build` to create a bootable disk image and `cargo run` to run in QEMU. Your kernel is automatically recompiled when it changes. For more advanced usage, you can add command-line arguments to your `main.rs` to e.g. pass additional arguments to QEMU or to copy the disk images to some path to make it easier to find them (e.g. for copying them to an thumb drive).
+Our [basic example](examples/basic/basic-os.md) showcases this setup:
+- [Cargo.toml](/examples/basic/Cargo.toml)
+    - create a workspace & add kernel as member
+    - add kernel as build-dependency
+    - add ovmf-prebuilt for UEFI booting in QEMU
+- [.cargo/config.toml](/examples/basic/Cargo.toml)
+    - enable the unstable artifact-dependencies feature
+- [rust-toolchain.toml](/examples/basic/Cargo.toml)
+    - use experimental features (nightly)
+- [build.rs](/examples/basic/build.rs)
+    - create bios and uefi disk image
+- [src/main.rs](/examples/basic/src/main.rs])
+    - launch the image using QEMU
+
+Now you should be able to use `cargo build` to create a bootable disk image and `cargo run bios` and `cargo run uefi` to run it in QEMU. Your kernel is automatically recompiled when it changes. For more advanced usage, you can add command-line arguments to your `main.rs` to e.g. pass additional arguments to QEMU or to copy the disk images to some path to make it easier to find them (e.g. for copying them to an thumb drive).

docs/tutorial/Makefile.toml

@@ -0,0 +1,15 @@
+[tasks.convert]
+install_crate = "bashtestmd"
+command = "bashtestmd"
+args = ["--input", "tutorial.md", "--output", "tutorial.sh", "--tag", "tutorial"]
+
+[tasks.rm]
+cwd = "../../examples"
+script = "rm -rf basic"
+
+[tasks.create]
+cwd = "../../examples"
+script = "../docs/tutorial/tutorial.sh"
+
+[tasks.all]
+dependencies = ["convert", "rm", "create"]