From b6fccc37bac39fb0697dd1f036ea88f475de23d2 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 27 Sep 2017 20:30:19 -0600 Subject: [PATCH] Copy bootloader to filesystem --- mk/disk.mk | 2 +- mk/filesystem.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/disk.mk b/mk/disk.mk index 19975bd..a98b6b4 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -1,4 +1,4 @@ -build/bootloader.bin: bootloader/$(ARCH)/** +build/bootloader: bootloader/$(ARCH)/** nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/** diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 45e7a99..2e28d24 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -1,4 +1,4 @@ -build/filesystem.bin: filesystem.toml build/kernel +build/filesystem.bin: filesystem.toml build/bootloader build/kernel -$(FUMOUNT) build/filesystem/ || true rm -rf $@ $@.partial build/filesystem/ dd if=/dev/zero of=$@.partial bs=1048576 count=256 @@ -8,7 +8,7 @@ build/filesystem.bin: filesystem.toml build/kernel cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- $@.partial build/filesystem/ sleep 2 pgrep redoxfs - cp build/kernel build/filesystem/kernel + cp build/bootloader build/kernel build/filesystem/ cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/filesystem/ chown -R 0:0 build/filesystem chown -R 1000:1000 build/filesystem/home/user