02/06: gnu: bootstrap: Fix egrep and fgrep after unpacking bootstrap binaries.

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 84cbe39c5a21495647ab6528715c42e4c5b94e83
Author: Mark H Weaver <address@hidden>
Date:   Wed Dec 31 03:41:50 2014 -0500

    gnu: bootstrap: Fix egrep and fgrep after unpacking bootstrap binaries.
    
    * gnu/packages/bootstrap.scm (%bootstrap-coreutils&co): Add #:snippet 
argument
      to 'package-from-tarball' that calls 'patch-shebang' on egrep and fgrep
      after unpacking.  Test 'fgrep' instead of 'true'.
---
 gnu/packages/bootstrap.scm |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 05444dd..f1110d9 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -264,8 +264,15 @@ $out/bin/guile --version~%"
                               ("mips64el-linux"
                                (base32
                                 
"072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753"))))))
-                        "true"                    ; the program to test
-                        "Bootstrap binaries of Coreutils, Awk, etc."))
+                        "fgrep"                    ; the program to test
+                        "Bootstrap binaries of Coreutils, Awk, etc."
+                        #:snippet
+                        '(let ((path (list (string-append (getcwd) "/bin"))))
+                           (chmod "bin" #o755)
+                           (patch-shebang "bin/egrep" path)
+                           (patch-shebang "bin/fgrep" path)
+                           (chmod "bin" #o555)
+                           #t)))
 
 (define %bootstrap-binutils
   (package-from-tarball "binutils-bootstrap"