Mercurial > hg > aboriginal
diff run-from-build.sh @ 863:4bfe2b34dd9f
Largeish refactoring/simplification of run-emulator.sh and associated code. Now automatically sets up the distcc trick if the appropriate $ARCH-cc toolchain is in the $PATH (or the current directory).
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Mon, 26 Oct 2009 06:09:29 -0500 |
| parents | aea72ecff868 |
| children | abff74b958a1 |
line wrap: on
line diff
--- a/run-from-build.sh Mon Oct 26 06:07:05 2009 -0500 +++ b/run-from-build.sh Mon Oct 26 06:09:29 2009 -0500 @@ -1,33 +1,7 @@ #!/bin/bash -# Read the configuration files for this target. - -source sources/include.sh || exit 1 -read_arch_dir "$1" - -# Fail if this target hasn't been built yet. - -SYSDIR="${BUILD}/system-image-$ARCH_NAME" -if [ ! -f "$SYSDIR/run-emulator.sh" ] -then - [ -z "$FAIL_QUIET" ] && echo "No $SYSDIR/run-emulator.sh" >&2 - exit 1 -fi -cd "$SYSDIR" || exit 1 +# Grab cross compiler (for distcc) and run development environment. -# Should we create a 2 gigabyte /dev/hdb image to provide the emulator with -# some writable scratch space? (If one already exists, fsck it.) This -# image (if it exists) will be mounted on /home by the emulated system's -# init script. - -[ -z "$SKIP_HOME" ] && [ -z "$MAKE_HDB" ] && MAKE_HDB="--make-hdb 2048" -[ -f "image-${ARCH}.ext2" ] && fsck.ext2 -y "image-${ARCH}.ext2" </dev/null - -# Run the emulator, using the distccd we built (if necessary) to dial out -# to the cross-compiler. If emulator is killed, take down distccd processes -# as well. - -trap "killtree $$" EXIT - -./run-emulator.sh $MAKE_HDB --memory 256 --with-distcc \ - "${BUILD}/cross-compiler-${ARCH}" +export PATH="$(pwd)/build/host:$(pwd)/build/cross-compiler-$1/bin:$PATH" && +cd build/system-image-"$1" && +./dev-environment.sh