From 573bf7aa71a900d3e4fc204300ceea2230b89ec2 Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Thu, 1 Aug 2024 16:23:37 -0400 Subject: update instructions in readme, setup --- readme.txt | 9 +++++---- setup.sh | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/readme.txt b/readme.txt index cd58784..279807c 100644 --- a/readme.txt +++ b/readme.txt @@ -19,13 +19,14 @@ the packages listed below are sufficient. next, you will need to download and compile some dependencies. the script in setup.sh will do this for you. if it sees an environment variables MAKEOPTS, it will pass the contents of that as arguments to invocations of make. otherwise, -it defaults to "-j$(nproc)". if you nead to clean that setup for any reason, -you can use the script in clean-setup.sh. +it defaults to "-j$(nproc)". now that we have all the dependencies, just run "make". the default target is build/disk.iso, a bios-bootable disk image. you can run "make debug" to start -qemu with that disk, and attach gdb to it. you can also use "make clean" to -remove all of the files that "make" creates. +qemu with that disk, and attach gdb to it. you will have to run "continue" (or +"c" for short) in gdb to let qemu start. consider temporarily changing -O3 to +-Og in the CC_EXTRA_ARGS variable of the makefile temporarily if you want to +do any serious debugging. acknowledgements (any under "dependencies" are downloaded during build): diff --git a/setup.sh b/setup.sh index bb20c18..2e377cf 100644 --- a/setup.sh +++ b/setup.sh @@ -10,14 +10,14 @@ PROJECT_ROOT="$(pwd)" if [ -e .setup-complete ]; then echo setup has already completed. refusing to run again. echo to run again anyway, delete .setup-complete - echo to clean the dependencies, run clean-dependencies.sh + echo to undo any previous setup, run clean-setup.sh exit 1 fi if [ -e .setup-started ]; then echo setup has already been started, but failed. refusing to run again. echo to run again anyway, delete .setup-started - echo to clean the dependencies, run clean-dependencies.sh + echo to undo any previous setup, run clean-setup.sh exit 1 fi -- cgit v1.2.3