diff --git a/build.sh b/build.sh index bf88fcb..379bd74 100755 --- a/build.sh +++ b/build.sh @@ -11,16 +11,16 @@ usage() echo "build.sh: Invoke make for a particular architecture and configuration." echo "Usage:" echo "./build.sh [-X | -A | -6 | -a ARCH] [-c CONFIG] [-f FILESYSTEM_CONFIG] TARGET..." - echo " -X Equivalent to -a x86_64 (see below)." - echo " -A Equivalent to -a aarch64 (see below)." - echo " -6 Equivalent to -a i686 (see below)." + echo " -X Equivalent to -a x86_64." + echo " -A Equivalent to -a aarch64." + echo " -6 Equivalent to -a i686." echo " -a ARCH: Processor Architecture. Normally one of x86_64, aarch64 or" echo " i686. ARCH is not checked, so you can add a new architecture." echo " Defaults to the directory containing the FILESYSTEM_CONFIG file," echo " or x86_64 if no FILESYSTEM_CONFIG is specified." echo " -c CONFIG: The name of the config, e.g. desktop, server or demo." - echo " Determines the name of the image, build/ARCH/CONFIG_harddrive.img" - echo " e.g. build/x86_64/desktop_harddrive.img" + echo " Determines the name of the image, build/ARCH/CONFIG/harddrive.img" + echo " e.g. build/x86_64/desktop/harddrive.img" echo " Determines the name of FILESYSTEM_CONFIG if none is specified." echo " Defaults to the basename of FILESYSTEM_CONFIG, or 'desktop'" echo " if FILESYSTEM_CONFIG is not specified." @@ -32,8 +32,8 @@ usage() echo " config/ARCH/CONFIG.toml" echo " If you specify both CONFIG and FILESYSTEM_CONFIG, it is not" echo " necessary that they match, but it is recommended." - echo " Examples: ./build.sh -c demo live - make build/x86_64/demo_livedisk.iso" - echo " ./build.sh -6 qemu - make build/i686/desktop_harddrive.img and" + echo " Examples: ./build.sh -c demo live - make build/x86_64/demo/livedisk.iso" + echo " ./build.sh -6 qemu - make build/i686/desktop/harddrive.img and" echo " and run it in qemu" echo " NOTE: If you do not change ARCH or CONFIG very often, edit mk/config.mk" echo " and set ARCH and FILESYSTEM_CONFIG. You only need to use this"