diff options
Diffstat (limited to 'run')
| -rwxr-xr-x | run | 39 |
1 files changed, 19 insertions, 20 deletions
@@ -111,43 +111,42 @@ make_build() { compile_with_flags -O2 -c ./"${line}" -I ./src/userspace -o ./build/userspace/"${stripped}" done <./build/tmp rm ./build/tmp - compile_with_flags -emain -O2 ./build/userspace/*.o -T ./src/userspace/linker.ld -I ./src/userspace -o ./build/user.bin + compile_with_flags -emain -O2 ./build/userspace/*.o -I ./src/userspace -o ./build/user.bin # Create ISO - mkdir -p ./iso/boot/ - mv ./build/melvix.bin ./iso/boot/kernel.bin - nasm ./src/bootloader/cd.asm -f bin -o ./iso/boot/cd.bin || exit 1 - nasm ./src/bootloader/hdd1.asm -f bin -o ./iso/boot/hdd1.bin || exit 1 - nasm ./src/bootloader/hdd2.asm -f bin -o ./iso/boot/hdd2.bin || exit 1 - cp ./build/user.bin ./iso/user.bin || exit 1 - cp ./build/font.bin ./iso/font.bin || exit 1 - genisoimage -quiet -input-charset utf-8 -no-emul-boot -b boot/cd.bin -o ./build/melvix.iso ./iso + mkdir -p ./iso/boot/grub/ + cp ./build/melvix.bin ./iso/boot/kernel.bin + cp ./src/bootloader/grub.cfg ./iso/boot/grub/ + cp ./build/user.bin ./iso/user.bin + cp ./build/font.bin ./iso/font.bin + grub-mkrescue -o ./build/melvix.iso ./iso/ head -c 10485760 /dev/zero >./build/hdd10M.img printf "Build finshed successfully!\n\n" } make_test() { - qemu_with_flags -cdrom ./build/melvix.iso -drive file=./build/hdd10M.img,format=raw + qemu_with_flags -cdrom ./build/melvix.iso #-drive file=./build/hdd10M.img,format=raw } make_debug() { - qemu_with_flags -s -cdrom ./build/melvix.iso -drive file=./build/hdd10M.img,format=raw + qemu_with_flags -s -cdrom ./build/melvix.iso #-drive file=./build/hdd10M.img,format=raw } make_image_debug() { - qemu_with_flags -cdrom ./build/melvix.iso -drive file=./build/hdd10M.img,format=raw - qemu_with_flags -drive file=./build/hdd10M.img,format=raw + qemu_with_flags -cdrom ./build/melvix.iso #-drive file=./build/hdd10M.img,format=raw + #qemu_with_flags -drive file=./build/hdd10M.img,format=raw } make_image() { - start=$(date +%s.%N) - qemu_with_flags -nographic -cdrom ./build/melvix.iso -drive file=./build/hdd10M.img,format=raw >install.log - end=$(date +%s.%N) - cat install.log - printf "[LOG END]\n\n" - tail install.log | grep -q "Installation successful!" && echo Booted and installed within "$(echo "$end - $start" | bc -l)" seconds || echo Installation failed! && exit 1 - rm install.log + #start=$(date +%s.%N) + #qemu_with_flags -nographic -cdrom ./build/melvix.iso -drive file=./build/hdd10M.img,format=raw >install.log + #end=$(date +%s.%N) + #cat install.log + #printf "[LOG END]\n\n" + #tail install.log | grep -q "Installation successful!" && echo Booted and installed within "$(echo "$end - $start" | bc -l)" seconds || echo Installation failed! && exit 1 + #rm install.log + echo "This test is currently disabled" } make_sync() { |