Skip to content

Commit

Permalink
Makefile: Fix hdd creation on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
fruhland committed Dec 10, 2024
1 parent 08e3be6 commit be9396c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Install packages
uses: amitie10g/[email protected]
with:
apt: build-essential nasm
apt: build-essential nasm dosfstools

- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install packages
uses: amitie10g/[email protected]
with:
brew: x86_64-elf-binutils x86_64-elf-gcc nasm
brew: x86_64-elf-binutils x86_64-elf-gcc nasm dosfstools

- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
Expand Down
4 changes: 4 additions & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ command = "fallocate"
args = [ "-l", "1M", "fill.img" ]
condition = { files_not_exist = [ "${CARGO_MAKE_CRATE_TARGET_DIRECTORY}/fill.img" ] }

[tasks.create-hdd-fill-img.mac]
command = "mkfile"
args = [ "-n", "1m", "fill.img" ]

[tasks.create-hdd-partition-img]
cwd = "${CARGO_MAKE_CRATE_TARGET_DIRECTORY}"
command = "mkfs.vfat"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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:
```bash
apt install build-essential nasm wget qemu-system-x86_64
apt install build-essential nasm dosfstools wget qemu-system-x86_64
```

## Build and Run
Expand Down

0 comments on commit be9396c

Please sign in to comment.