* Add more stuff to the bootstrap builder.

* Remove some redundant *Diet values in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=6780

pkgs/stdenv/linux/make-bootstrap-tools.nix

@@ -7,13 +7,14 @@ let
     # stdenv-linux's dependencies, rather than building new ones with
     # dietlibc.
     bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
-      ["bash" "bzip2" "coreutils"];
+      ["bash" "bzip2" "coreutils" "gnutar" "patchelf"];
   };
 
   generator = pkgs.stdenv.mkDerivation {
     name = "bootstrap-tools-generator";
     builder = ./make-bootstrap-tools.sh;
-    inherit (pkgsDiet) bash bzip2 coreutils;
+    inherit (pkgsDiet) bash bzip2 coreutils gnutar;
+    curl = pkgsDiet.realCurl;
 
     # The result should not contain any references (store paths) so
     # that we can safely copy them out of the store and to other

pkgs/stdenv/linux/make-bootstrap-tools.sh

@@ -3,6 +3,11 @@ source $stdenv/setup
 ensureDir $out/in-nixpkgs
 ensureDir $out/on-server
 
+# Everything we put in check-only is merely to allow Nix to check that
+# we aren't putting binaries with store path references in tarballs.
+ensureDir $out/check-only
+
+
 nukeRefs() {
     # Dirty, disgusting, but it works ;-)
     fileName=$1
@@ -11,11 +16,35 @@ nukeRefs() {
     mv $fileName.tmp $fileName
 }
 
+
 cp $bash/bin/bash $out/in-nixpkgs
 cp $bzip2/bin/bunzip2 $out/in-nixpkgs
-cp $coreutils/bin/cp $out/in-nixpkgs
+cp $gnutar/bin/tar $out/in-nixpkgs
+cp $curl/bin/curl $out/check-only
+bzip2 < $curl/bin/curl > $out/in-nixpkgs/curl.bz2
 
 nukeRefs $out/in-nixpkgs/bash
+nukeRefs $out/in-nixpkgs/tar
 
-chmod +w $out/in-nixpkgs/*
-strip -s $out/in-nixpkgs/*
+for i in $out/in-nixpkgs/*; do
+    if test -x $i; then
+        chmod +w $i
+        strip -s $i
+    fi
+done
+
+
+mkdir tools
+mkdir tools/bin
+
+cp $coreutils/bin/* tools/bin
+rm tools/bin/groups # has references
+rm tools/bin/printf # idem
+
+#cp $patchelf/bin/* tools/bin
+tar cvfj $out/on-server/static-tools.tar.bz2 tools
+
+
+for i in $out/on-server/*.tar.bz2; do
+    (cd $out/check-only && tar xvfj $i)
+done