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

Fix live disk and ISO

Browse source
This commit is contained in:
Jeremy Soller 2022-02-07 20:20:03 -07:00
parent b5d8859acd
commit 42cc61803c
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootloader

@ -1 +1 @@
Subproject commit 6ed05fcaa4f493f8b9c46e716f5edf5bcecc83e5 Subproject commit 75b78273752b2679507689945300aa326dbfd209

15
mk/disk.mk
View file

@ -7,8 +7,19 @@ build/harddrive.bin: build/filesystem.bin build/bootloader.bin
dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc
mv $@.partial $@ mv $@.partial $@
build/livedisk.bin: build/kernel_live bootloader/$(ARCH)/** build/livedisk: build/kernel_live
nasm -f bin -o $@ -D ARCH_$(ARCH) -D KERNEL=$< -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm mkdir -p $@.partial
cp $< $@.partial/kernel
mv $@.partial $@
build/livedisk.bin: build/filesystem-live.bin build/bootloader.bin
dd if=/dev/zero of=$@.partial bs=1M count=$$(expr $$(du -m $< | cut -f1) + 2)
$(PARTED) -s -a minimal $@.partial mklabel msdos
$(PARTED) -s -a minimal $@.partial mkpart primary 2048s $$(expr $$(du -m $< | cut -f1) \* 2048 + 2048)s
dd if=build/bootloader.bin of=$@.partial bs=1 count=446 conv=notrunc
dd if=build/bootloader.bin of=$@.partial bs=512 skip=1 seek=1 conv=notrunc
dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc
mv $@.partial $@
build/livedisk.iso: build/livedisk.bin.gz build/livedisk.iso: build/livedisk.bin.gz
rm -rf build/iso/ rm -rf build/iso/

4
mk/filesystem.mk
View file

@ -20,6 +20,10 @@ build/filesystem.bin: filesystem.toml build/kernel prefix
rm -rf build/filesystem/ rm -rf build/filesystem/
mv $@.partial $@ mv $@.partial $@
build/filesystem-live.bin: build/livedisk
cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-ar -- $@.partial $<
mv $@.partial $@
mount: FORCE mount: FORCE
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs