Mercurial > hg > aboriginal
changeset 862:b3d3ca365d4e
Now that qemu 0.11.0 works, remove the "build a qemu snapshot" logic. QEMU goes back to being something the host has installed on it if you want to use it.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 26 Oct 2009 06:07:05 -0500 |
parents | 27337d225f20 |
children | 4bfe2b34dd9f |
files | config download.sh host-tools.sh sources/patches/openbios-ppc |
diffstat | 4 files changed, 0 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/config Mon Oct 26 05:56:09 2009 -0500 +++ b/config Mon Oct 26 06:07:05 2009 -0500 @@ -60,18 +60,6 @@ # export SNAPSHOT_SYMLINK=1 -# Set this to build packages the host system doesn't need in order to build -# a cross compiler, root filesystem, or system image, but which is needed -# to boot a system image with run-emulator.sh. Specifically, this means -# building qemu and e2fsprogs. (Note that the qemu build takes a very long -# time and consumes a lot of memory.) - -# If you don't enable this, host-tools.sh will attempt to symlink these -# commands out of the host $PATH, although it won't fail if it can't find -# them (unlike symlinking the host toolchain). - -# export HOST_BUILD_EXTRA=1 - # Use qemu to run "hello world" built by the cross compiler. Note that # you need a working qemu application emulation to do this. Specifically, # to unbreak arm you need to "echo 0 > /proc/sys/vm/mmap_min_addr" as root.
--- a/download.sh Mon Oct 26 05:56:09 2009 -0500 +++ b/download.sh Mon Oct 26 06:07:05 2009 -0500 @@ -109,10 +109,6 @@ # but the following packages are not cross compiled for the target, and thus # do not wind up in the system image.) -URL=http://download.savannah.nongnu.org/releases/qemu/qemu-0.11.0.tar.gz \ -SHA1=95f59ce1293743d9f213d6908029aa2cadfc0d34 \ -download || dienow - URL=http://downloads.sf.net/genext2fs/genext2fs-1.4.1.tar.gz && SHA1=9ace486ee1bad0a49b02194515e42573036f7392 \ download || dienow
--- a/host-tools.sh Mon Oct 26 05:56:09 2009 -0500 +++ b/host-tools.sh Mon Oct 26 06:07:05 2009 -0500 @@ -209,50 +209,6 @@ cleanup fi -# Here's some stuff that isn't used to build a cross compiler or system -# image, but is used by run-from-build.sh. By default we assume it's -# installed on the host you're running system images on (which may not be -# the one you're building them on). - -# Either build qemu from source, or symlink it. - -if [ ! -f "${STAGE_DIR}"/qemu ] -then - if [ ! -z "$HOST_BUILD_EXTRA" ] - then - - # Build qemu. Note that this is _very_slow_. (It takes about as long as - # building a system image from scratch, including the cross compiler.) - - # It's also ugly: its wants to populate a bunch of subdirectories under - # --prefix, and we can't just install it in host-temp and copy out what - # we want because the pc-bios directory needs to exist at a hardwired - # absolute path, so we do the install by hand. - - setupfor qemu && - cp "$SOURCES"/patches/openbios-ppc pc-bios/openbios-ppc && - sed -i 's@datasuffix=".*"@datasuffix="/pc-bios"@' configure && - ./configure --disable-gfx-check --prefix="$STAGE_DIR" && - make -j $CPUS && - # Copy the executable files and ROM files - cp $(find -type f -perm +111 -name "qemu*") "$STAGE_DIR" && - cp -r pc-bios "$STAGE_DIR" - - cleanup - else - # Symlink qemu out of the host, if found. Since run-from-build.sh uses - # $PATH=.../build/host if it exists, add the various qemu instances to that. - - echo "$OLDPATH" | sed 's/:/\n/g' | while read i - do - for j in $(cd "$i"; ls qemu* 2>/dev/null) - do - ln -s "$i/$j" "$STAGE_DIR/$j" - done - done - fi -fi - if [ ! -z "$RECORD_COMMANDS" ] then # Make sure the host tools we just built are also in wrapdir