Compare commits

..

No commits in common. "cd8c1a3dc60697c8992fc61af50a4569d80d7516" and "30a9278cfd021ae0186a69c1bfee901564650ec7" have entirely different histories.

7 changed files with 9 additions and 8 deletions

@ -1 +1 @@
Subproject commit 5abe28fd45bdd2010933c320d45ad91683f34635 Subproject commit 97b1ae3952b59e807498f9c8caa13128ce39fdb2

@ -1 +1 @@
Subproject commit 421525bf81871c1da198cf9aeef341e74b5235a4 Subproject commit 3c1377f0f7d30db28b7b65165ff10f2df24e92f4

@ -1 +1 @@
Subproject commit b42556aae281a7c811828eefaa9d8f02ec01fa9d Subproject commit b3d66183e8e7107a2a1c30037b154198e8e67185

@ -1 +1 @@
Subproject commit 6a49914f0fd412ce03218b544a97b0d2d14d2045 Subproject commit 1fccae679d66742786cc63fbee112e695da9ec27

View File

@ -6,10 +6,11 @@ build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/**
nasm -f bin -o $@ -D ARCH_$(ARCH) -D FILESYSTEM=$< -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm nasm -f bin -o $@ -D ARCH_$(ARCH) -D FILESYSTEM=$< -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
build/harddrive-mbr.bin: build/filesystem.bin bootloader/$(ARCH)/** build/harddrive-mbr.bin: build/filesystem.bin bootloader/$(ARCH)/**
# TODO: Determine the correct size
nasm -f bin -o build/bootsector.bin -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm nasm -f bin -o build/bootsector.bin -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
dd if=/dev/zero of=$@.partial bs=1M count=$$(expr $$(du -m $< | cut -f1) + 2) dd if=/dev/zero of=$@.partial bs=1M count=384
parted -s -a minimal $@.partial mklabel msdos parted -s -a minimal $@.partial mklabel msdos
parted -s -a minimal $@.partial mkpart primary 2048s $$(expr $$(du -m $< | cut -f1) \* 2048 + 2048)s parted -s -a minimal $@.partial mkpart primary 2048s 786431s
dd if=build/bootsector.bin of=$@.partial bs=1 count=446 conv=notrunc dd if=build/bootsector.bin of=$@.partial bs=1 count=446 conv=notrunc
dd if=build/bootsector.bin of=$@.partial bs=512 skip=1 seek=1 conv=notrunc dd if=build/bootsector.bin of=$@.partial bs=512 skip=1 seek=1 conv=notrunc
dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc

@ -1 +1 @@
Subproject commit a6af6a92895a7755f6a6b55114fb0e0adca48ae0 Subproject commit a70a01bd4a16d7e0cc12e756f95ec0511e857fd4

2
relibc

@ -1 +1 @@
Subproject commit 2e5d4a4d25e7364786802f0d899e789962c5ce6a Subproject commit a3f7a174f65eb2effc686c37b2c5668e6304172d