Mercurial > hg > aboriginal
changeset 1538:29109240fd6d
Comment tweaks, and make run-emulator.sh use bash.
author | Rob Landley <rob@landley.net> |
---|---|
date | Wed, 29 Aug 2012 21:52:23 -0500 |
parents | a56e2d00445d |
children | 8bd6056bd7fa |
files | sources/toys/dev-environment.sh sources/toys/native-build.sh system-image.sh |
diffstat | 3 files changed, 17 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/toys/dev-environment.sh Wed Aug 29 21:49:42 2012 -0500 +++ b/sources/toys/dev-environment.sh Wed Aug 29 21:52:23 2012 -0500 @@ -1,17 +1,19 @@ #!/bin/bash -# Wrapper around run-environment.sh that sets up writeable space for /home -# and distcc acceleration (if the cross compiler and distcc are available). +# Wrapper around run-emulator.sh that sets up a reasonable development +# environment. + +# Allocates more physical memory, adds a 2 gigabyte ext3 image (hdb.img) +# mounted on /home to provide persistent writeable space, and sets up and +# distcc acceleration (if both the the cross compiler and distccd +# are available in the host's $PATH). # The following environment variables affect the behavior of this script: -# HDB - Image file to use for -hdb on /home (none if blank) -# HDBMEGS - Number of megabytes to create +# HDB - Image file to use for -hdb on /home (creates a new hdb.img if blank) +# HDBMEGS - Size (in decimal megabytes) when creating hdb.img # HDC - Image file to use for -hdc on /mnt (none of blank) -# QEMU_MEMORY - number of megabytes of memory for qemu (defaults to 128) - -# Also, to use the distcc accelerator you need to have distccd and $ARCH-cc -# in the $PATH. +# QEMU_MEMORY - number of megabytes of memory for qemu (defaults to 256) INCLUDE unique-port.sh INCLUDE make-hdb.sh
--- a/sources/toys/native-build.sh Wed Aug 29 21:49:42 2012 -0500 +++ b/sources/toys/native-build.sh Wed Aug 29 21:52:23 2012 -0500 @@ -1,7 +1,8 @@ #!/bin/bash -# Launch a system image in the emulator with a control image to drive an -# automated native build, plus an FTP server on the host to upload results to. +# Wrapper around dev-environment.sh which runs an automated native build +# using a control image, and sets up an FTP server on the host to upload +# results to. # If you already have an FTP server, export FTP_SERVER and/or FTP_PORT.
--- a/system-image.sh Wed Aug 29 21:49:42 2012 -0500 +++ b/system-image.sh Wed Aug 29 21:52:23 2012 -0500 @@ -38,6 +38,10 @@ # to use an emulator other than qemu, but put the default case in qemu_defaults cat > "$STAGE_DIR/run-emulator.sh" << EOF && +#!/bin/bash + +# Boot the emulated system to a shell prompt. + ARCH=$ARCH run_emulator() {