diff options
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | builddeps/limine.conf | 2 | ||||
| -rwxr-xr-x | hyra-build.sh | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index c0371b7..0552761 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,7 +67,7 @@ override USRDIR = $(shell pwd)/base/usr .PHONY: all -all: stand/boot/ libc sbin bin base/boot/hyra-kernel +all: stand/boot/ libc sbin bin base/boot/hyra.krq rm -f sys/include/machine .PHONY: sbin @@ -105,14 +105,14 @@ stand/boot/: mkdir -p stand/boot/ cp stand/limine/$(BOOT_FW) stand/boot/ -base/boot/hyra-kernel: $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) - $(PROMPT) " LD " $(shell pwd)/base/boot/hyra-kernel - $(LD) $(KERNEL_LDFLAGS) $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) -o base/boot/hyra-kernel - tools/ksyms sys/kern/ksyms.c base/boot/hyra-kernel +base/boot/hyra.krq: $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) + $(PROMPT) " LD " $(shell pwd)/base/boot/hyra.krq + $(LD) $(KERNEL_LDFLAGS) $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) -o base/boot/hyra.krq + tools/ksyms sys/kern/ksyms.c base/boot/hyra.krq # === Generating symbols === $(CC) -c $(KERNEL_CFLAGS) $(KERNEL_DEFINES) sys/kern/ksyms.c -o sys/kern/ksyms.o $(LD) $(KERNEL_LDFLAGS) $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) \ - sys/kern/ksyms.o -o base/boot/hyra-kernel + sys/kern/ksyms.o -o base/boot/hyra.krq sys/include/machine/: cd sys/include/; ln -sf arch/$(ARCH) machine diff --git a/builddeps/limine.conf b/builddeps/limine.conf index 308ad26..d5ed978 100644 --- a/builddeps/limine.conf +++ b/builddeps/limine.conf @@ -8,6 +8,6 @@ resolution: 1280x720 /Hyra protocol: limine - kernel_path: boot():/boot/hyra-kernel + kernel_path: boot():/boot/hyra.krq module_path: boot():/boot/ramfs.omar diff --git a/hyra-build.sh b/hyra-build.sh index 28ceb10..60bf792 100755 --- a/hyra-build.sh +++ b/hyra-build.sh @@ -111,7 +111,7 @@ stage1() { ################################# stage2() { make clean - rm -f base/boot/hyra-kernel + rm -f base/boot/hyra.krq iso_root_skel sysroot_skel |