From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCHES] gnu: bootstrap: Fix egrep and fgrep in bootstrap
	binaries
Date: Wed, 07 Jan 2015 18:20:23 +0100
Message-ID: <874ms24ieg.fsf@gnu.org>
References: <87387m3d0n.fsf@netris.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46008)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Y8uHW-000317-8b
	for guix-devel@gnu.org; Wed, 07 Jan 2015 12:20:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Y8uHR-0006dh-9V
	for guix-devel@gnu.org; Wed, 07 Jan 2015 12:20:30 -0500
Received: from hera.aquilenet.fr ([2a01:474::1]:59480)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1Y8uHR-0006dX-2T
	for guix-devel@gnu.org; Wed, 07 Jan 2015 12:20:25 -0500
In-Reply-To: <87387m3d0n.fsf@netris.org> (Mark H. Weaver's message of "Wed, 07
	Jan 2015 09:02:00 -0500")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Mark H Weaver <mhw@netris.org>
Cc: guix-devel@gnu.org

Mark H Weaver <mhw@netris.org> skribis:

> From 00e491bc64f6aa1fcebd19d1aa7370d1708d9d3a Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> 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 <mhw@netris.org>
> 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 arg=
ument
>   to 'package-from-tarball' that calls 'patch-shebang' on egrep and fgrep
>   after unpacking.  Test 'fgrep' instead of 'true'.

OK.

Thanks!

Ludo=E2=80=99.