From e6cc3d86543581288239f58db02ca01a0f132562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 24 Oct 2012 23:10:09 +0200
Subject: [PATCH] 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 @@ check whether everything is alright."
                                  system "/static-binaries.tar.xz"))
                            (sha256
                             (base32
-                             "0bvhkzahjgf6w5i3db5bjgq8kqm6xdr23lig0s1p8fgdqbfp0bzm"))))
+                             "0azisn8l2b3cvgni9k0ahzsxs5cxrj0hmf38zgpq3k6pggk3zbfm"))))
                         "true"                    ; the program to test
                         "Bootstrap binaries of Coreutils, Awk, etc."))
 
@@ -2200,10 +2200,22 @@ store.")
                                      (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 81114f79c3702c3088eab434253728ee6016d9f5..3b0227fbb1a8193a55c64a88aa7d4d1d9dfaf2e1 100755
GIT binary patch
delta 441
zcmbPnHEhP!u!a`K7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#Edtgz6jBL*?a?;`
z1hx@Ww!FJfkcXhE?W<=ACNL3HHeGwJpaVfw+q>rq9;hO$EL%co1s7pu#>zq!N`#f2
hb`^RcNQAO*p%>f)m9<|^76M{nAQstvIa&0m8vr1ct5g60

delta 441
zcmbPnHEhP!u!a`K7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#Edtgz6smFyaw{_m
z4f2w+D{_m<k~1v|vyzf>(=#%1(~PT3%C|?~5D?g=U}R8Pm19;_V49L^QeIS;ZERv%
zmR?j;Y-*g9k!w+$wY<AekcXhE?W<=ACNL3HHeGwJpaVfw+q>rq9;hO$EL%co1s7pu
p#>zq!N`#f2b`^RcNQAO*p%>f)m9<|^76M{nAQstvIa&0m8vr&VprHT&

diff --git a/distro/packages/bootstrap/x86_64-linux/mkdir b/distro/packages/bootstrap/x86_64-linux/mkdir
index 226865dfe68e98173aa5849da99d05343fa48412..7207ad8a46fcec16d204304c4e47425bf983ec53 100755
GIT binary patch
delta 422
zcmccc#NfgcgN7Ey7N!>F7M2#)7Pc1l7LF~P+#w371i*If5KaYlg36X>M|1KJRJFZ3
zoil-npt9-QS)2g`Rc)`%;=JHXP}%bA9h^c0Rc-G+#rcApptAPK*EqLNzQ(nKm7vn?
U*>|`W5MiSB3$E?jFSu2`00I4?v;Y7A

delta 422
zcmccc#NfgcgN7Ey7N!>F7M2#)7Pc1l7LF~P+#w1U=DA6kRY}QNS!NmKCMMa1x#gyr
znRx~U#ui0}83no9wL>@+*cFTnDywqLstQa~a!tyM3bTz(Ov}=Xii%B*vodlminEqy
zM|1KJRJFZ3oil-npt9-QS)2g`Rc)`%;=JHXP}%bA9h^c0Rc-G+#rcApptAPK*EqLN
czQ(nKm7vn?*>|`W5MiSB3$E?jFSu2`06@x?p8x;=

diff --git a/distro/packages/bootstrap/x86_64-linux/tar b/distro/packages/bootstrap/x86_64-linux/tar
index c9a2c27d13b408fbabd8a9fad395b87f3769269e..9104da7b53eec07393cc92bbc22441a01d5822b6 100755
GIT binary patch
delta 511
zcmX@m;eDXPyP<`#g{g(Pg{6hHg{_6Xg`<VDg{y_Tg{Osg3!m~Vg;WAyyYnnQ1!ls^
zn&<Ly*br8>`X=83b;8QB8Tnsu6INEt%fEw(pt9xO0{lD#Rc+6f;ZGoJ*!0(O{0@W-
q^Oom#$RMn2bvyqGHiF99i~IPu7xxKB*b!E``i#K#)n^2!eg^<fKEodX

delta 511
zcmX@m;eDXPyP<`#g{g(Pg{6hHg{_6Xg`<VDg{y_Tg{Osg3!m~Vg{mZ@43ng!tU}|I
zth9oHY{L}O;;hV!^z^i{WYa>+vhB{Z_!O84D{G$1$6-TQ+3K5o3)B^i3@WQ~%&H1Z
zQ*uqpiwd)iO-#$ui;9X(jk7XxEsC?YXEXA@;3llBn3sPC6G3Imy#@Gr2&&qiEyJHc
z*s$rZ<@g;48|E#~?~p-Q+3I%w6>J2RwHNpCZ!hi>kgy}HboCj5?W@lSPW=u5cs{l2

diff --git a/distro/packages/bootstrap/x86_64-linux/xz b/distro/packages/bootstrap/x86_64-linux/xz
index 02f9014740d4c0852bc4158a08536f674b8a9853..488e319b373df7091829652254a7a9b3e18ab149 100755
GIT binary patch
delta 443
zcmdmR$YR4Gi-s1)7N!>F7M2#)7Pc1l7LFFqEnJs-G*bxx-HIw*Q#}JclW98KBHIOe
zxpwy}5YUpk{Iv`>4?$Jixiz^Hm<TGH-mT5;L6j=#?R+}iM<WQT-Tt|SdxjukWvi!g
pzu+dQtbOw$?(Lfw@yrk+sC0YwRvrZbg38)gALZG;`Y3N}GypV%stN!A

delta 443
zcmdmR$YR4Gi-s1)7N!>F7M2#)7Pc1l7LFFqEnJs-G|NoP(#jGG)6!B5%_~yO4bloy
za*T@2i?TA4lCsUplXWYqbWQaP^h~DdaEojg=;hkouV7?QS(Rf}RbZNuYf@fRm~Cug
zT9#f^RBURTm62;voVEP53^xx!Rol5Wxf7TODx2P|&Fw*yD(UTfI^0Ji2&&!wxrKX%
vAYo;zr*XgFCaA1^^CIr;n-}rS5F)5_d-hfy1p$J}+E*Xt*}nQHZ)-FFQ(B${