diff --git a/kernel b/kernel index c020ce7..819f77d 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit c020ce7d8ac76913b93850b162fe9783514d7c63 +Subproject commit 819f77daf3a808b43840f4ffe14aa4b988196619 diff --git a/mk/disk.mk b/mk/disk.mk index ec91d56..7fb63c7 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -8,7 +8,7 @@ build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/** build/livedisk.bin: build/kernel_live bootloader/$(ARCH)/** nasm -f bin -o $@ -D ARCH_$(ARCH) -D KERNEL=$< -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm -build/%.bin.gz: build/%.bin +build/livedisk.bin.gz: build/livedisk.bin gzip -k -f $< build/livedisk.iso: build/livedisk.bin.gz diff --git a/mk/kernel.mk b/mk/kernel.mk index 4738f55..d830042 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -1,4 +1,4 @@ -build/libkernel.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* build/initfs.tag +build/libkernel.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* kernel/src/*/*/*/* build/initfs.tag # Temporary fix for https://github.com/redox-os/redox/issues/963 allowing to build on macOS ifeq ($(UNAME),Darwin) cd kernel && CC=$(ARCH)-elf-gcc AR=$(ARCH)-elf-ar CFLAGS=-ffreestanding INITFS_FOLDER=$(ROOT)/build/initfs xargo rustc --lib --target $(KTARGET) --release -- -C soft-float -C debuginfo=2 --emit link=../$@ @@ -6,7 +6,7 @@ else cd kernel && INITFS_FOLDER=$(ROOT)/build/initfs xargo rustc --lib --target $(KTARGET) --release -- -C soft-float -C debuginfo=2 --emit link=../$@ endif -build/libkernel_live.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* build/initfs_live.tag +build/libkernel_live.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* kernel/src/*/*/*/* build/initfs_live.tag cd kernel && INITFS_FOLDER=$(ROOT)/build/initfs_live xargo rustc --lib --features live --target $(KTARGET) --release -- -C soft-float --emit link=../$@ build/kernel: kernel/linkers/$(ARCH).ld build/libkernel.a