From e6cc3d86543581288239f58db02ca01a0f132562 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 24 Oct 2012 23:10:09 +0200
Subject: distro: Add missing commands in the bootstrap binaries.

* distro/packages/base.scm (%static-inputs): Add an `awk' -> `gawk', and
  `sh' -> `bash' symlinks.  Add `fgrep' and `egrep'.
  (%bootstrap-coreutils&co): Use new tarball that contains that
  symlink.

* distro/packages/bootstrap/x86_64-linux/bash,
  distro/packages/bootstrap/x86_64-linux/mkdir,
  distro/packages/bootstrap/x86_64-linux/tar,
  distro/packages/bootstrap/x86_64-linux/xz: Use binaries from that
  tarball (the previous binaries hadn't gone through
  `remove-store-references', which is fixed now.)
---
 distro/packages/base.scm                     |  14 +++++++++++++-
 distro/packages/bootstrap/x86_64-linux/bash  | Bin 1419928 -> 1419928 bytes
 distro/packages/bootstrap/x86_64-linux/mkdir | Bin 799312 -> 799312 bytes
 distro/packages/bootstrap/x86_64-linux/tar   | Bin 1229888 -> 1229888 bytes
 distro/packages/bootstrap/x86_64-linux/xz    | Bin 926000 -> 926000 bytes
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index fc1de80b20..107ca55098 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -1496,7 +1496,7 @@ (define %bootstrap-coreutils&co
                                  system "/static-binaries.tar.xz"))
                            (sha256
                             (base32
-                             "0bvhkzahjgf6w5i3db5bjgq8kqm6xdr23lig0s1p8fgdqbfp0bzm"))))
+                             "0azisn8l2b3cvgni9k0ahzsxs5cxrj0hmf38zgpq3k6pggk3zbfm"))))
                         "true"                    ; the program to test
                         "Bootstrap binaries of Coreutils, Awk, etc."))
 
@@ -2200,10 +2200,22 @@ (define (copy-directory source destination)
                                      (string-append bin "/" name)))))
                       (alist-delete "coreutils" %build-inputs))
 
+            ;; But of course, there are exceptions to this rule.
+            (let ((grep (assoc-ref %build-inputs "grep")))
+              (copy-file (string-append grep "/bin/fgrep")
+                         (string-append bin "/fgrep"))
+              (copy-file (string-append grep "/bin/egrep")
+                         (string-append bin "/egrep")))
+
             ;; Clear references to the store path.
             (for-each remove-store-references
                       (directory-contents bin))
 
+            (with-directory-excursion bin
+              ;; Programs such as Perl's build system want these aliases.
+              (symlink "bash" "sh")
+              (symlink "gawk" "awk"))
+
             #t)))))
     (description "Statically-linked bootstrap binaries")
     (long-description
diff --git a/distro/packages/bootstrap/x86_64-linux/bash b/distro/packages/bootstrap/x86_64-linux/bash
index 81114f79c3..3b0227fbb1 100755
Binary files a/distro/packages/bootstrap/x86_64-linux/bash and b/distro/packages/bootstrap/x86_64-linux/bash differ
diff --git a/distro/packages/bootstrap/x86_64-linux/mkdir b/distro/packages/bootstrap/x86_64-linux/mkdir
index 226865dfe6..7207ad8a46 100755
Binary files a/distro/packages/bootstrap/x86_64-linux/mkdir and b/distro/packages/bootstrap/x86_64-linux/mkdir differ
diff --git a/distro/packages/bootstrap/x86_64-linux/tar b/distro/packages/bootstrap/x86_64-linux/tar
index c9a2c27d13..9104da7b53 100755
Binary files a/distro/packages/bootstrap/x86_64-linux/tar and b/distro/packages/bootstrap/x86_64-linux/tar differ
diff --git a/distro/packages/bootstrap/x86_64-linux/xz b/distro/packages/bootstrap/x86_64-linux/xz
index 02f9014740..488e319b37 100755
Binary files a/distro/packages/bootstrap/x86_64-linux/xz and b/distro/packages/bootstrap/x86_64-linux/xz differ
-- 
cgit v1.2.3