diff options
| author | Anton Kling <anton@kling.gg> | 2024-02-07 11:36:21 +0100 |
|---|---|---|
| committer | Anton Kling <anton@kling.gg> | 2024-02-07 22:25:47 +0100 |
| commit | 35958c8c6b600482f68fef08ac26547b5655e987 (patch) | |
| tree | a3329136adc1b92885c60462e7dd74c98eaa0953 /meta | |
| parent | b7fa1457727338416499d1b0144f1042a6878a97 (diff) | |
A lot of small changes
Diffstat (limited to 'meta')
| -rwxr-xr-x | meta/debug.sh | 3 | ||||
| -rwxr-xr-x | meta/userland.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/debug.sh b/meta/debug.sh index d1eeedb..2cb3d90 100755 --- a/meta/debug.sh +++ b/meta/debug.sh @@ -2,5 +2,6 @@ scriptdir="$(dirname "$0")" 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 -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 diff --git a/meta/userland.sh b/meta/userland.sh index 94ab441..de6cbd5 100755 --- a/meta/userland.sh +++ b/meta/userland.sh @@ -15,8 +15,10 @@ make -C ./userland/windowserver make -C ./userland/test make -C ./userland/minibox make -C ./userland/libppm +make -C ./userland/rtl8139 mkdir sysroot +sudo cp ./userland/rtl8139/rtl8139 ./sysroot/rtl8139 sudo cp ./userland/libppm/ppm ./sysroot/ppm sudo cp ./userland/sh/sh ./sysroot/sh sudo cp ./userland/terminal/term ./sysroot/term |