Merge branch 'master' of git.juju.re:juju/JuliOS

2021-12-07 19:01:23 +01:00 · 2021-12-07 19:01:23 +01:00 · c54cb174de
commit c54cb174de
parent 273b004851 6944f2203f
2 changed files with 17 additions and 0 deletions
--- a/1
+++ b/1
@ -41,5 +41,6 @@ clean:
 	$(RM) $(KERNEL)
 	$(RM) julios.iso
 	$(RM) -r iso
+	$(RM) -r target

 .PHONY: $(INSTALL_ROOT) install clean all run debug $(LIB_JULIOS)
--- a/README.md
+++ b/README.md
@ -1,3 +1,19 @@
 # JuliOS

 Just an Unstable, Lame and Innefective Operating System
+
+# Build requirements
+
+* rust nightly
+* rust-src (`rustup component add rust-src`)
+* grub2
+* xorriso
+
+# Build
+
+```sh
+make        # The kernel and an ISO
+make run    # Run qemu on the ISO
+make debug  # Run bochs on the ISO
+make clean  # Clean everythin
+```