Skip to content

Commit

Permalink
Finalize changes for v1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sasdallas committed Jul 3, 2024
1 parent 1695296 commit 8b25a60
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ INITRD_OBJS = $(patsubst $(INITRD_SRC)/src/%.c, $(INITRD_OBJ)/%.o, $(INITRD_SRCS


# Targets
# all - builds a proper kernel.elf file for release
# rel - builds a proper kernel.elf file for release
# dbg - builds a kernel file (non-binary) for use with objdump or other examination tools (this target is most commonly used while testing new linking)

all: $(OUT_KERNEL)/kernel.elf $(OUT_INITRD)/initrd.img
all: rel
rel: $(OUT_KERNEL)/kernel.elf $(OUT_INITRD)/initrd.img
dbg: $(OUT_KERNEL)/kernel_debug.elf $(OUT_INITRD)/initrd.img


Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Usermode and ELF loading
**To build reduceOS, you need these packages:** `gcc`, `nasm`, `make`, `grub`\
**To run reduceOS, you need these packages:** `qemu-system` (emulation), or `grub-common` and `xorriso` (for building an ISO - does not work in QEMU!)

The makefile of reduceOS has two main targets for building - `all` and `dbg`.\
The target to actually build the OS is `all`. If you need to do further debugging, use `dbg` (outputs debug symbols)
The makefile of reduceOS has two main targets for building - `rel` and `dbg`.\
The target to actually build the OS is `rel`. If you need to do further debugging, use `dbg` (outputs debug symbols)

Run `make` to build the OS, or `make all dbg` if you're trying to debug it.
Run `make rel` to build the OS in a release configuration, or `make dbg` if you're trying to debug it.

Finally, you need to launch the OS. This can be done in a variety of different ways, but the Makefile uses QEMU.\
Run `make qemu` to launch QEMU and start the OS.
Expand Down
Binary file modified obj/kernel.o
Binary file not shown.
Binary file modified obj/vmm.o
Binary file not shown.
Binary file modified out/kernel/kernel.elf
Binary file not shown.
6 changes: 3 additions & 3 deletions source/kernel/include/CONFIG.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
#define VERSION "1.2"

// DO NOT MODIFY THE BELOW LINES!!!
#define BUILD_NUMBER "194"
#define BUILD_DATE "07/03/24, 15:48:10"
#define BUILD_CONFIGURATION "DEBUG"
#define BUILD_NUMBER "198"
#define BUILD_DATE "07/03/24, 15:59:07"
#define BUILD_CONFIGURATION "RELEASE"

0 comments on commit 8b25a60

Please sign in to comment.