* Add grep.

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

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

@@ -7,13 +7,13 @@ let
     # stdenv-linux's dependencies, rather than building new ones with
     # dietlibc.
     bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
-      ["coreutils" "gnused" "gnutar" "bzip2" "bash" "patch" "patchelf"];
+      ["coreutils" "gnused" "gnutar" "gnugrep" "bzip2" "bash" "patch" "patchelf"];
   };
 
   generator = pkgs.stdenv.mkDerivation {
     name = "bootstrap-tools-generator";
     builder = ./make-bootstrap-tools.sh;
-    inherit (pkgsDiet) coreutils gnused gnutar bzip2 bash patch;
+    inherit (pkgsDiet) coreutils gnused gnugrep gnutar bzip2 bash patch;
     curl = pkgsDiet.realCurl;
 
     # The result should not contain any references (store paths) so

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

@@ -35,12 +35,14 @@ rm tools/bin/groups # has references
 rm tools/bin/printf # idem
 
 cp $gnused/bin/* tools/bin
+cp $gnugrep/bin/* tools/bin
 cp $gnutar/bin/* tools/bin
 cp $bzip2/bin/bunzip2 tools/bin
 cp $patch/bin/* tools/bin
 
 nukeRefs tools/bin/sed
 nukeRefs tools/bin/tar
+nukeRefs tools/bin/grep
 
 #cp $patchelf/bin/* tools/bin
 
@@ -48,7 +50,7 @@ nukeRefs tools/bin/tar
 for i in $out/in-nixpkgs/* tools/bin/*; do
     if test -x $i; then
         chmod +w $i
-        strip -s $i
+        strip -s $i || true
     fi
 done