changeset 1095:891bb7ec58f2

Redo download logic to work with FORK=1 (spotted by Milton Miller).
author Rob Landley <rob@landley.net>
date Fri, 28 May 2010 00:50:44 -0500
parents fb9423e8bd09
children b86378217ab4
files sources/native-builds/gentoo-stage1.sh sources/native-builds/static-tools.sh
diffstat 2 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/sources/native-builds/gentoo-stage1.sh	Fri May 28 00:44:32 2010 -0500
+++ b/sources/native-builds/gentoo-stage1.sh	Fri May 28 00:50:44 2010 -0500
@@ -6,6 +6,14 @@
 # uClibc-based instead of glibc-based, and using our existing toolchain
 # (with distcc acceleration).
 
+# GFS used:
+# setup-base-packages.sh
+#   strace, Python, ncurses, bash, tar, patch, findutils, file, pax-utils,
+#   shadow
+# setup-portage.sh
+#   /etc/passwd (root and portage), /etc/group (root and portage)
+#   portage
+
 # Download all the source tarballs we haven't got up-to-date copies of.
 
 # The tarballs are downloaded into the "packages" directory, which is
--- a/sources/native-builds/static-tools.sh	Fri May 28 00:44:32 2010 -0500
+++ b/sources/native-builds/static-tools.sh	Fri May 28 00:50:44 2010 -0500
@@ -21,23 +21,24 @@
 
 URL=http://downloads.sf.net/sourceforge/strace/strace-4.5.19.tar.bz2 \
 SHA1=5554c2fd8ffae5c1e2b289b2024aa85a0889c989 \
-download || dienow
-setupfor strace
+maybe_fork download || dienow
 
 URL=http://zlib.net/zlib-1.2.4.tar.bz2 \
 SHA1=8cf10521c1927daa5e12efc5e1725a0d70e579f3 \
 maybe_fork "download || dienow"
-setupfor zlib
 
 URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2 \
 SHA1=8c1745a9b64ffae79f28e25c6fe9a8b96cac86d8 \
-download || dienow
-setupfor dropbear
+maybe_fork download || dienow
 
 echo === Got all source.
 
 cleanup_oldfiles
 
+setupfor strace
+setupfor zlib
+setupfor dropbear
+
 cat > "$WORK"/init << 'EOF' || dienow
 #!/bin/bash