Update towboot to v0.9.1 (fixes boot problems on real hardware); GitH…

…ub: Drop macos-12 runner, as support for it ends

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Install packages
         uses: amitie10g/[email protected]
         with:
-          apt: build-essential nasm
+          apt: build-essential nasm libssl3
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@nightly
@@ -42,41 +42,7 @@ jobs:
           name: D3OS
           path: d3os.img
 
-  build-on-intel-mac:
-    runs-on: macos-12
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install packages
-        uses: amitie10g/[email protected]
-        with:
-          brew: x86_64-elf-binutils x86_64-elf-gcc nasm
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: "rust-src"
-
-      - name: Cache Cargo
-        uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: cargo-${{ hashFiles('**/Cargo.lock') }}
-          cache-all-crates: true
-          cache-on-failure: true
-
-      - name: Install cargo-make
-        run: cargo install --no-default-features cargo-make
-
-      - name: Cleanup towbootctl
-        run: rm -f towbootctl
-
-      - name: Build
-        uses: clechasseur/rs-cargo@v2
-        with:
-          command: make
-          args: --no-workspace image
-
-  build-on-apple-silicon-mac:
+  build-on-macos:
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v4

Makefile.toml

@@ -2,7 +2,7 @@
 BOOTLOADER_DIRECTORY = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/loader"
 INITRD_DIRECTORY = "${BOOTLOADER_DIRECTORY}/initrd"
 OVMF_URL = "https://retrage.github.io/edk2-nightly/bin/RELEASEX64_OVMF.fd"
-TOWBOOT_VERSION = "0.9.0"
+TOWBOOT_VERSION = "0.9.1"
 TOWBOOT_URL = "https://github.com/hhuOS/towboot/releases/download/v${TOWBOOT_VERSION}/towbootctl-v${TOWBOOT_VERSION}"
 TAR = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "tar", mapping = { "macos" = "gtar" } }
 LINKER = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "ld", mapping = { "macos" = "x86_64-elf-ld" } }
@@ -173,7 +173,7 @@ condition = { files_not_exist = [ "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/tow
 
 [tasks.towbootctl.mac]
 script = '''
-wget -O towbootctl "${TOWBOOT_URL}-macos.-macos"
+wget -O towbootctl "${TOWBOOT_URL}-macos"
 chmod +x towbootctl
 '''
 

README.md

@@ -29,7 +29,7 @@ cargo install --no-default-features cargo-make
 Furthermore, the following packages for Debian/Ubuntu based systems (or their equivalent packages on other distributions) need to be installed:
 
 ```
-apt install build-essential nasm wget qemu-system-x86_64
+apt install build-essential nasm wget libssl3 qemu-system-x86_64
 ```
 
 ## Build and Run