Skip to content

Commit 0bbde84

Browse files
authored
Merge pull request #113 from assembler-0/Development
Development
2 parents 27becc8 + 52b8eb0 commit 0bbde84

File tree

9 files changed

+546
-32
lines changed

9 files changed

+546
-32
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
grub-pc-bin \
2828
grub-common \
2929
qemu-system-x86 \
30+
mtools \
3031
3132
- name: Compile & Link
3233
run: |

README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
![License](https://img.shields.io/badge/License-GPLv2-orange)
1616

17-
![Version](https://img.shields.io/badge/Current%20Version-v0.0.1%20beta5.4-blue)
17+
![Version](https://img.shields.io/badge/Current%20Version-v0.0.1%20beta6-blue)
1818

1919
![Build](https://img.shields.io/badge/GCC-faliling-red)
2020

@@ -38,19 +38,29 @@ It would be amazing if you could contribute to this project!
3838
- nasm >= 2.16
3939
- qemu >= 7.0.0
4040
- mkfs.fat (dosfstools)
41+
- mkfs.ext2
4142
- grub-mkrescue
4243
- Note: depending on your distro, grub-mkrescue may require xorriso and mtools packages.
4344

4445
### Quickstart
46+
#### Full development setup
4547
```bash
4648
git clone https://github.com/assembler-0/VoidFrame.git
4749
cd VoidFrame
4850
python scripts/vfconfig.py
4951
meson setup build
5052
cd build
5153
ninja
52-
ninja img # Optional
53-
ninja virtio-img # Optional
54+
ninja img
55+
ninja virtio-img
5456
ninja run
5557
```
56-
58+
#### Minimal setup
59+
```bash
60+
git clone https://github.com/assembler-0/VoidFrame.git
61+
cd VoidFrame
62+
meson setup build -Dexclude_extra_objects=true
63+
cd build
64+
ninja
65+
ninja runmin
66+
```

docs/ARCHITECTURE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# The VoidFrame monolithic kernel 💫 v0.0.1-beta5.4
1+
# The VoidFrame monolithic kernel 💫 v0.0.1-beta6
22

33
## Table of Contents
44

docs/ROADMAP.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
- [x] ELF64 header parsing
5454
- [x] Program header mapping (`PT_LOAD`)
5555
- [x] Set up new stack
56-
- [ ] Jump to entry point
56+
- [x] Jump to entry point
5757
- [x] Static binaries only (no relocations)
5858
- [ ] Dynamic linker / interpreter (WAY later)
5959

0 commit comments

Comments
 (0)