Re: [PATCHES] gnu: bootstrap: Fix egrep and fgrep in bootstrap binaries

[Ludovic Courtès]

Mark H Weaver <address@hidden> skribis:

> From 00e491bc64f6aa1fcebd19d1aa7370d1708d9d3a Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <address@hidden>
> Date: Wed, 31 Dec 2014 03:38:26 -0500
> Subject: [PATCH 1/2] gnu: bootstrap: Add support for snippets to
>  'package-from-tarball'.
>
> * gnu/packages/bootstrap.scm (package-from-tarball): Add new keyword
>   argument #:snippet.

[...]

>             (with-directory-excursion out
>               (and (zero? (system* tar "xvf"
>                                    (string-append builddir "/binaries.tar")))
> +                  ,@(if snippet (list snippet) '())

I wonder if this should be:

  (begin ,@(if snippet (list snippet) '()))

No big deal though.  OK for this patch.

> From 34412a7202cabafd25daaa045f70aa567e867d3b Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <address@hidden>
> Date: Wed, 31 Dec 2014 03:41:50 -0500
> Subject: [PATCH 2/2] 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'.

OK.

Thanks!

Ludo’.