diff options
| author | Anton Kling <anton@kling.gg> | 2024-06-27 18:59:49 +0200 |
|---|---|---|
| committer | Anton Kling <anton@kling.gg> | 2024-06-27 19:07:50 +0200 |
| commit | d315a82dbed1fd288702ebbcb869c744476433a8 (patch) | |
| tree | b58ec3831daa0abf0dd2dd5dd4395e53565bd1c7 /meta | |
| parent | 556d1e44fef369a7200cc045f337ac3db2f9eab5 (diff) | |
stuff
Diffstat (limited to 'meta')
| -rwxr-xr-x | meta/debug.sh | 2 | ||||
| -rwxr-xr-x | meta/run.sh | 4 | ||||
| -rwxr-xr-x | meta/userland.sh | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/meta/debug.sh b/meta/debug.sh index 2cb3d90..47b1a18 100755 --- a/meta/debug.sh +++ b/meta/debug.sh @@ -4,4 +4,4 @@ cd "$scriptdir" cd .. #qemu-system-i386 -no-reboot -no-shutdown -serial file:./logs/serial.log -hda ./meta/ext2.img -m 1G -cdrom ./kernel/myos.iso -s -S & qemu-system-i386 -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:6000 -device rtl8139,netdev=n0 -object filter-dump,id=id,netdev=n0,file=./logs/netout -no-reboot -no-shutdown -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -m 512M -cdrom ./kernel/myos.iso -s -S & -gdb -x .gdbinit +gdb -x ./meta/.gdbinit diff --git a/meta/run.sh b/meta/run.sh index 618dd5e..ae70780 100755 --- a/meta/run.sh +++ b/meta/run.sh @@ -2,9 +2,7 @@ scriptdir="$(dirname "$0")" cd "$scriptdir" cd .. -#qemu-system-i386 -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:6000 -device rtl8139,netdev=n0 -object filter-dump,id=id,netdev=n0,file=./logs/netout -d int -no-reboot -no-shutdown -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -m 512M -cdrom ./kernel/myos.iso -s -#qemu-system-i386 -d int -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:6000 -device rtl8139,netdev=n0 -object filter-dump,id=id,netdev=n0,file=./logs/netout -no-reboot -no-shutdown -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -m 512M -cdrom ./kernel/myos.iso -s -qemu-system-i386 -enable-kvm -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:6000 -device rtl8139,netdev=n0 -object filter-dump,id=id,netdev=n0,file=./logs/netout -no-reboot -no-shutdown -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -m 128M -cdrom ./kernel/myos.iso -s +qemu-system-i386 -enable-kvm -machine kernel_irqchip=off -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:6000 -device rtl8139,netdev=n0 -object filter-dump,id=id,netdev=n0,file=./logs/netout -no-reboot -no-shutdown -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -m 256M -cdrom ./kernel/myos.iso -d int -s # 2> interrupts # Sync the sysroot cd ./meta/ mkdir ./mount diff --git a/meta/userland.sh b/meta/userland.sh index 29ae09b..692b49a 100755 --- a/meta/userland.sh +++ b/meta/userland.sh @@ -18,6 +18,9 @@ make -j`nproc` -C ./userland/libppm make -j`nproc` -C ./userland/rtl8139 make -j`nproc` -C ./userland/smol_http make -j`nproc` -C ./userland/irc +make -j`nproc` -C ./userland/nasm-2.16.01 +make -j`nproc` -C ./userland/dns +make -j`nproc` -C ./userland/to mkdir sysroot sudo cp ./userland/rtl8139/rtl8139 ./sysroot/rtl8139 @@ -31,6 +34,9 @@ sudo cp ./userland/test/test ./sysroot/test sudo cp ./userland/minibox/minibox ./sysroot/minibox sudo cp ./userland/smol_http/smol_http ./sysroot/smol_http sudo cp ./userland/irc/irc ./sysroot/irc +sudo cp ./userland/nasm-2.16.01/nasm ./sysroot/nasm +sudo cp ./userland/dns/dns ./sysroot/dns +sudo cp ./userland/to/to ./sysroot/to cd ./sysroot rm ./init |