vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Copy bootloader to filesystem

Browse source
This commit is contained in:
Jeremy Soller 2017-09-27 20:30:19 -06:00
parent c254ea227c
commit b6fccc37ba
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mk/disk.mk
View file

@ -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 nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/** build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/**

4
mk/filesystem.mk
View file

@ -1,4 +1,4 @@
build/filesystem.bin: filesystem.toml build/kernel build/filesystem.bin: filesystem.toml build/bootloader build/kernel
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf $@ $@.partial build/filesystem/ rm -rf $@ $@.partial build/filesystem/
dd if=/dev/zero of=$@.partial bs=1048576 count=256 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/ cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- $@.partial build/filesystem/
sleep 2 sleep 2
pgrep redoxfs 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/ cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/filesystem/
chown -R 0:0 build/filesystem chown -R 0:0 build/filesystem
chown -R 1000:1000 build/filesystem/home/user chown -R 1000:1000 build/filesystem/home/user