From patchwork Mon Mar 14 22:57:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 37826 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 08A2827BBEA; Mon, 14 Mar 2022 22:59:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CA4DE27BBE9 for ; Mon, 14 Mar 2022 22:59:20 +0000 (GMT) Received: from localhost ([::1]:54842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTtep-00015e-W7 for patchwork@mira.cbaines.net; Mon, 14 Mar 2022 18:59:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTteZ-0000cH-7Q for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTteY-00054m-Uo for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTteY-00056j-Tc for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54394] [PATCH core-updates 07/12] gnu: gash-utils-boot: Create 'echo' wrapper. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Mar 2022 22:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54394@debbugs.gnu.org Cc: Timothy Sample Received: via spool by 54394-submit@debbugs.gnu.org id=B54394.164729870019493 (code B ref 54394); Mon, 14 Mar 2022 22:59:02 +0000 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:20 +0000 Received: from localhost ([127.0.0.1]:46891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtds-00054K-Bu for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:20 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:39453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdq-00053w-AW for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:18 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 2E73F5C0237; Mon, 14 Mar 2022 18:58:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=KFHEmF jgzZt6UqWAfyfrCTZ80qGSbk6k/aWnL33WRdI=; b=K1HiAHEPsr5a4vwf0uQP0A zEWk/sW9Albsb/NarJO/s0Nz8fHfOXsqBLaanXkPsFzePOG6xYM5cyLiaM3H9kOW j22Z+ZizIHtEArUeh7NeKzKC51+8euoLXS65+z98td047OLsrRgL4H7G6JLTSQbQ ficlo0qU0Fw0Kki7Nyo8NHyHrLKWe7/HI5PCTkkOBJ7Gbnf1HfZ12If0HJKDvn07 frhQV7UfsbkAWfzzdG9cVCKlHNWYJww00Qw8DvnAgIYtv1wC6KOMIEaqePM1Xn5r mdmt2lWjweC6qz54pbkt/gG09mEj2qHNPeE3Vbj4d9i4dPhSBaPDG7BeLttj+m2g == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnheptdevieffudevieeitdehieevie ethfegveelgeetveehvdffiedvffduuddukedunecuvehluhhsthgvrhfuihiivgepuden ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:12 -0400 (EDT) From: Timothy Sample Date: Mon, 14 Mar 2022 16:57:06 -0600 Message-Id: <20220314225712.19869-7-samplet@ngyro.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <87v8wg40dl.fsf@ngyro.com> References: <87v8wg40dl.fsf@ngyro.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (gash-utils-boot)[arguments]: Add a phase that generates an external wrapper for Gash's 'echo' built-in. --- gnu/packages/commencement.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e63c0b3437..df91f57b59 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -242,7 +242,19 @@ (define gash-utils-boot (copy-file (string-append gash-godir "/gash/compat.go") (string-append godir "/gash/compat.go")) (copy-recursively (string-append gash-godir "/gash/compat") - (string-append godir "/gash/compat"))))))))) + (string-append godir "/gash/compat"))))) + ;; We need an external echo. + (add-after 'install 'make-echo + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gash (assoc-ref inputs "gash"))) + (with-output-to-file (string-append out "/bin/echo") + (lambda () + (display (string-append "#!" gash "/bin/gash\n")) + (newline) + (display "echo \"$@\"") + (newline))) + (chmod (string-append out "/bin/echo") #o755)))))))) (inputs `(("gash" ,gash-boot) ("guile" ,%bootstrap-guile))) (native-inputs `(("bootar" ,bootar)))))