# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1265017609 21600
# Node ID 3d22613610096a97cab656c822347e6c7a287d5c
# Parent  1b971ccf5193c9d4b38779fb85743df4af1fbb72
Remove the --extract option from download.sh, since EXTRACT_ALL=1 does the same thing and everything _else_ is controlled by environment variables.  At it to the config file and adjust existing users.

diff -r 1b971ccf5193 -r 3d2261361009 clean.sh
--- a/clean.sh	Thu Jan 28 13:58:18 2010 -0600
+++ b/clean.sh	Mon Feb 01 03:46:49 2010 -0600
@@ -2,8 +2,11 @@
 
 # Delete all the target stages, to force them to rebuild next build.sh.
 
-# This leaves build.packages and build/host alone.  (You can delete those
-# too if you like, rm -rf build is safe, it just means ./download.sh --extract
-# and ./host-tools.sh will have to do their thing again, which takes a while.)
+# This leaves build.packages and build/host alone.  You can delete those
+# too if you like, "rm -rf build" is safe, it just means these steps will have
+# to do their thing again:
+#
+#   EXTRACT_ALL=1 ./download.sh
+#   ./host-tools.sh
 
 rm -rf build/*-*
diff -r 1b971ccf5193 -r 3d2261361009 config
--- a/config	Thu Jan 28 13:58:18 2010 -0600
+++ b/config	Mon Feb 01 03:46:49 2010 -0600
@@ -95,6 +95,16 @@
 
 # export SKIP_STRIP=1
 
+# Set this to tell download.sh to extract all the tarballs up-front right
+# after downloading them.  (Otherwise the tarball is extracted by setupfor
+# the first time the build tries to use it.)
+#
+# Extracting tarballs early is useful in order to run multiple build.sh
+# instances in parallel when building multiple targets, or to test that
+# new patches added to the sources/patches directory apply cleanly.
+
+# export EXTRACT_ALL=1
+
 # This isn't actually one of our variables, but a number of packages listen
 # to this to add extra debug info to their binaries.  (Use with SKIP_STRIP)
 
diff -r 1b971ccf5193 -r 3d2261361009 download.sh
--- a/download.sh	Thu Jan 28 13:58:18 2010 -0600
+++ b/download.sh	Mon Feb 01 03:46:49 2010 -0600
@@ -5,11 +5,6 @@
 # The tarballs are downloaded into the "packages" directory, which is
 # created as needed.
 
-# The --extract option extracts/patches each tarball into "build/packages".
-# (Otherwise this is done later when the tarball is first used by a build.)
-
-[ "$1" == "--extract" ] && EXTRACT_ALL=yes
-
 source sources/include.sh || exit 1
 
 mkdir -p "$SRCDIR" || dienow
diff -r 1b971ccf5193 -r 3d2261361009 sources/more/buildall.sh
--- a/sources/more/buildall.sh	Thu Jan 28 13:58:18 2010 -0600
+++ b/sources/more/buildall.sh	Mon Feb 01 03:46:49 2010 -0600
@@ -29,7 +29,7 @@
 
 blank_tempdir build
 mkdir -p build/logs &&
-(./download.sh --extract 2>&1 &&
+(EXTRACT_ALL=1 ./download.sh 2>&1 &&
  ./host-tools.sh 2>&1 &&
  ./simple-cross-compiler.sh 2>&1 "$STATIC_CC_HOST" ||
  dienow) | tee build/logs/build-host-cc.txt | maybe_quiet