potatOS/potatOS-pro
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: potatOS:30a9278cfd021ae0186a69c1bfee901564650ec7
Branches Tags
potatOS:master
potatOS:single-core
potatOS:cookbook-gui-fix
potatOS:update-script
potatOS:0.4.1
potatOS:0.8.0
potatOS:0.7.0
potatOS:0.6.0
potatOS:0.5.0
potatOS:0.4.1
potatOS:0.3.5
potatOS:0.3.4
potatOS:0.3.3
potatOS:0.3.2
potatOS:0.3.1
potatOS:0.3.0
potatOS:0.2.0
potatOS:0.1.5
potatOS:0.1.4
potatOS:0.1.3
potatOS:0.1.2
potatOS:0.1.1
potatOS:0.1.0
potatOS:0.0.9
potatOS:0.0.8
potatOS:0.0.7
potatOS:0.0.6
potatOS:0.0.5
potatOS:0.0.4
potatOS:0.0.3
potatOS:0.0.2
potatOS:0.0.1
...
compare: potatOS:cd8c1a3dc60697c8992fc61af50a4569d80d7516
Branches Tags
potatOS:master
potatOS:single-core
potatOS:cookbook-gui-fix
potatOS:update-script
potatOS:0.4.1
potatOS:0.8.0
potatOS:0.7.0
potatOS:0.6.0
potatOS:0.5.0
potatOS:0.4.1
potatOS:0.3.5
potatOS:0.3.4
potatOS:0.3.3
potatOS:0.3.2
potatOS:0.3.1
potatOS:0.3.0
potatOS:0.2.0
potatOS:0.1.5
potatOS:0.1.4
potatOS:0.1.3
potatOS:0.1.2
potatOS:0.1.1
potatOS:0.1.0
potatOS:0.0.9
potatOS:0.0.8
potatOS:0.0.7
potatOS:0.0.6
potatOS:0.0.5
potatOS:0.0.4
potatOS:0.0.3
potatOS:0.0.2
potatOS:0.0.1

5 Commits
30a9278cfd ... cd8c1a3dc6

Author SHA1 Message Date
Jeremy Soller
cd8c1a3dc6
Update relibc 2020-01-20 11:17:59 -07:00
Jeremy Soller
382c14a236
Update installer 2020-01-20 10:05:43 -07:00
Jeremy Soller
099f482456
Update submodules 2020-01-20 10:02:16 -07:00
Jeremy Soller
3b921a3f00
Update cookbook 2020-01-20 09:36:06 -07:00
Jeremy Soller
ed5c8eb92c
Correctly determine size of MBR partition 2020-01-20 09:29:37 -07:00
7 changed files with 8 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
bootloader

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

2
bootloader-efi

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

2
cookbook

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

2
installer

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

5
mk/disk.mk
View File

@ -6,11 +6,10 @@ 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=384 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 mklabel msdos
parted -s -a minimal $@.partial mkpart primary 2048s 786431s parted -s -a minimal $@.partial mkpart primary 2048s $$(expr $$(du -m $< | cut -f1) \* 2048 + 2048)s
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

2
redoxfs

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

2
relibc

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