From unknown Sat Aug 16 13:42:33 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#54394 <54394@debbugs.gnu.org> To: bug#54394 <54394@debbugs.gnu.org> Subject: Status: [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap Reply-To: bug#54394 <54394@debbugs.gnu.org> Date: Sat, 16 Aug 2025 20:42:33 +0000 retitle 54394 [PATCH core-updates 00/12] Remove old GNU utilities from earl= y bootstrap reassign 54394 guix-patches submitter 54394 Timothy Sample severity 54394 normal tag 54394 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:47:58 2022 Received: (at submit) by debbugs.gnu.org; 14 Mar 2022 22:47:58 +0000 Received: from localhost ([127.0.0.1]:46857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtTp-0004mZ-V1 for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:47:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:53052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtTo-0004mM-6Y for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:47:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTtTn-0003zi-Vl for guix-patches@gnu.org; Mon, 14 Mar 2022 18:47:56 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44327) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTtTl-00032P-Dc for guix-patches@gnu.org; Mon, 14 Mar 2022 18:47:55 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 539BE5C027E for ; Mon, 14 Mar 2022 18:47:52 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 14 Mar 2022 18:47:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:message-id:mime-version :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=uSVAnv4MqVK/frw0N senZaypDwmMTRuGgyWQ0Xc8ZKU=; b=l5bFXZx52K8L24LtEjpi/WHw9qR7cumZQ /0plvnhvYmmf32aBV556jqZmSzx5uPpE7FLswPGVVqbbzVpQZPNRSraqLrrCwgBr 1+EZBSTrdFf+ehVbFf0rxghgJf4ZBMhJDOqcns2GxJ6HttJkjvlAJEQzdgB1/z44 wt5N3zzB+S3DymNJ2aLrBEpUTxHFRtwmBvIKDSqtrFlrLrXyOwOBHBaQrdfaAinY l7QZSCmDpP6Oo12MypIXkVcMN9Pf6ob05N2lWf5v7SMi8/M49ifABBxvVQpBL6Lc ME3Y1mbzH4G4Ri+Dkx6Jtj3Vg6v2cNoHOLNcvwi6sn/J80DTS26rw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvlecutefuodetggdotefrodftvfcurf hrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecunecujfgurhephffvufffkfgfgggtgfesthhqredttderje enucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhghihr ohdrtghomheqnecuggftrfgrthhtvghrnheptedtieelgfefveevtdevffdtveeggeehge eljeekleegjefggfeludetgfdvvdeunecuffhomhgrihhnpegsohhothhsthhrrghpphgr sghlvgdrohhrghdpghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 14 Mar 2022 18:47:51 -0400 (EDT) From: Timothy Sample To: guix-patches@gnu.org Subject: [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap Date: Mon, 14 Mar 2022 16:47:50 -0600 Message-ID: <87v8wg40dl.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=66.111.4.29; envelope-from=samplet@ngyro.com; helo=out5-smtp.messagingengine.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) Hi all! This is culmination of a lot of work, so I=E2=80=99m excited to be submitti= ng it! The main thrust of this series is to update Gash and Gash-Utils, and then remove most of the old GNU utilities we use during early bootstrap. To elaborate, the current situation is that we climb a ladder through time: first we build Bash 2, then we build Bash 4, and finally we build Bash 5. This is true for most GNU utilities: Sed, Gawk, Coreutils, etc. The reason? Until now, our Scheme implementations of those utilities (Gash and Gash-Utils) were very limited. Bash 2 used to be a lot more useful then Gash, for example. Now, with recent releases of Gash and Gash-Utils, the Scheme utilities are, in general, capable of powering the builds of modern GNU software. To be clear, we still climb the time-ladder in a few cases. The main ones are GCC, Glibc, and Binutils. For example, we have to use GCC 2 to transition from TCC To GCC 4 (which is the last non-C++ GCC [1]). Fixing this would require quite a bit of TCC hacking, I imagine. There are others, though. We still use old versions of Gzip, Make, patch, and Gawk. The fact that Gawk is still there disappoints me quite a bit, but =E2=80=98glibc-mesboot=E2=80=99 fails in a way that I just can=E2=80=99t fi= gure out when building with Gash-Utils. Gzip is not strictly necessary, but also pretty easy to replace. I=E2=80=99m not sure, but I think patch is only th= ere to avoid using patches in =E2=80=98origin=E2=80=99 records during bootstrap= . We now have a way to do that, so it may no longer be necessary. Make will likely need to be rewritten in Scheme, but we have a head start: Potato Make [2]. [1] https://bootstrappable.org/projects.html [2] https://github.com/spk121/potato-make Here=E2=80=99s some detailed info for reviewers. The first patch is pretty independent. That testing package has been broken since GNU Hello was upgraded to 2.11. The next two patches spruce up the =E2=80=98gnu-bootstrap=E2=80=99 module. = One fixes an omission, and the other gets it ready to handle Gash-Utils 0.2.0, which unfortunately has two module directories. The next three are updates. The bootar update optimistically assumes that someone with access will upload the source file to the Guix mirror URL: =E2=80=9Cmirror://gnu/guix/...=E2=80=9D as was done with previous vers= ions. The rest hopefully speak for themselves. Sadly, the last one is something of a jumble. Originally I wanted to remove the utilities one at a time, but it turns out there are interference effects. I can=E2=80=99t remember the exact details now, but to get an idea, removing both old Bash and old Grep might work, but removing one and then the other (in either order) might not. Hence, many utilities get updated in one commit. I have built this series all the way to the =E2=80=98hello=E2=80=99 package= (the regular one, not the =E2=80=98-mesboot=E2=80=99 one). Based on that, I assume that= everything should be fine. There=E2=80=99s always room for surprises, though! :) Let me know what you think. Timothy Sample (12): gnu: hello-mesboot: Downgrade to 2.10. gnu-bootstrap: Configure PACKAGE_NAME. gnu-bootstrap: Allow multiple module directories. gnu: gash-utils: Update to 0.2.0. gnu: bootar: Update to 1b. gnu: gash: Update to 0.3.0. gnu: gash-utils-boot: Create 'echo' wrapper. gnu: bzip2-mesboot: Remove package. gnu: sed-mesboot0: Remove package. gnu: binutils-mesboot0: Update to 2.20.1a. gnu: %boot-tcc-inputs: Remove extra "gash-utils". gnu: commencement: Remove many old utilities. gnu/local.mk | 1 - gnu/packages/commencement.scm | 895 ++++-------------- gnu/packages/patches/gash-utils-ls-test.patch | 25 - gnu/packages/shells.scm | 27 +- guix/build/gnu-bootstrap.scm | 32 +- 5 files changed, 192 insertions(+), 788 deletions(-) delete mode 100644 gnu/packages/patches/gash-utils-ls-test.patch -- Tim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:57:47 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:57:47 +0000 Received: from localhost ([127.0.0.1]:46864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdL-00051i-44 for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:57:47 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:46905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdI-00051T-Bs for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:57:45 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 0783A5C01EB; Mon, 14 Mar 2022 18:57:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:57:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=98YWU7So3TzOP7nb5nMMMag/8l19glcMbidpOJrKM 7U=; b=aSAIQAKdL4A1mQzrW6WGYjTYBhBefuxR1giXyfz8+d0SnS+8RFzbrmYW2 oiHJKynZjegiv0WSz7NPCNMc9168QCq1ZYQJt7bePDexIxnmDkvPcCjbRapPyH/1 RBnIdJZ1Im0XRMmF3noMwKfgDjjQGZ86Xm5E5W08TdKCDsNjnnX6t+b8LL3U6No2 TNxRp2n7k8PlyGXnPxzlWzOnNQOjnhFxo1c/3NhNyORfYTptC1cBi1cXPBGPHrfu dzDJCD+gYJm1qD5J3HLVuZbHV1j4ed/EN/JYwNLpydH7SbD1DUepzimWWxEkxJ5e Ncp15xgIHguTvSPnxAWiesvOIq49A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvght sehnghihrhhordgtohhmqeenucggtffrrghtthgvrhhnpeffheeltedvkefhffffkeeuve fhtdevueefueelgeektdfhleegteduteegteevueenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:57:38 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 01/12] gnu: hello-mesboot: Downgrade to 2.10. Date: Mon, 14 Mar 2022 16:57:00 -0600 Message-Id: <20220314225712.19869-1-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/commencement.scm (hello-mesboot): Downgrade to 2.10. --- gnu/packages/commencement.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 5f594d1cfc..9090fbd44e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020, 2021 Marius Bakke -;;; Copyright © 2020 Timothy Sample +;;; Copyright © 2020, 2022 Timothy Sample ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich @@ -1971,10 +1971,21 @@ (define xz-mesboot "CPPFLAGS=-D__GNUC__=1"))))) (define hello-mesboot - ;; Check for Scheme-only bootstrap. + ;; Check for Scheme-only bootstrap. Note that newer versions of Hello + ;; break due to the way that newer versions of Gnulib handle + ;; "limits.h". Hence, we stick to 2.10. (package (inherit hello) (name "hello-mesboot") + (version "2.10") + (source + (origin + (inherit (package-source hello)) + (uri (string-append "mirror://gnu/hello/hello-" version + ".tar.gz")) + (sha256 + (base32 + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:57:54 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:57:54 +0000 Received: from localhost ([127.0.0.1]:46868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdS-000523-H5 for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:57:54 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:51467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdR-00051r-7G for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:57:53 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 12AEB5C0236; Mon, 14 Mar 2022 18:57:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 14 Mar 2022 18:57:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=CkKuR/Nj/cmDyIAKBUX815fdWZfYxLzYKpddjM5j0 tk=; b=drNnWPZLrchYsZXYcukdGqXK5oX1nV6lmL/7JCWwwdVruWGtgTFrU4k8e 2AidG41tEU3q9bm+g6e6gtZWR8TTyxQ1pV85hv7KKrdYUOf1zg11XKM17Iwa8v9B UdQ+sLFteGYo0bxgWH/acyW9qwize8C+q1NwhOwiETfVDqRYnPFgOp6kZeyWRgob nUd3pP4gXt1r0imfox0Y+oDNwA+IokjiGUyBHd8J4STWUSiTnAXX8oKN5edefJaO LEugmz5hrhucWdoHQp0hcArn/ePjxZ3Ocq3vZeXVcR6T3Zd/2fKlSwsxYswWPdb5 5ZAJY0SNl2tvpiG3bSbRj7Vr4oWAw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvght sehnghihrhhordgtohhmqeenucggtffrrghtthgvrhhnpeffheeltedvkefhffffkeeuve fhtdevueefueelgeektdfhleegteduteegteevueenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:57:47 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 02/12] gnu-bootstrap: Configure PACKAGE_NAME. Date: Mon, 14 Mar 2022 16:57:01 -0600 Message-Id: <20220314225712.19869-2-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * guix/build/gnu-bootstrap.scm (bootstrap-configure): Add a 'name' argument and use it to configure the PACKAGE_NAME variable. * gnu/packages/commencement.scm (bootar, gash-boot, gash-utils-boot): Use the new argument. --- gnu/packages/commencement.scm | 8 +++++--- guix/build/gnu-bootstrap.scm | 11 ++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9090fbd44e..644db8cc58 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -120,7 +120,8 @@ (define bootar (guile (string-append guile-dir "/bin/guile"))) (invoke guile "--no-auto-compile" source) (chdir "bootar")))) - (replace 'configure (bootstrap-configure ,version "." "scripts")) + (replace 'configure (bootstrap-configure "Bootar" ,version + "." "scripts")) (replace 'build (bootstrap-build ".")) (replace 'install (bootstrap-install "." "scripts")))))) (inputs `(("guile" ,%bootstrap-guile))) @@ -156,7 +157,8 @@ (define gash-boot (use-modules (guix build gnu-bootstrap)) (modify-phases %standard-phases (replace 'configure - (bootstrap-configure ,(package-version gash) "gash" "scripts")) + (bootstrap-configure "Gash" ,(package-version gash) + "gash" "scripts")) (replace 'build (bootstrap-build "gash")) (replace 'install (bootstrap-install "gash" "scripts")) (add-after 'install 'install-symlinks @@ -219,7 +221,7 @@ (define gash-utils-boot (("@UTILITY@") "testb")) (delete-file "scripts/template.in"))) (replace 'configure - (bootstrap-configure ,(package-version gash-utils) + (bootstrap-configure "Gash-Utils" ,(package-version gash-utils) "gash" "scripts")) (replace 'build (bootstrap-build "gash")) (replace 'install (bootstrap-install "gash" "scripts")) diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm index 1cb9dc5512..7ca6ae8458 100644 --- a/guix/build/gnu-bootstrap.scm +++ b/guix/build/gnu-bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Timothy Sample +;;; Copyright © 2020, 2022 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,12 +30,12 @@ (define-module (guix build gnu-bootstrap) bootstrap-build bootstrap-install)) -(define (bootstrap-configure version modules scripts) +(define (bootstrap-configure name version modules scripts) "Create a procedure that configures an early bootstrap package. The procedure will search the MODULES directory and configure all of the -'.in' files with VERSION. It will then search the SCRIPTS directory and -configure all of the '.in' files with the bootstrap Guile and its module -and object directories." +'.in' files with NAME and VERSION. It will then search the SCRIPTS +directory and configure all of the '.in' files with the bootstrap +Guile and its module and object directories." (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (guile-dir (assoc-ref inputs "guile")) @@ -50,6 +50,7 @@ (define (bootstrap-configure version modules scripts) (let ((target (string-drop-right template 3))) (copy-file template target) (substitute* target + (("@PACKAGE_NAME@") name) (("@VERSION@") version)))) (find-files modules (lambda (fn st) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:02 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:02 +0000 Received: from localhost ([127.0.0.1]:46872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdZ-00052S-Sj for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:02 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:49541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdY-00052B-PM for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:01 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 9AE3D5C01F2; Mon, 14 Mar 2022 18:57:55 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:57:55 -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=biLz8c H3xsv7fSUbxIVteTx17M64Yqw2WrVQgUk6LHk=; b=ToV39FKyP7gpPuY1LPzUIz sQgZqkmKFOdcte6yr6dBwMummfWbNS7/elkmw5nXFQtY1EMgxAcxkUxivNwmpOkv Y40B72x1PsTaKTuqaVtIZjfFQd2gw54Ka+2OgQpasheKTHa8muPQUmxkfdP8EIhO xtmAjr+Vg5q9RiJabmVSQGz2AmUTuN/jweUlda4ABHzn+tGgey2ygtXuoX9c31UB qHTAISu0eryBVJyIGWvXshIxdcAYK4z7pZ6MPDM+g1Ze1bi3LMEkpUBydnZrURKH lW/rmxb6WhzRJBzwWV5uTyG+Ee4BuizjglUA4UV/9q5Y1cR5dTOYY5003fclHwVQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhepkeefhfeigeeuffelhffhheegve ekteegkeegkefhjeetjeevgffguddtjeevgeefnecuffhomhgrihhnpehnghihrhhordgt ohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsh grmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:57:55 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 03/12] gnu-bootstrap: Allow multiple module directories. Date: Mon, 14 Mar 2022 16:57:02 -0600 Message-Id: <20220314225712.19869-3-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * guix/build/gnu-bootstrap.scm (bootstrap-configure, bootstrap-build, bootstrap-install): Treat the 'modules' argument as a list of directories. * gnu/packages/commencement.scm (bootar, gash-boot, gash-utils-boot): Adjust call sites. --- gnu/packages/commencement.scm | 18 +++++++++--------- guix/build/gnu-bootstrap.scm | 21 ++++++++++++--------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 644db8cc58..fd3a9c37e7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -121,9 +121,9 @@ (define bootar (invoke guile "--no-auto-compile" source) (chdir "bootar")))) (replace 'configure (bootstrap-configure "Bootar" ,version - "." "scripts")) - (replace 'build (bootstrap-build ".")) - (replace 'install (bootstrap-install "." "scripts")))))) + '(".") "scripts")) + (replace 'build (bootstrap-build '("."))) + (replace 'install (bootstrap-install '(".") "scripts")))))) (inputs `(("guile" ,%bootstrap-guile))) (home-page "https://git.ngyro.com/bootar") (synopsis "Tar decompression and extraction in Guile Scheme") @@ -158,9 +158,9 @@ (define gash-boot (modify-phases %standard-phases (replace 'configure (bootstrap-configure "Gash" ,(package-version gash) - "gash" "scripts")) - (replace 'build (bootstrap-build "gash")) - (replace 'install (bootstrap-install "gash" "scripts")) + '("gash") "scripts")) + (replace 'build (bootstrap-build '("gash"))) + (replace 'install (bootstrap-install '("gash") "scripts")) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -222,9 +222,9 @@ (define gash-utils-boot (delete-file "scripts/template.in"))) (replace 'configure (bootstrap-configure "Gash-Utils" ,(package-version gash-utils) - "gash" "scripts")) - (replace 'build (bootstrap-build "gash")) - (replace 'install (bootstrap-install "gash" "scripts")) + '("gash") "scripts")) + (replace 'build (bootstrap-build '("gash"))) + (replace 'install (bootstrap-install '("gash") "scripts")) ;; XXX: The scripts should add Gash to their load paths and ;; this phase should not exist. (add-after 'install 'copy-gash diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm index 7ca6ae8458..b4257a3717 100644 --- a/guix/build/gnu-bootstrap.scm +++ b/guix/build/gnu-bootstrap.scm @@ -25,6 +25,7 @@ (define-module (guix build gnu-bootstrap) #:use-module (guix build utils) + #:use-module (srfi srfi-1) #:use-module (system base compile) #:export (bootstrap-configure bootstrap-build @@ -32,7 +33,7 @@ (define-module (guix build gnu-bootstrap) (define (bootstrap-configure name version modules scripts) "Create a procedure that configures an early bootstrap package. The -procedure will search the MODULES directory and configure all of the +procedure will search each directory in MODULES and configure all of the '.in' files with NAME and VERSION. It will then search the SCRIPTS directory and configure all of the '.in' files with the bootstrap Guile and its module and object directories." @@ -52,9 +53,8 @@ (define (bootstrap-configure name version modules scripts) (substitute* target (("@PACKAGE_NAME@") name) (("@VERSION@") version)))) - (find-files modules - (lambda (fn st) - (string-suffix? ".in" fn)))) + (append-map (lambda (dir) (find-files dir "\\.in$")) + modules)) (for-each (lambda (template) (format #t "Configuring ~a~%" template) (let ((target (string-drop-right template 3))) @@ -71,7 +71,7 @@ (define (bootstrap-configure name version modules scripts) (define (bootstrap-build modules) "Create a procedure that builds an early bootstrap package. The -procedure will search the MODULES directory and compile all of the +procedure will search each directory in MODULES and compile all of the '.scm' files." (lambda _ (add-to-load-path (getcwd)) @@ -81,13 +81,15 @@ (define (bootstrap-build modules) (dir (dirname scm))) (format #t "Compiling ~a~%" scm) (compile-file scm #:output-file go))) - (find-files modules "\\.scm$")) + (append-map (lambda (dir) (find-files dir "\\.scm$")) + modules)) #t)) (define (bootstrap-install modules scripts) "Create a procedure that installs an early bootstrap package. The -procedure will install all of the '.scm' and '.go' files in the MODULES -directory, and all the executable files in the SCRIPTS directory." +procedure will install all of the '.scm' and '.go' files in each of the +directories in MODULES, and all the executable files in the SCRIPTS +directory." (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (guile-dir (assoc-ref inputs "guile")) @@ -105,7 +107,8 @@ (define (bootstrap-install modules scripts) (install-file scm (string-append moddir "/" dir)) (format #t "Installing ~a~%" go) (install-file go (string-append godir "/" dir)))) - (find-files modules "\\.scm$")) + (append-map (lambda (dir) (find-files dir "\\.scm$")) + modules)) (for-each (lambda (script) (format #t "Installing ~a~%" script) (install-file script (string-append out "/bin"))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:08 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:08 +0000 Received: from localhost ([127.0.0.1]:46879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdg-00053Q-B8 for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:08 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:38801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtde-00052L-3r for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:06 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id E4BC25C0253; Mon, 14 Mar 2022 18:58:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 14 Mar 2022 18:58:00 -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=GllEle NQntrFkFoa3iXi4ULF02SpqCRc5Zbng6j/s00=; b=WzD9LpJOEKkdLxZG0QEr7k n//7uaFW65+1AjludSYifJiG6uTUpT4l9JlZVuDMsYIJmRlwQ62xmK8x4sqO4ly6 bsSXqNADwbl57rFg1YyVj4bcC4gS6KdiHvnuw9Lw0vwe5x7s3yEjsqBVRP+es6ID z9jO0wyL7O0cAxGFD83tZDkyq0VOLpofGjKFc29MxDjAhyZLimSvu6J2Ff+8whJ7 SOP6DwFEs1QCDWFj6ULYVI9eluPZR9H1WTL95+JPToX8wV6+BqeHmKRtf/pRB8qY MIKLyOe31VthlsG8l2zfb0+nQaE3qfIMnv84ShMcQlGLwkTRBWcOs3u6VkJ9U6xw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhepgeehffektdffffekvdeggeetff ffheeigfejleeujeekgfdvieefvdfgfeekiedvnecuffhomhgrihhnpegtohhrvgdquhht ihhlshdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:00 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 04/12] gnu: gash-utils: Update to 0.2.0. Date: Mon, 14 Mar 2022 16:57:03 -0600 Message-Id: <20220314225712.19869-4-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/gash-utils-ls-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/shells.scm (gash-utils): Update to 0.2.0. [source]: Remove patch and Guile 3.0 snippet. * gnu/packages/commencement.scm (gash-utils-boot)[source]: Do not modify parent value. [arguments]: Add "env" to the list of scripts to create in the 'pre-configure' phase; add the "gash-utils" module directory in the 'configure', 'build', and 'install' phases. --- gnu/local.mk | 1 - gnu/packages/commencement.scm | 17 ++++++------- gnu/packages/patches/gash-utils-ls-test.patch | 25 ------------------- gnu/packages/shells.scm | 13 ++-------- 4 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 gnu/packages/patches/gash-utils-ls-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 59c1b21cd6..7f6a26b943 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1077,7 +1077,6 @@ dist_patch_DATA = \ %D%/packages/patches/ganeti-shepherd-master-failover.patch \ %D%/packages/patches/ganeti-shepherd-support.patch \ %D%/packages/patches/ganeti-sphinx-compat.patch \ - %D%/packages/patches/gash-utils-ls-test.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fd3a9c37e7..405cbedd71 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -175,10 +175,6 @@ (define gash-utils-boot (package (inherit gash-utils) (name "gash-utils-boot") - (source (origin - (inherit (package-source gash-utils)) - (patches '()) - (snippet #f))) ;discard snippet for Guile 3.0 support (arguments `(#:implicit-inputs? #f #:tests? #f @@ -210,9 +206,9 @@ (define gash-utils-boot (substitute* target (("@UTILITY@") script)))) '("awk" "basename" "cat" "chmod" "cmp" "command" - "compress" "cp" "cut" "diff" "dirname" "expr" - "false" "find" "grep" "head" "ln" "ls" "mkdir" - "mv" "printf" "pwd" "reboot" "rm" "rmdir" + "compress" "cp" "cut" "diff" "dirname" "env" + "expr" "false" "find" "grep" "head" "ln" "ls" + "mkdir" "mv" "printf" "pwd" "reboot" "rm" "rmdir" "sed" "sleep" "sort" "tar" "test" "touch" "tr" "true" "uname" "uniq" "wc" "which")) (format #t "Creating scripts/[.in~%") @@ -222,9 +218,10 @@ (define gash-utils-boot (delete-file "scripts/template.in"))) (replace 'configure (bootstrap-configure "Gash-Utils" ,(package-version gash-utils) - '("gash") "scripts")) - (replace 'build (bootstrap-build '("gash"))) - (replace 'install (bootstrap-install '("gash") "scripts")) + '("gash" "gash-utils") "scripts")) + (replace 'build (bootstrap-build '("gash" "gash-utils"))) + (replace 'install + (bootstrap-install '("gash" "gash-utils") "scripts")) ;; XXX: The scripts should add Gash to their load paths and ;; this phase should not exist. (add-after 'install 'copy-gash diff --git a/gnu/packages/patches/gash-utils-ls-test.patch b/gnu/packages/patches/gash-utils-ls-test.patch deleted file mode 100644 index e1dfb9c23b..0000000000 --- a/gnu/packages/patches/gash-utils-ls-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -'ls.scm' monkey-patches (ice-9 getopt-long) to allow it to recognize '-1' -as a valid option. Unfortunately, monkey patching no longer works with -Guile 3.0 due to inlining, so change the test to make do without '-1'. - -diff --git a/tests/core-utils.org b/tests/core-utils.org -index d35ede8..22718e3 100644 ---- a/tests/core-utils.org -+++ b/tests/core-utils.org -@@ -93,14 +93,11 @@ - * ls - :script: - #+begin_src sh -- ls -1 tests/data/star -+ ls tests/data/star - #+end_src - :stdout: - #+begin_example -- 0 -- 1 -- 2 -- 3 -+ 0 1 2 3 - #+end_example - - * test-file diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 1652848705..9bd7ec291c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -904,23 +904,14 @@ (define-public gash (define-public gash-utils (package (name "gash-utils") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/gash/gash-utils-" version ".tar.gz")) (sha256 (base32 - "0ib2p52qmbac5n0s5bys4fiwim461ps546976l1n7pwbs0avh7fk")) - (patches (search-patches "gash-utils-ls-test.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure" - (("search=\"2\\.2 2\\.0\"") - "search=\"3.0 2.2 2.0\"")) - #t)))) + "18ylb54l9lmaynapbncc1zhbsirhihznrxihhxgqrpqgyjkfbap6")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:12 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:12 +0000 Received: from localhost ([127.0.0.1]:46883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdj-00053j-OE for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:12 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:47421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdg-00053D-TE for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:09 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id BAA455C0272; Mon, 14 Mar 2022 18:58:03 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:03 -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=eW5PzB 0wgKzczllB2lUawwbJdEyokkncJxF4F5pINww=; b=IG5mvmU6e7o/P9bjscJlQ2 eHYVpV6NvQBvarBqw4KPvjUlYwpCk+3J41Nh9bHrENSUSHJaEyAAuuB8MGlB73nO smwtLpqiT0IoO/tDGQyeVSATQRywrD77Ca8NyONy443tzUpC2hF/SI+Z2eqWUUtX HVpIyVzienvIwCrFJYKENBEKJ3qvLEC9VO7H70KlM9neFOis2KuIuFh7rRKeZU5q /oMzKlu2V9zgc/iQrQgIRkWTBBl3uESGe20EePWY9XZEpx9lETVTnabyHgdeokYv ShXTaXg1DXhddW7VR2isk0kORQgrqus3PlYXGae/BsmcTDnldMbP03Hh9TXO9tzw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnheptdevieffudevieeitdehieevie ethfegveelgeetveehvdffiedvffduuddukedunecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:03 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 05/12] gnu: bootar: Update to 1b. Date: Mon, 14 Mar 2022 16:57:04 -0600 Message-Id: <20220314225712.19869-5-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/commencement.scm (bootar): Update to 1b. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 405cbedd71..084921781d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -91,7 +91,7 @@ (define-module (gnu packages commencement) (define bootar (package (name "bootar") - (version "1a") + (version "1b") (source (origin (method url-fetch) (uri (list (string-append @@ -101,7 +101,7 @@ (define bootar version ".ses"))) (sha256 (base32 - "0mvp6vgx0q316fvy3z2lddlc5xgq5np3bm1fypgvj6dnayibg9np")))) + "0cf5vj5yxfvkgzvjvh2l7b2nz5ji5l534n9g4mfp8f5jsjqdrqjc")))) (build-system gnu-build-system) (arguments `(#:implicit-inputs? #f -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:14 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:14 +0000 Received: from localhost ([127.0.0.1]:46887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdm-00053y-2q for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:14 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:38175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdj-00053M-Rq for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:12 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B1E4D5C01EB; Mon, 14 Mar 2022 18:58:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:06 -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=4YaaaQ ffdtc9xGEaTTqYe6TjNOHyWYBRAWwpqoddlHw=; b=bxf64vzbA+Y6xwTwDJAbOm CVmTfhaARqb3dj6X08k3O4c9PoeIhUA2Kjbxr37KvZSJs/l5hg9gcm1cMil4MaXD ShflPzzQGsIkyt22Sda8TrEBXciOPIRu9/uYUgGcdZ6d74HmfUPJK3Go1A76Zwg5 oLuz3CIqZpKOZJQKx1VM0aQ0oBzi8NDWs68RgGl2x2a8Y4cB4t1oW4xnaBebxB2E ISiZjA/o1Rt18HpaAPRneinntpe6ZCEYoElwRenPFuAFCF9boOHaVz+ZE+u2gNui EnOy2udqMPM3NDQtcWDRF8wNxL8QeQjKklIewGc/y4WogW5L3wTpd//R7ct0tlWA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhephfejfeeuieethfefteejheekie etleehfeeihffgvdelkeeiveegueehvdehkeejnecuffhomhgrihhnpehrvgguihhrvggt thhsrdhorhhgpdhnohhnghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:06 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 06/12] gnu: gash: Update to 0.3.0. Date: Mon, 14 Mar 2022 16:57:05 -0600 Message-Id: <20220314225712.19869-6-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/shells.scm (gash): Update to 0.3.0. [source]: Remove Guile 3.0 snippet. [arguments]: Delete arguments. * gnu/packages/commencement.scm (gash-boot)[source]: Do not remove the Guile 3.0 snippet (it no longer exists). --- gnu/packages/commencement.scm | 3 --- gnu/packages/shells.scm | 14 ++------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 084921781d..e63c0b3437 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -143,9 +143,6 @@ (define gash-boot (package (inherit gash) (name "gash-boot") - (source (origin - (inherit (package-source gash)) - (snippet #f))) ;discard snippet for Guile 3.0 support (arguments `(#:implicit-inputs? #f #:tests? #f diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 9bd7ec291c..d46a6549b8 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -870,29 +870,19 @@ (define-public oil (define-public gash (package (name "gash") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/gash/gash-" version ".tar.gz")) (sha256 (base32 - "13m0yz5h9nj3x40mr6wr5xcpq1lscndfwcicw3skrz801025hhgf")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure" - (("search=\"2\\.2 2\\.0\"") - "search=\"3.0 2.2 2.0\"")) - #t)))) + "1af2jz4a6rzsshi379wzw4b8d04zvfamdhfzip2pgmk821lyqsjl")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list guile-3.0)) - (arguments - '(#:make-flags '("XFAIL_TESTS=tests/redirects.org"))) (home-page "https://savannah.nongnu.org/projects/gash/") (synopsis "POSIX-compatible shell written in Guile Scheme") (description "Gash is a POSIX-compatible shell written in Guile -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:20 2022 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 To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 07/12] gnu: gash-utils-boot: Create 'echo' wrapper. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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))))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:22 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:22 +0000 Received: from localhost ([127.0.0.1]:46895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdt-00054Y-NV for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:21 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdt-000549-7J for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:21 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 0FD615C0262; Mon, 14 Mar 2022 18:58:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:16 -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=wcYRGU 6nce503P6eSY89HRJ3K1YicvmmFnPid1rNSyQ=; b=CA9DQZfWIYj0xBgaak7UxT tjl8folKMEjrTxti9VdAfJ5oQlXZ5vv2KvYBHTMbPSAe02h5kB/YSdrIFqX5/fYZ JpK+lzBDwqg9P/FQq1jTMEQQVxsjqNJxGaSPYdMe3nz8PFAebscgqUoOGVL2Qbxj lQ0MV2SNQzObpLTBWj5DePRpHBnsFd80w9Q+sTOY2gXjHolPGkLDbDIQQREmJsX9 gQsBgQPkTomPdsHNqxQ1vg3XapkaMoKX+9/SNaQI/ldsYQX/zoo+atPNK2jpgTG3 wO7M8y0A8/tu0W4DV/+rs953wWPK3aPAiBLMG33x1OQ04v3tC4dha8HYdvWH7FXA == 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:15 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 08/12] gnu: bzip2-mesboot: Remove package. Date: Mon, 14 Mar 2022 16:57:07 -0600 Message-Id: <20220314225712.19869-8-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) gnu/packages/commencement.scm (bzip2-mesboot): Remove variable. (tcc-boot)[native-inputs]: Remove 'bzip2-mesboot'. [arguments]: Do not replace the 'unpack' phase. (%boot-tcc-inputs): Remove 'bzip2-mesboot'. --- gnu/packages/commencement.scm | 60 +---------------------------------- 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index df91f57b59..d0bac512a3 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -662,54 +662,6 @@ (define (%boot-tcc0-inputs) ("tcc" ,tcc-boot0) ,@(%boot-gash-inputs))) -(define bzip2-mesboot - ;; The initial bzip2 - (package - (inherit bzip2) - (name "bzip2-mesboot") - (version (package-version bzip2)) - (source (bootstrap-origin (package-source bzip2))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-tcc0-inputs)) - (outputs '("out")) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:tests? #f ; check is naive, also checks non-built PROGRAMS - #:strip-binaries? #f ; no strip yet - #:make-flags (list "CC=tcc -I ." "AR=tcc -ar" "bzip2" - (string-append "PREFIX=" - (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scripted-patch - (lambda _ - (substitute* "Makefile" - (("\tln " all) - (string-append "\t#" all))) - (substitute* "bzip2.c" - (("struct utimbuf uTimBuf;" all) - (string-append "// " all)) - (("uTimBuf[.]" all) - (string-append "// " all)) - (("retVal = utime [(] dstName, &uTimBuf [)];" all) - (string-append "retVal = 0; // " all))))) - (replace 'configure - (lambda _ - (with-output-to-file "utime.h" - (lambda _ (display " -#define fchown(filedes, owner, group) 0 -#define fchmod(filedes, mode) 0 -"))))) - (replace 'check - (lambda _ - (invoke "./bzip2" "--help"))) - ;; FIXME: no compressing gzip yet - (delete 'compress-documentation)))))) - (define bash-mesboot0 ;; The initial Bash (package @@ -818,8 +770,7 @@ (define tcc-boot (build-system gnu-build-system) (inputs '()) (propagated-inputs '()) - (native-inputs `(("bzip2" ,bzip2-mesboot) - ,@(%boot-tcc0-inputs))) + (native-inputs (%boot-tcc0-inputs)) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -827,14 +778,6 @@ (define tcc-boot #:strip-binaries? #f ; no strip yet #:phases (modify-phases %standard-phases - ;; tar xvf ..bz2 gives - ;; bzip2: PANIC -- internal consistency error - (replace 'unpack - (lambda* (#:key source #:allow-other-keys) - (copy-file source "tarball.tar.bz2") - (invoke "bzip2" "-d" "tarball.tar.bz2") - (invoke "tar" "xvf" "tarball.tar") - (chdir (string-append "tcc-" ,version)))) (add-after 'unpack 'scripted-patch (lambda* (#:key inputs #:allow-other-keys) (substitute* "libtcc.c" @@ -982,7 +925,6 @@ (define sed-mesboot0 (define (%boot-tcc-inputs) `(("bash" ,bash-mesboot0) - ("bzip2" ,bzip2-mesboot) ("gzip" ,gzip-mesboot) ("patch" ,patch-mesboot) ("sed" ,sed-mesboot0) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:26 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:26 +0000 Received: from localhost ([127.0.0.1]:46899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdy-00054r-1y for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:26 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:41669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdw-00054J-Iw for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:24 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 6C6E75C01EB; Mon, 14 Mar 2022 18:58:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 14 Mar 2022 18:58:19 -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=Pu+q/1 PrjYatDcaBCRRfsC0avReT74LO9m4bubJilJc=; b=M+6gWZJI0QtqV2iRk5aBCj vikE4HXmdFVeja4tG+cHlyXQ20B6T5pAkdkhgC1oKR2oIgw41q9BTjVfZAfnpKaD E4MwasK5HjPxu4EtwJhavxWJiHcM6zo/45qpcrDqxXgBFhK2fCwNpHNHDuDYiej3 crNc/YZBHTW21jNhOCRg9gBIDYLzyUUmu5odlKdiUImpiBMxeqOgdI8qIIsNqu1O 2+u7m5aRL14OwMRTKGe4WuWIP7YNJr71+U1kLpZ6EvIk+i0Wdrg9yCUg1cgeO99i UtMwb6CuG24moRYqYT5/S7WxF+PvG6gx0Nc2LmBp8gVyXu8XM2Hy/CAUyA+WqwnQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnheptdevieffudevieeitdehieevie ethfegveelgeetveehvdffiedvffduuddukedunecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:19 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 09/12] gnu: sed-mesboot0: Remove package. Date: Mon, 14 Mar 2022 16:57:08 -0600 Message-Id: <20220314225712.19869-9-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/commencement.scm (sed-mesboot0): Remove variable. (%boot-tcc-inputs): Remove 'sed-mesboot0'. --- gnu/packages/commencement.scm | 44 ----------------------------------- 1 file changed, 44 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d0bac512a3..49b7defffb 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -881,54 +881,10 @@ (define patch-mesboot ;; FIXME: no compressing gzip yet (delete 'compress-documentation)))))) -(define sed-mesboot0 - ;; The initial sed. - (package - (inherit sed) - (name "sed-mesboot0") - (version "1.18") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/sed/sed-" - version ".tar.gz")) - (sha256 - (base32 - "1hyv7i82jd0q18xcql51ylc8jwadp3gb3irgcqlis3v61p35jsv2")))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-tcc0-inputs)) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:configure-flags '("CC=tcc") - #:make-flags '("CC=tcc" "extra_objs=" "DEFS=-D HAVE_BCOPY") - #:strip-binaries? #f ; no strip yet - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scripted-patch - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (substitute* "configure" - (("/bin/sh") shell))))) - (replace 'check - (lambda _ - (invoke "./sed" "--version"))) - (replace 'install - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (install-file "sed" bin))))))))) - (define (%boot-tcc-inputs) `(("bash" ,bash-mesboot0) ("gzip" ,gzip-mesboot) ("patch" ,patch-mesboot) - ("sed" ,sed-mesboot0) - ;; Place lower than sed so we don't override it. ("gash-utils" ,gash-utils-boot) ("tcc" ,tcc-boot) ,@(alist-delete "tcc" (%boot-tcc0-inputs)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:30 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:30 +0000 Received: from localhost ([127.0.0.1]:46903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTte2-000556-9u for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:30 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTte0-00054i-7r for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:28 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 19E475C0262; Mon, 14 Mar 2022 18:58:23 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:23 -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=3MZ1g6 KpJPRr6bOdyMT7+VbTPyw8v+7zvU3JfYNjve0=; b=mdbpFqf6haJ5V0/YHn5LcW +TBHcVxVRZYdYafqxBW5Eii6xz9AbtQLXhly+AqHziFD2SfRzTkjF0uJOfuAdR4u q6lSWS94QBGcKtZHDioA8he/ByUXmT1pqUOBCJH+ljnK37r/IIlDrv9UbeHKLgFN U35eM0P+d5Ab6Q4EmFNaRNHNahkf9WrUT/DdmVqDrcKs7dcdCTbi9FuIlkMt1GEY WBy8oc2YXz/ABiUtXPG0qnDFe9csJlA53gLAVoRlHcm2ein6AitFGz7maYgcahT5 tBPZJiMeyueJoguOnERw6R7ibJmDGTqTFPXCJiAyFME8UAbO8UCYp01pXx0Pt4jQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnheptdevieffudevieeitdehieevie ethfegveelgeetveehvdffiedvffduuddukedunecuvehluhhsthgvrhfuihiivgepfeen ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:22 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 10/12] gnu: binutils-mesboot0: Update to 2.20.1a. Date: Mon, 14 Mar 2022 16:57:09 -0600 Message-Id: <20220314225712.19869-10-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This restores the package to how it was before the Scheme-only bootstrap. See cb167958ea904fc79913b883cb771e2d691402e0. * gnu/packages/commencement.scm (binutils-mesboot0): Update to 2.20.1a. (binutils-mesboot1)[arguments]: Remove #:phases substitution. (binutils-mesboot): Inherit from binutils-mesboot1, changing only the native-inputs field. --- gnu/packages/commencement.scm | 140 +++++++--------------------------- 1 file changed, 27 insertions(+), 113 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 49b7defffb..6dd480dc11 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -894,14 +894,17 @@ (define binutils-mesboot0 (package (inherit binutils) (name "binutils-mesboot0") - (version "2.14") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/binutils/binutils-" - version ".tar.gz")) - (sha256 - (base32 - "1w8xp7k44bkijr974x9918i4p1sw4g2fcd5mxvspkjpg38m214ds")))) + (version "2.20.1a") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.bz2")) + (patches (search-patches "binutils-boot-2.20.1a.patch")) + (patch-guile %bootstrap-guile) + (sha256 + (base32 + "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))) (inputs '()) (propagated-inputs '()) (native-inputs (%boot-tcc-inputs)) @@ -913,40 +916,21 @@ (define binutils-mesboot0 #:parallel-build? #f #:strip-binaries? #f ; no strip yet #:configure-flags - (let ((out (assoc-ref %outputs "out"))) - `("--disable-nls" + (let ((cppflags (string-append " -D __GLIBC_MINOR__=6" + " -D MES_BOOTSTRAP=1")) + (bash (assoc-ref %build-inputs "bash"))) + `(,(string-append "CONFIG_SHELL=" bash "/bin/sh") + ,(string-append "CPPFLAGS=" cppflags) + "AR=tcc -ar" + "CXX=false" + "RANLIB=true" + ,(string-append "CC=tcc" cppflags) + "--disable-nls" "--disable-shared" "--disable-werror" - "--build=i386-unknown-linux" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" - "--with-sysroot=/" - ,(string-append "--prefix=" out))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (setenv "CONFIG_SHELL" shell) - (setenv "SHELL" shell) - (setenv "AR" "tcc -ar") - (setenv "RANLIB" "true") - (setenv "CC" "tcc -D __GLIBC_MINOR__=6")))) - (add-after 'unpack 'scripted-patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "bfd/configure" - (("^sed -e '/SRC-POTFILES.*" all) - "echo -e 'all:\\n\\ttrue\\n\\ninstall:\\n\\ttrue\\n' > po/Makefile\n")))) - (replace 'configure ; needs classic invocation of configure - (lambda* (#:key configure-flags #:allow-other-keys) - (format (current-error-port) - "running ./configure ~a\n" (string-join configure-flags)) - (apply system* "./configure" configure-flags) - (substitute* "config.status" - (("[.]//dev/null") "/dev/null")) - (invoke "sh" "./config.status")))))))) + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/")))))) (define gcc-core-mesboot0 ;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C @@ -1420,15 +1404,7 @@ (define binutils-mesboot1 "--build=i686-unknown-linux-gnu" "--host=i686-unknown-linux-gnu" "--with-sysroot=/" - ,(string-append "--prefix=" out)))) - ((#:phases phases) - `(modify-phases ,phases - (replace 'setenv - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (setenv "CONFIG_SHELL" shell)))))))))) + ,(string-append "--prefix=" out)))))))) (define coreutils-mesboot0 (package @@ -1911,72 +1887,10 @@ (define hello-mesboot (define binutils-mesboot (package - (inherit binutils) + (inherit binutils-mesboot1) (name "binutils-mesboot") - (version "2.20.1a") - (source (bootstrap-origin - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/binutils/binutils-" - version ".tar.bz2")) - (patches (search-patches "binutils-boot-2.20.1a.patch")) - (sha256 - (base32 - "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))) - (inputs '()) - (propagated-inputs '()) (native-inputs `(("xz" ,xz-mesboot) - ,@(%boot-mesboot2-inputs))) - (supported-systems '("i686-linux" "x86_64-linux")) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:tests? #f ; runtest: command not found - #:parallel-build? #f - #:strip-binaries? #f ; no strip yet - #:configure-flags - `("CC=gcc" - "CXX=false" - "RANLIB=true" - "--disable-doc" - "--disable-nls" - "--disable-shared" - "--disable-werror" - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - "--with-sysroot=/" - ;; checking for grep that handles long lines and -e - "ac_cv_path_GREP=grep") - ;; FIXME: ac_cv_path_GREP=grep doesn't seem to be forwarded to - ;; cascading configure's? - #:make-flags '("ac_cv_path_GREP=grep") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scripted-patch - (lambda _ - ;; sed-mesboot0 cannot build these - (copy-file "binutils/Makefile.in" "binutils/Makefile.in.orig") - (substitute* "binutils/Makefile.in" - ;; binutils/binutils uses an amazingly complex install - ;; command, using FOR, SED, READ, IF, ECHO, SED, SED, AWK, - ;; READ, and then LIBTOOL (to do something like - ;; `mkdir $DESTDIR$bindir; cp readline $DESTDIR$bindir ...') - - ;; Some tool [debugme!] cannot handle two escaped newlines - ;; (bash?), and the install stops after $(am__EXEEXT_11) - ;; ("objcopy"), so $(am__EXEEXT_13) ("readelf") and others do - ;; not get installed. Remove the stray newline: - (("^\t@BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ .*") "")) - (substitute* "opcodes/Makefile.in" - (("^SUBDIRS = [.] po") "SUBDIRS = .")) - (substitute* "binutils/Makefile.in" - (("^SUBDIRS = doc po") "SUBDIRS =")) - (substitute* "gas/Makefile.in" - (("^SUBDIRS = doc po") "SUBDIRS =")) - (substitute* "gprof/Makefile.in" - (("^SUBDIRS = po") "SUBDIRS =")) - (substitute* "ld/Makefile.in" - (("^SUBDIRS = po") "SUBDIRS ="))))))))) + ,@(%boot-mesboot2-inputs))))) (define (%boot-mesboot3-inputs) `(("binutils" ,binutils-mesboot) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:40 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:40 +0000 Received: from localhost ([127.0.0.1]:46907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTteB-00055W-Px for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:39 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:56297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTte9-00055H-On for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:38 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 99F1C5C0237; Mon, 14 Mar 2022 18:58:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 14 Mar 2022 18:58:32 -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=cMsZy3 Ojrt2+hBZ8AZfpR+AltSsyx32LOq6PPggt9yw=; b=gR4ZDeaeinPkzce8uJaqyd TBcs8toKwEGA3jQayD1BKkjnT4bZTZD5/nN2qEoefVsFYPJ5sBEZFK03vHkrLFhs 6gym9VpvXw2Lr05dkxl2fNt5PTBXZxAmXWH896hvjm4Ux55NRYIPtylkbGSbhMmn PwC14xhI0txynu35hKovRAvbwrtSQTnICq1CSDc2EbAfeHeGLug7J4Ju2XlxhWCI /4bFeAAbFe2WcHbAwOvEe69H3JBbipjDehfRAuGxFYgG6NmlYe8mALgtehSry6P6 0agQgvtwKzzqCVngqH6vy080HgMQFNuDGfdYcnnajeAFQSuQoJDyBGkLDc6DvvGw == 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:32 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 11/12] gnu: %boot-tcc-inputs: Remove extra "gash-utils". Date: Mon, 14 Mar 2022 16:57:10 -0600 Message-Id: <20220314225712.19869-11-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/commencement.scm (%boot-tcc-inputs): Remove 'gash-utils-boot' (it is already included in '%boot-gash-inputs' under the name "coreutils"). --- gnu/packages/commencement.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6dd480dc11..13862bf02e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -885,7 +885,6 @@ (define (%boot-tcc-inputs) `(("bash" ,bash-mesboot0) ("gzip" ,gzip-mesboot) ("patch" ,patch-mesboot) - ("gash-utils" ,gash-utils-boot) ("tcc" ,tcc-boot) ,@(alist-delete "tcc" (%boot-tcc0-inputs)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 14 18:58:46 2022 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:46 +0000 Received: from localhost ([127.0.0.1]:46911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTteF-00055m-06 for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:46 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:42529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTteD-00055M-18 for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:42 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id D4EEE5C0277; Mon, 14 Mar 2022 18:58:34 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=tdfoOEYhK63a++0K4Ny1f1N9htAcqyDQv4cE8r8QE Ks=; b=kM/T2hVu+XHDUUiCcgu4TlSR2lTeD1DdghR/9TOngQ9NzEcrQBWnDqy9+ 33dsLd2El71AXBrDM1dQXa3HR/QIIOHGG0Md/xbD8kdGtH2Jwc1zhxYa+WauAi3h XBzGYACdt9EDo0tbun1Tismwqvu0vayX4Wg+t7/A+tkWUKlKaQfRFM+vcs1dxFMw KoMTW3cAXwHBUOFRCJynv9m0joY7dYgBS8RY01jyzDTuX2g82VlRykNB1/OFfu2Y be60RZnCD27z1aZCJ60nX/klpKY+O0do6GVyK/x0WhCSYJ0m7V4y+GfICNbs6XQn C4TcTfmrgffGVIefasQ+0v1W0vxlA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvght sehnghihrhhordgtohhmqeenucggtffrrghtthgvrhhnpeegiedtvedvteegfeeghfduje efleeuueevuddtjeduheehgeevvdelkeetgeelfeenucffohhmrghinhepthhukhgrrghn ihdrohhrghdpmhhulhhtihhprhgvtghishhiohhnrdhorhhgnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdr tghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:34 -0400 (EDT) From: Timothy Sample To: 54394@debbugs.gnu.org Subject: [PATCH core-updates 12/12] gnu: commencement: Remove many old utilities. Date: Mon, 14 Mar 2022 16:57:11 -0600 Message-Id: <20220314225712.19869-12-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: Timothy Sample X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/commencement.scm (bash-mesboot0): Delete variable... (%boot-tcc-inputs): ...and remove it from here. (gawk-mesboot0): Delete variable... (%boot-mesboot-core-inputs): ...and remove it from here. (coreutils-mesboot0): Delete variable. (%boot-mesboot1-inputs): Remove 'bash-mesboot', 'coreutils-mesboot0', 'gawk-mesboot', 'grep-mesboot', 'sed-mesboot', and 'tar-mesboot' from the list of inputs to add; and remove "bash", "bootar", "coreutils", "gash", "gawk", "grep", "guile", "sed", and "tar" from the list of inputs to delete. (hello-mesboot)[native-inputs]: Remove 'xz-mesboot'. (gawk-mesboot)[native-inputs]: Use '%boot-mesboot2-inputs'. (%boot-mesboot3-inputs): Remove 'xz-mesboot'; add 'gawk-mesboot'. (glibc-headers-mesboot)[arguments]: Add 'remove-bashism' phase. (glibc-mesboot)[arguments]: Add 'simplify-intl-tests' phase. (gcc-mesboot1-wrapper)[native-inputs]: Replace 'bash-mesboot' and 'coreutils-mesboot0' with 'gash-boot' and 'gash-utils-boot'. (gcc-mesboot-wrapper): Likewise. (mesboot-package): New procedure. (bash-mesboot, coreutils-mesboot, grep-mesboot, sed-mesboot, xz-mesboot, tar-mesboot): Recreate in terms of 'mesboot-package' using up-to-date versions. (%boot-mesboot6-inputs): Add 'bash-mesboot', 'coreutils-mesboot', 'grep-mesboot', 'sed-mesboot', 'tar-mesboot', and 'xz-mesboot' to the list of inputs to add; and add "bash" and "bootar" to the list of inputs to delete. --- gnu/packages/commencement.scm | 599 ++++++---------------------------- 1 file changed, 107 insertions(+), 492 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 13862bf02e..7147e5860f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -662,104 +662,6 @@ (define (%boot-tcc0-inputs) ("tcc" ,tcc-boot0) ,@(%boot-gash-inputs))) -(define bash-mesboot0 - ;; The initial Bash - (package - (inherit static-bash) - (name "bash-mesboot0") - (version "2.05b") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/bash/bash-" - version ".tar.gz")) - (sha256 - (base32 - "1r1z2qdw3rz668nxrzwa14vk2zcn00hw7mpjn384picck49d80xs")))) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-tcc0-inputs)) - (outputs '("out")) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:strip-binaries? #f ; no strip yet - #:configure-flags - (list "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - - "--without-bash-malloc" - "--disable-readline" - "--disable-history" - "--disable-help-builtin" - "--disable-progcomp" - "--disable-net-redirections" - "--disable-nls" - - ;; Pretend 'dlopen' is missing so we don't build loadable - ;; modules and related code. - "ac_cv_func_dlopen=no") - #:make-flags '("bash") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda _ - (let* ((gash (assoc-ref %build-inputs "bash")) - (shell (string-append gash "/bin/gash"))) - (setenv "CONFIG_SHELL" shell) - (setenv "SHELL" shell) - (setenv "CC" "tcc") - (setenv "LD" "tcc") - (setenv "AR" "tcc -ar") - (setenv "CFLAGS" "-D _POSIX_VERSION=1")))) - (add-after 'unpack 'scripted-patch - (lambda _ - (substitute* "Makefile.in" - (("mksyntax\\.c\n") "mksyntax.c -lgetopt\n") - (("buildversion[.]o\n") "buildversion.o -lgetopt\n") - ;; No size in Gash - (("\tsize ") "#\tsize")) - (substitute* "lib/sh/oslib.c" - (("int name, namelen;") "char *name; int namelen;")) - (substitute* "lib/sh/snprintf.c" - (("^#if (defined [(]HAVE_LOCALE_H[)])" all define) (string-append "#if 0 //" define))) - (substitute* "configure" - ((" egrep") " grep")))) - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - (let ((configure-flags (filter (lambda (x) - (and (not (string-prefix? "CONFIG_SHELL=" x)) - (not (string-prefix? "SHELL=" x)))) - configure-flags))) - (format (current-error-port) - "running ./configure ~a\n" (string-join configure-flags))) - (apply invoke (cons "./configure" configure-flags)))) - (add-after 'configure 'configure-fixups - (lambda _ - (substitute* "config.h" - (("#define GETCWD_BROKEN 1") "#undef GETCWD_BROKEN")) - (let ((config.h (open-file "config.h" "a"))) - (display " -// tcc: error: undefined symbol 'enable_hostname_completion' -#define enable_hostname_completion(on_or_off) 0 - -// /gnu/store/…-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined twice -#define HAVE_POSIX_SIGNALS 1 -#define endpwent(x) 0 -" - config.h) - (close config.h)))) - (replace 'check - (lambda _ - (invoke "./bash" "--version"))) - (replace 'install - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (copy-file "bash" (string-append bin "/bash")) - (copy-file "bash" (string-append bin "/sh")))))))))) - (define tcc-boot ;; The final tcc. (package @@ -882,8 +784,7 @@ (define patch-mesboot (delete 'compress-documentation)))))) (define (%boot-tcc-inputs) - `(("bash" ,bash-mesboot0) - ("gzip" ,gzip-mesboot) + `(("gzip" ,gzip-mesboot) ("patch" ,patch-mesboot) ("tcc" ,tcc-boot) ,@(alist-delete "tcc" (%boot-tcc0-inputs)))) @@ -1056,7 +957,6 @@ (define gcc-core-mesboot0 (define (%boot-mesboot-core-inputs) `(("binutils" ,binutils-mesboot0) - ("gawk" ,gawk-mesboot0) ("gcc" ,gcc-core-mesboot0) ,@(alist-delete "tcc" (%boot-tcc-inputs)))) @@ -1087,72 +987,6 @@ (define mesboot-headers (copy-recursively "include" out) (copy-recursively headers out))))))))) -(define gawk-mesboot0 - ;; The initial Gawk. - (package - (inherit gawk) - (name "gawk-mesboot0") - (version "3.0.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gawk/gawk-" - version ".tar.gz")) - (sha256 - (base32 - "087s7vpc8zawn3l7bwv9f44bf59rc398hvaiid63klw6fkbvabr3")))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-tcc-inputs)) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:configure-flags '("--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - "--disable-nls") - #:make-flags '("gawk") - #:parallel-build? #f - #:parallel-tests? #f - #:strip-binaries? #f ; no strip yet - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scripted-patch - (lambda _ - (substitute* "Makefile.in" - (("date ") "echo today ") - ((" autoheader") "true") - ((" -lm ") " ")) - (substitute* "test/Makefile.in" - (("^bigtest:.*") "bigtest: basic\n") - (("( |\t)(childin|convfmt|fflush|longwrds|math|negexp)" all sep) sep)))) - (add-before 'configure 'setenv - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (setenv "CONFIG_SHELL" shell) - (setenv "SHELL" shell) - (setenv "CC" "tcc") - (setenv "CPP" "tcc -E") - (setenv "LD" "tcc") - (setenv "ac_cv_func_getpgrp_void" "yes") - (setenv "ac_cv_func_tzset" "yes")))) - (replace 'configure ; needs classic invocation of configure - (lambda* (#:key configure-flags #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (configure-flags - `(,@configure-flags - ,(string-append "--prefix=" out)))) - (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) - (system* "touch" "configure") ; aclocal.m4 is newer than configure - (apply invoke (cons "./configure" configure-flags))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "gawk" bin) - (symlink "gawk" (string-append bin "/awk")))))))))) - (define glibc-mesboot0 ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build ;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer @@ -1297,97 +1131,6 @@ (define (%boot-mesboot0-inputs) ("libc" ,glibc-mesboot0) ,@(alist-delete "gcc" (%boot-mesboot-core-inputs)))) -(define tar-mesboot - ;; Initial tar with support for xz compression. - (package - (inherit tar) - (name "tar-mesboot") - (version "1.22") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/tar/tar-" - version ".tar.gz")) - (sha256 - (base32 - "19nvix64y95n5v6rr5g9g3fn08zz85cb5anzd7csfv4a4sz9lw4y")))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-mesboot0-inputs)) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:tests? #f ; check is naive, also checks non-built PROGRAMS - #:strip-binaries? #f ; no strip yet - #:configure-flags '("--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - "--disable-nls") - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (setenv "CONFIG_SHELL" shell) - (setenv "SHELL" shell) - (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") - (setenv "gl_cv_func_rename_dest_works" "yes") - (format (current-error-port) - "running ./configure ~a\n" (string-join configure-flags)) - (apply invoke (cons "./configure" configure-flags))))) - (add-after 'unpack 'scripted-patch - (lambda _ - (let* ((bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (substitute* "configure" - ((" /bin/sh") shell))) - (substitute* "Makefile.in" - (("^SUBDIRS = doc") "SUBDIRS =")))) - (replace 'install - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (install-file "src/tar" bin))))))))) - -(define grep-mesboot - ;; The initial grep. - (package - (inherit grep) - (name "grep-mesboot") - (version "2.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/grep/grep-" - version ".tar.gz")) - (sha256 - (base32 - "1w862l80lgc5mxvpiy4cfwk761d6xxavn0m3xd2l7xs2kmzvp6lq")))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-mesboot0-inputs)) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-configure - (lambda _ - (let* ((bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (substitute* "configure" - ((" [|][|] ./config.status") " || sh ./config.status"))))) - (replace 'install - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (install-file "grep" bin) - (symlink "grep" (string-append bin "/egrep")) - (symlink "grep" (string-append bin "/fgrep")))))))))) - (define binutils-mesboot1 (package (inherit binutils-mesboot0) @@ -1405,37 +1148,6 @@ (define binutils-mesboot1 "--with-sysroot=/" ,(string-append "--prefix=" out)))))))) -(define coreutils-mesboot0 - (package - (inherit coreutils) - (name "coreutils-mesboot0") - ;; The latest .gz release of Coreutils is 8.13; which does not build with gcc-2.95.3: - ;; randperm.c: In function `sparse_swap': - ;; randperm.c:117: invalid lvalue in unary `&' - (version "5.0") ; 2003-04 - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/coreutils/coreutils-" - version ".tar.gz")) - (sha256 - (base32 - "10wq6k66i8adr4k08p0xmg87ff4ypiazvwzlmi7myib27xgffz62")))) - (native-inputs (%boot-mesboot0-inputs)) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (arguments - `(#:implicit-inputs? #f - #:tests? #f ; WARNING: `perl' is needed, ... - #:parallel-build? #f - #:strip-binaries? #f ; strip: unrecognized option `--only-keep-debug' - #:guile ,%bootstrap-guile - #:configure-flags - '("--disable-doc" - "LIBS=-lc -lnss_files -lnss_dns -lresolv" - "ac_cv_func_gethostbyname=no" - "gl_cv_func_rename_dest_works=yes"))))) - (define gnu-make-mesboot (package (inherit gnu-make) @@ -1468,150 +1180,11 @@ (define gnu-make-mesboot (bin (string-append out "/bin"))) (install-file "make" bin))))))))) -(define gawk-mesboot - (package - (inherit gawk) - (name "gawk-mesboot") - (version "3.1.8") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gawk/gawk-" - version ".tar.gz")) - (sha256 - (base32 - "03d5y7jabq7p2s7ys9alay9446mm7i5g2wvy8nlicardgb6b6ii1")))) - (native-inputs `(,@(%boot-mesboot0-inputs) - ("mesboot-headers" ,mesboot-headers))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (arguments - `(#:implicit-inputs? #f - #:parallel-build? #f - #:guile ,%bootstrap-guile - #:configure-flags '("ac_cv_func_connect=no") - #:make-flags '("gawk") - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "./gawk" "--version"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "gawk" bin) - (symlink "gawk" (string-append bin "/awk")))))))))) - -(define sed-mesboot - (package - (inherit sed) - (name "sed-mesboot") - (version "4.0.6") ; 2003-04 - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/sed/sed-" - version ".tar.gz")) - (sha256 - (base32 - "0861ij94cqc4vaaki6r2wlapwcmhpx4ggp4r70f46mb21a8fkvf1")))) - (native-inputs (%boot-mesboot0-inputs)) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (arguments - `(#:implicit-inputs? #f - #:parallel-build? #f - #:guile ,%bootstrap-guile - #:tests? #f ; 8to7 fails - #:phases - (modify-phases %standard-phases - (add-after 'unpack '/bin/sh - (lambda _ - (let* ((bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (substitute* "testsuite/Makefile.tests" - (("^SHELL = /bin/sh") - (string-append "SHELL = " shell))))))))))) - -(define bash-mesboot - (package - (inherit bash-mesboot0) - (version "4.4") - (name "bash-mesboot") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/bash/bash-" - version ".tar.gz")) - (sha256 - (base32 - "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq")))) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-mesboot0-inputs)) - (outputs '("out")) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:configure-flags - '("--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - - "--without-bash-malloc" - "--disable-readline" - "--disable-history" - "--disable-help-builtin" - "--disable-progcomp" - "--disable-net-redirections" - "--disable-nls" - - ;; Pretend 'dlopen' is missing so we don't build loadable - ;; modules and related code. - "ac_cv_func_dlopen=no") - #:make-flags '("bash") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scripted-patch - (lambda _ - (substitute* "shell.c" - ((";;") ";")))) - (add-before 'configure 'setenv - (lambda _ - (setenv "AWK" "gawk") - (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") - (setenv "gl_cv_func_rename_dest_works" "yes"))) - (add-after 'configure 'configure-fixups - (lambda _ - (let ((config.h (open-file "config.h" "a"))) - (display (string-append " -#define enable_hostname_completion(on_or_off) 0 -") - config.h) - (close config.h)))) - (replace 'check - (lambda _ - (invoke "./bash" "--version"))) - (replace 'install - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (copy-file "bash" (string-append bin "/bash")) - (copy-file "bash" (string-append bin "/sh")))))))))) - (define (%boot-mesboot1-inputs) - `(("bash" ,bash-mesboot) - ("binutils" ,binutils-mesboot1) - ("coreutils" ,coreutils-mesboot0) - ("gawk" ,gawk-mesboot) - ("grep" ,grep-mesboot) + `(("binutils" ,binutils-mesboot1) ("make" ,gnu-make-mesboot) - ("sed" ,sed-mesboot) - ("tar" ,tar-mesboot) ,@(fold alist-delete (%boot-mesboot0-inputs) - '("bash" "binutils" "bootar" "coreutils" "gash" - "gawk" "grep" "guile" "make" "sed" "tar")))) + '("binutils" "make")))) (define gmp-boot (let ((version "4.3.2")) @@ -1805,52 +1378,6 @@ (define (%boot-mesboot2-inputs) `(("gcc" ,gcc-mesboot1) ,@(alist-delete "gcc" (%boot-mesboot1-inputs)))) -(define xz-mesboot - ;; Finally, we can build xz. - (package - (inherit xz) - (name "xz-mesboot") - (version "5.0.0") - (source (bootstrap-origin - (origin - (method url-fetch) - (uri (list (string-append "http://tukaani.org/xz/xz-" version - ".tar.gz") - (string-append "http://multiprecision.org/guix/xz-" - version ".tar.gz"))) - (sha256 - (base32 - "0kf40ggbs1vaaj5s9k4csycahzqcf65n20pa6lngqhm6j0cj3agb"))))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (outputs '("out")) - (propagated-inputs '()) - (native-inputs (%boot-mesboot2-inputs)) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:configure-flags - `("--disable-assembler" - "--disable-shared" - "--enable-small" - "--disable-threads" - "--disable-xzdec" - "--disable-lzmadec" - "--disable-lzmainfo" - "--disable-lzma-links" - "--disable-scripts" - "--disable-doc" - "--disable-nls" - "--disable-symbol-versions" - ;; configure disqualifies BASH, CPP, GCC and GREP - ;; all of which seem fine for the build - "ac_cv_prog_cc_c99=-std=gnu9x" - "ac_cv_path_GREP=grep" - "gl_cv_posix_shell=bash" - "ac_cv_have_decl_optreset=no" - "CPPFLAGS=-D__GNUC__=1"))))) - (define hello-mesboot ;; Check for Scheme-only bootstrap. Note that newer versions of Hello ;; break due to the way that newer versions of Gnulib handle @@ -1888,12 +1415,49 @@ (define binutils-mesboot (package (inherit binutils-mesboot1) (name "binutils-mesboot") - (native-inputs `(("xz" ,xz-mesboot) - ,@(%boot-mesboot2-inputs))))) + (native-inputs (%boot-mesboot2-inputs)))) + +;; Sadly we have to introduce Gawk here. The "versions.awk" script of +;; glibc 2.16.0 is too complicated for Gash-Utils. This is the version +;; of Gawk used previously during bootstrap. It's possible that a newer +;; version would work, too, but this one was already ready to go. +(define gawk-mesboot + (package + (inherit gawk) + (name "gawk-mesboot") + (version "3.1.8") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gawk/gawk-" + version ".tar.gz")) + (sha256 + (base32 + "03d5y7jabq7p2s7ys9alay9446mm7i5g2wvy8nlicardgb6b6ii1")))) + (native-inputs (%boot-mesboot2-inputs)) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (arguments + `(#:implicit-inputs? #f + #:parallel-build? #f + #:guile ,%bootstrap-guile + #:configure-flags '("ac_cv_func_connect=no") + #:make-flags '("gawk") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "./gawk" "--version"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "gawk" bin) + (symlink "gawk" (string-append bin "/awk")))))))))) (define (%boot-mesboot3-inputs) `(("binutils" ,binutils-mesboot) - ("xz" ,xz-mesboot) + ("gawk" ,gawk-mesboot) ,@(alist-delete "binutils" (%boot-mesboot2-inputs)))) (define glibc-headers-mesboot @@ -1970,6 +1534,11 @@ (define glibc-headers-mesboot (out (assoc-ref outputs "out"))) (apply invoke "make" make-flags) (copy-recursively kernel-headers out)))) + (add-before 'configure 'remove-bashism + (lambda _ + (substitute* "sysdeps/unix/make-syscalls.sh" + (("\\$[{]vdso_symver//\\./_[}]") + "$(echo $vdso_symver | sed -e 's/\\./_/g')")))) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) "running ../configure ~a\n" @@ -2015,6 +1584,17 @@ (define glibc-mesboot (list (string-append "SHELL=" bash "/bin/sh")))) ((#:phases phases) #~(modify-phases #$phases + (add-after 'unpack 'simplify-intl-tests + (lambda _ + ;; The bootstrap Guile (2.0.9) crashes trying to + ;; perform a regex on non-ASCII text. This gets + ;; triggered by 'intl/po2test.sed' running over + ;; 'po/de.po'. If we ever remove the bootstrap + ;; Guile or add pure-Scheme regex to Gash, this can + ;; be removed. + (substitute* '("catgets/Makefile" + "intl/Makefile") + (("de\\.po") "en_GB.po")))) (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) @@ -2036,8 +1616,8 @@ (define gcc-mesboot1-wrapper (name "gcc-mesboot1-wrapper") (source #f) (inputs '()) - (native-inputs `(("bash" ,bash-mesboot) - ("coreutils" ,coreutils-mesboot0) + (native-inputs `(("bash" ,gash-boot) + ("coreutils" ,gash-utils-boot) ("libc" ,glibc-mesboot) ("gcc" ,gcc-mesboot1))) (arguments @@ -2175,8 +1755,8 @@ (define gcc-mesboot-wrapper (version (package-version gcc-mesboot)) (source #f) (inputs '()) - (native-inputs `(("bash" ,bash-mesboot) - ("coreutils" ,coreutils-mesboot0) + (native-inputs `(("bash" ,gash-boot) + ("coreutils" ,gash-utils-boot) ("libc" ,glibc-mesboot) ("gcc" ,gcc-mesboot))))) @@ -2185,24 +1765,59 @@ (define (%boot-mesboot5-inputs) ("gcc" ,gcc-mesboot) ,@(fold alist-delete (%boot-mesboot4-inputs) '("gcc" "gcc-wrapper")))) -(define coreutils-mesboot +(define (mesboot-package name pkg) (package - (inherit coreutils) - (name "coreutils-mesboot") - (source (bootstrap-origin (package-source coreutils))) + (inherit pkg) + (name name) + (source (bootstrap-origin (package-source pkg))) (native-inputs (%boot-mesboot5-inputs)) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:tests? #f)))) + (ensure-keyword-arguments (package-arguments pkg) + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f))))) + +;; These packages are needed to complete the rest of the bootstrap. +;; In the future, Gash et al. could handle it directly, but it's not +;; ready yet. +(define bash-mesboot (mesboot-package "bash-mesboot" static-bash)) +(define coreutils-mesboot (mesboot-package "coreutils-mesboot" coreutils)) +(define grep-mesboot (mesboot-package "grep-mesboot" grep)) +(define sed-mesboot (mesboot-package "sed-mesboot" sed)) + +;; The XZ implementation in Bootar cannot decompress 'tar'. +(define xz-mesboot + (let ((pkg (mesboot-package "xz-mesboot" xz))) + (package + (inherit pkg) + (arguments + (ensure-keyword-arguments (package-arguments pkg) + ;; XXX: This fails even though the + ;; actual runpaths seem fine. + `(#:validate-runpath? #f)))))) + +;; We don't strictly need Tar here, but it allows us to get rid of +;; Bootar and Gash-Utils and continue with the standard GNU tools. +(define tar-mesboot + (let ((pkg (mesboot-package "tar-mesboot" tar))) + (package + (inherit pkg) + (native-inputs + `(("xz" ,xz-mesboot) + ,@(package-native-inputs pkg)))))) (define (%boot-mesboot6-inputs) - `(("coreutils" ,coreutils-mesboot) + `(("bash" ,bash-mesboot) + ("coreutils" ,coreutils-mesboot) + ("grep" ,grep-mesboot) + ("sed" ,sed-mesboot) + ("tar" ,tar-mesboot) + ("xz" ,xz-mesboot) ,@(fold alist-delete (%boot-mesboot5-inputs) - '("coreutils" "kernel-headers")))) + '("bash" "coreutils" "bootar" "kernel-headers")))) (define (%bootstrap-inputs+toolchain) ;; The traditional bootstrap-inputs. For the i686-linux, x86_64-linux -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 15 06:35:00 2022 Received: (at 54394) by debbugs.gnu.org; 15 Mar 2022 10:35:00 +0000 Received: from localhost ([127.0.0.1]:47643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nU4W4-0001P7-1w for submit@debbugs.gnu.org; Tue, 15 Mar 2022 06:35:00 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:37096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nU4W1-0001Ou-Ey for 54394@debbugs.gnu.org; Tue, 15 Mar 2022 06:34:58 -0400 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id 6aav2700B4UW6Th06aavVG; Tue, 15 Mar 2022 11:34:55 +0100 Message-ID: <91a803b6025ddf0299329e6d03b4d4b97b585412.camel@telenet.be> Subject: Re: [bug#54394] [PATCH core-updates 12/12] gnu: commencement: Remove many old utilities. From: Maxime Devos To: Timothy Sample , 54394@debbugs.gnu.org Date: Tue, 15 Mar 2022 11:34:49 +0100 In-Reply-To: <20220314225712.19869-12-samplet@ngyro.com> References: <87v8wg40dl.fsf@ngyro.com> <20220314225712.19869-12-samplet@ngyro.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-nyXqNpYX5Saf0AJ7t8YD" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647340495; bh=pOwUhjZJTUXtF1zfNB1S7EVAfQdLhFb0EajFPvxivMs=; h=Subject:From:To:Date:In-Reply-To:References; b=iQd/A9Ti65q2AvYlJNJQ5Xex1yG/TXdmYtSYZ3SQ/jBG5jTAgD+bu2b1OviH8mI1l khQuVpcY6gQwGg6BC96hHzsGrrhsXELpdHfI8fLNXtBin4h0BwkneRlt4QDeJWS8Xl SDxdJA4FiCbni+Mbp2uqS9Q2tMpNOk0CxcLZAvN9V33ujmvg0bUSWBcPgXPbkye4lq hJlw8rcgP5feSVdXp7hreFAsHOYeYbTD6LiTNTIgsObdPKILeWwLQp2NHgTkhj+V7q eX4EK36l1tdaxjPJHvygKUrO6VTkKXeKUoeyDsOhBCo9pHCByTWBA8GFtxwvAYI/oj quISuueqP4J4g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-nyXqNpYX5Saf0AJ7t8YD Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Timothy Sample schreef op ma 14-03-2022 om 16:57 [-0600]: > * gnu/packages/commencement.scm (bash-mesboot0): Delete variable... > [...] Given that quite a few packages were removed, I'm wondering if some=20 imports from (gnu pacages commencement) can be removed? Greetings, Maxime. --=-nyXqNpYX5Saf0AJ7t8YD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYjBryRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vT9AQCIsw28rjkhXABwd1jPhmeZ9QCq ovX0kOc/9tCXhIsmSQD/WDvmz7AFvmTMWJZ5VxsdlDR1YvP96uo2eepPnOsKiAo= =T+gY -----END PGP SIGNATURE----- --=-nyXqNpYX5Saf0AJ7t8YD-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 15 15:36:09 2022 Received: (at 54394) by debbugs.gnu.org; 15 Mar 2022 19:36:09 +0000 Received: from localhost ([127.0.0.1]:49664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUCxl-0000Pv-7i for submit@debbugs.gnu.org; Tue, 15 Mar 2022 15:36:09 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:55511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUCxg-0000PL-EI for 54394@debbugs.gnu.org; Tue, 15 Mar 2022 15:36:08 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 3A9AC3201FC9; Tue, 15 Mar 2022 15:35:58 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 15 Mar 2022 15:35:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from: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= fm3; bh=emblcrP+evnzkOdDuY4LVcvejd3mrWytcxzx7ldLxrw=; b=dQ0o94oh lec7rwualbZczQcvrCk6lXj+44+gLGEDV4bKeLpwf9ozV1j0gVIRJakoEw12YFeQ fADEJAZdzf79lpzhsbFl8TP0RAYmNAUG7fF6KHRbmoXaUDh+58/Rq6GNX8dFIoW8 oaV9NdP+0/elkOcry7K4omCy/Q3/zhqRZs6avUw2XTmRMFSoNeaWBbSuEcQbnvfc ZlPmX3Lgxv1C7aMXJGv40lVbn0NK47jcbmnZbGNF0aQsla7g2cvYJbhHzrK5bCeU 4NOXSfjcFgtbqDKvdzunWJRJcl6DegV7s1xSaf0O6OBPGT4/7UX6a+zJ7D8/N8Sx YL8UcFq84vU4sQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudeftddguddvhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufhffkfgfgggtgfesthhqredttderjeenucfhrhhomhepvfhimhho thhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhghihrohdrtghomheqnecuggftrf grthhtvghrnhepleejueevhfevudffkeevueefvefgfeefledttdeiueeikefhveejjeej iefhgeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 15 Mar 2022 15:35:57 -0400 (EDT) From: Timothy Sample To: Maxime Devos Subject: Re: [bug#54394] [PATCH core-updates 12/12] gnu: commencement: Remove many old utilities. References: <87v8wg40dl.fsf@ngyro.com> <20220314225712.19869-12-samplet@ngyro.com> <91a803b6025ddf0299329e6d03b4d4b97b585412.camel@telenet.be> Date: Tue, 15 Mar 2022 13:35:56 -0600 Message-ID: <87czinf1pf.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394 Cc: 54394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Maxime, Maxime Devos writes: > Timothy Sample schreef op ma 14-03-2022 om 16:57 [-0600]: >> * gnu/packages/commencement.scm (bash-mesboot0): Delete variable... >> [...] > > Given that quite a few packages were removed, I'm wondering if some=20 > imports from (gnu pacages commencement) can be removed? The commencement module still needs all the same imports. The old packages were removed, but their modern counterparts are still there. I think that answers your question, but I=E2=80=99m only 70% sure I understoo= d it correctly. :) If not, let me know! -- Tim From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 16 13:25:12 2022 Received: (at 54394) by debbugs.gnu.org; 16 Mar 2022 17:25:12 +0000 Received: from localhost ([127.0.0.1]:52226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUXOa-0005TY-0R for submit@debbugs.gnu.org; Wed, 16 Mar 2022 13:25:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUXOY-0005TH-8d for 54394@debbugs.gnu.org; Wed, 16 Mar 2022 13:25:11 -0400 Received: from [2001:470:142:3::e] (port=35970 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUXOS-00040z-PQ; Wed, 16 Mar 2022 13:25:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=S3nWuom3eR0H+pZBLoi0/EcUmkTZM5bRg3Yq34Uck5o=; b=fU5pclfcTrlK6VLfu7aE qpiuhOQKL21gci1MepOF1dnTtyL9VPTkn8s/n2c14968R+fuf2ymFMTa8FnNqMgq5/q0K+KfBi1L9 yeaVAN34AX1gWCnQmsHPh4CuFLSmKFo0gNdMcDObEZFEfZj0iEP63uLhBjZujHQD4F7+YZTd1HQGq Pb+pS1uS2ThLQC2lGU30PqtEysgduO6wreK8RNyK2EMVxiBDc1fHkIiHPulq/UmR7Xp3xw7aHBqum 52Re6jBlLlhZ/mZp1l9KK3xtgepdQaa/DIyPYR+3ctT2jP7A5B9lv8lkUMWDeis8aJKEj/qnaPZRI tzG3AzHs6z/TJQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:63770 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUXOS-0002aq-CK; Wed, 16 Mar 2022 13:25:04 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Timothy Sample Subject: Re: bug#54394: [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap References: <87v8wg40dl.fsf@ngyro.com> Date: Wed, 16 Mar 2022 18:25:01 +0100 In-Reply-To: <87v8wg40dl.fsf@ngyro.com> (Timothy Sample's message of "Mon, 14 Mar 2022 16:47:50 -0600") Message-ID: <87bky5dd3m.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54394 Cc: 54394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Timothy Sample skribis: > This is culmination of a lot of work, so I=E2=80=99m excited to be submit= ting > it! The main thrust of this series is to update Gash and Gash-Utils, > and then remove most of the old GNU utilities we use during early > bootstrap. To elaborate, the current situation is that we climb a > ladder through time: first we build Bash 2, then we build Bash 4, and > finally we build Bash 5. This is true for most GNU utilities: Sed, > Gawk, Coreutils, etc. The reason? Until now, our Scheme > implementations of those utilities (Gash and Gash-Utils) were very > limited. Bash 2 used to be a lot more useful then Gash, for example. > Now, with recent releases of Gash and Gash-Utils, the Scheme utilities > are, in general, capable of powering the builds of modern GNU software. Woohoo! Shortening the ladder, and doing it =E2=80=9Cthe nice way=E2=80=9D= , is a much welcome improvement. > To be clear, we still climb the time-ladder in a few cases. The main > ones are GCC, Glibc, and Binutils. For example, we have to use GCC 2 to > transition from TCC To GCC 4 (which is the last non-C++ GCC [1]). > Fixing this would require quite a bit of TCC hacking, I imagine. There > are others, though. We still use old versions of Gzip, Make, patch, and > Gawk. The fact that Gawk is still there disappoints me quite a bit, but > =E2=80=98glibc-mesboot=E2=80=99 fails in a way that I just can=E2=80=99t = figure out when > building with Gash-Utils. Gzip is not strictly necessary, but also > pretty easy to replace. I=E2=80=99m not sure, but I think patch is only = there > to avoid using patches in =E2=80=98origin=E2=80=99 records during bootstr= ap. We now > have a way to do that, so it may no longer be necessary. Make will > likely need to be rewritten in Scheme, but we have a head start: Potato > Make [2]. > > [1] https://bootstrappable.org/projects.html > [2] https://github.com/spk121/potato-make Yes, the C compiler situation is tricky; Make looks like a fun target. [...] > The next three are updates. The bootar update optimistically assumes > that someone with access will upload the source file to the Guix mirror > URL: =E2=80=9Cmirror://gnu/guix/...=E2=80=9D as was done with previous ve= rsions. Sure. > 5 files changed, 192 insertions(+), 788 deletions(-) Yay! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 16 13:25:52 2022 Received: (at 54394) by debbugs.gnu.org; 16 Mar 2022 17:25:52 +0000 Received: from localhost ([127.0.0.1]:52230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUXPE-0005UZ-E4 for submit@debbugs.gnu.org; Wed, 16 Mar 2022 13:25:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUXPD-0005UN-3P for 54394@debbugs.gnu.org; Wed, 16 Mar 2022 13:25:51 -0400 Received: from [2001:470:142:3::e] (port=35986 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUXP7-0004Jn-Qr; Wed, 16 Mar 2022 13:25:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=L3xR6jfKj0qS6ZBAXYtEbhoSstwO7hfSKyRI3SYgp60=; b=SxUQUX026Bs+tlp0hsm3 m6/wUbJGAB069ga/m+feDMU9rXGG2uz7paMTmf5SnhTm9jAGaMRluvgRd2wyutAAPOsTPX+x7eCsm QKXupFBZZb8PUHSXuCFwKxiPRDP8W2U7nLoDxJ2/MK8z9Zj9YeyqiI+/Slz/4ho5bDSPcit251oF8 h6PYxR6cs/OAxS9eg+f9t56CHOZGKF6gXDcq1WUGw10D2PTfQNu0PBs67+F8dVG1aBJQI96Y0s2Th mlYa7sJ1++N1DJweMvhNOES2PeL0qjUgrsjLf2Ot02tt/nTZg2IXC+USN2+6fQjhx+KvCfJkv7WO7 t2YCR2qOGRkJtQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:62570 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUXP7-0002dG-DP; Wed, 16 Mar 2022 13:25:45 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Timothy Sample Subject: Re: bug#54394: [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap References: <87v8wg40dl.fsf@ngyro.com> <20220314225712.19869-1-samplet@ngyro.com> Date: Wed, 16 Mar 2022 18:25:42 +0100 In-Reply-To: <20220314225712.19869-1-samplet@ngyro.com> (Timothy Sample's message of "Mon, 14 Mar 2022 16:57:00 -0600") Message-ID: <877d8tdd2h.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54394 Cc: 54394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Timothy Sample skribis: > * gnu/packages/commencement.scm (hello-mesboot): Downgrade to 2.10. LGTM (even for =E2=80=98master=E2=80=99). From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 16 13:32:18 2022 Received: (at 54394) by debbugs.gnu.org; 16 Mar 2022 17:32:18 +0000 Received: from localhost ([127.0.0.1]:52237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUXVS-0005gO-4H for submit@debbugs.gnu.org; Wed, 16 Mar 2022 13:32:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUXVP-0005gA-Vl for 54394@debbugs.gnu.org; Wed, 16 Mar 2022 13:32:16 -0400 Received: from [2001:470:142:3::e] (port=36140 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUXVK-0005Nt-HI; Wed, 16 Mar 2022 13:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=OCkC6MMW5qE9ReO31xskyGjg73b9I9/QzgFLaH+4dPg=; b=iLbutwxbs+ktyWpzCNvS ZTa0vZckdgjnXJqzsRNVii9blKqHl17uzQnd1YozId+09QxqRwa+Quq2qCjwv89l9IkKM2Kicb/ya fReCbWycyyvjgmqlz8GISB+iaTH0dajtHxZkSNmMPx9uKj85ainWQUilIIIFsFklmHYG9JH7mzcPj RYmw55jN0rHI/2B35FSuZfZtPRpSZ7MFKk+YT1Ik1cPik7Ldc6EFgTwhlEV/2Huoi63qu8dBrcCXV G4TPQ5uWI3woOORvwFItizx8utuTB/ryu0KusQyZk+GmYmQ7EEFS++cfVtNsWzdPNPAwaTdjBv89o plt8osJ/A31DzQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:52962 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUXVJ-0004qr-8o; Wed, 16 Mar 2022 13:32:09 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Timothy Sample Subject: Re: bug#54394: [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap References: <87v8wg40dl.fsf@ngyro.com> Date: Wed, 16 Mar 2022 18:32:07 +0100 In-Reply-To: <87v8wg40dl.fsf@ngyro.com> (Timothy Sample's message of "Mon, 14 Mar 2022 16:47:50 -0600") Message-ID: <8735jhdcrs.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54394 Cc: 54394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Timothy Sample skribis: > The next two patches spruce up the =E2=80=98gnu-bootstrap=E2=80=99 module= . One fixes an > omission, and the other gets it ready to handle Gash-Utils 0.2.0, which > unfortunately has two module directories. > > The next three are updates. The bootar update optimistically assumes > that someone with access will upload the source file to the Guix mirror > URL: =E2=80=9Cmirror://gnu/guix/...=E2=80=9D as was done with previous ve= rsions. > > The rest hopefully speak for themselves. Sadly, the last one is > something of a jumble. Originally I wanted to remove the utilities one > at a time, but it turns out there are interference effects. I can=E2=80= =99t > remember the exact details now, but to get an idea, removing both old > Bash and old Grep might work, but removing one and then the other (in > either order) might not. Hence, many utilities get updated in one > commit. The patches all LGTM! I think you can push them to =E2=80=98core-updates= =E2=80=99 if there are no objections. Then Maxim, Ricardo, or myself (I think we=E2=80=99re the three people who = can do that currently) can upload bootar to ftp.gnu.org. Let us know. It=E2=80=99s quite something to see these intermediate versions of Bash, Ga= wk, tar, grep, coreutils, and sed go away in the last patch, and that tells something about the magnitude of the work that has gone in this Gash-Utils release. Thumbs up, and big thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 19 15:53:24 2022 Received: (at 54394-done) by debbugs.gnu.org; 19 Mar 2022 19:53:24 +0000 Received: from localhost ([127.0.0.1]:60628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVf8e-0002Xw-4P for submit@debbugs.gnu.org; Sat, 19 Mar 2022 15:53:24 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:46849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVf8c-0002Xh-Dp for 54394-done@debbugs.gnu.org; Sat, 19 Mar 2022 15:53:22 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 921073200973; Sat, 19 Mar 2022 15:53:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 19 Mar 2022 15:53:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=fm3; bh=fKqVXPsaj+zMOrf98XLQjJfNfoojefKmEGQiiz/zx hA=; b=Rp8qWnqhcn32eXt8NvsBb2oEYhCvradoHeXv4/aAnoYQ41fyASis9xlYo CQoO4Al6U8dNOnjB4VCy9Ko7ONWvQ+qtpbiLfoQ0Aua2OZubWj+Cr9PhzvClwzAL rE8HafVsjPrK4NKokY9xng6zuhwiO+Gk8V/HOxuYF92GZl2QQS7cPdUsPErhvSr7 g7W7BdOXokgSuQqDALSru3JmhyLbs+eCp7cVLY4kqbx7ABMiS9l8wIO7YXgXGFf9 LjfoQd650/lex4zJLhDydQkrTzmxZqIg8WA6KwlrKEtd0uBdGeQhN7IO1nit0K3p kxh4jw/u5zl6UxBb1WeffnhW8Yu5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudefkedgudefudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufhffjgfkfgggtgfgsehtqhertddtreejnecuhfhrohhmpefvihhm ohhthhihucfurghmphhlvgcuoehsrghmphhlvghtsehnghihrhhordgtohhmqeenucggtf frrghtthgvrhhnpedvleevhfehgeduveejvdeftdevieelffevheevjeeggfetteetjeet ledtfeeuveenucffohhmrghinhepghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 19 Mar 2022 15:53:15 -0400 (EDT) From: Timothy Sample To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#54394: [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap References: <87v8wg40dl.fsf@ngyro.com> <8735jhdcrs.fsf@gnu.org> Date: Sat, 19 Mar 2022 13:53:14 -0600 In-Reply-To: <8735jhdcrs.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Wed, 16 Mar 2022 18:32:07 +0100") Message-ID: <87bky1zplh.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54394-done Cc: 54394-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Ludovic Court=C3=A8s writes: > Timothy Sample skribis: > >> The next two patches spruce up the =E2=80=98gnu-bootstrap=E2=80=99 modul= e. One fixes an >> omission, and the other gets it ready to handle Gash-Utils 0.2.0, which >> unfortunately has two module directories. >> >> The next three are updates. The bootar update optimistically assumes >> that someone with access will upload the source file to the Guix mirror >> URL: =E2=80=9Cmirror://gnu/guix/...=E2=80=9D as was done with previous v= ersions. >> >> The rest hopefully speak for themselves. Sadly, the last one is >> something of a jumble. Originally I wanted to remove the utilities one >> at a time, but it turns out there are interference effects. I can=E2=80= =99t >> remember the exact details now, but to get an idea, removing both old >> Bash and old Grep might work, but removing one and then the other (in >> either order) might not. Hence, many utilities get updated in one >> commit. > > The patches all LGTM! I think you can push them to =E2=80=98core-updates= =E2=80=99 if > there are no objections. Pushed! (Maybe I didn=E2=80=99t leave enough time for objections =E2=80=93= apologies if it ends up requiring a revert! I=E2=80=99ll be around to work through any issues this might cause.) > Then Maxim, Ricardo, or myself (I think we=E2=80=99re the three people wh= o can > do that currently) can upload bootar to ftp.gnu.org. Let us know. Yes, please! > It=E2=80=99s quite something to see these intermediate versions of Bash, = Gawk, > tar, grep, coreutils, and sed go away in the last patch, and that tells > something about the magnitude of the work that has gone in this > Gash-Utils release. Thumbs up, and big thanks! When the Scheme-only bootstrap landed, it was very exciting, but it made a real mess of =E2=80=98commencement.scm=E2=80=99. Since I played a part i= n creating that mess, I figured I ought to work to fix it. :) I=E2=80=99m hoping our Scheme-heavy approach to bootstrapping will result in something clean and comprehensible, so taking an explicit step in that direction makes me happy. -- Tim From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 20 07:39:02 2022 Received: (at 54394) by debbugs.gnu.org; 20 Mar 2022 11:39:02 +0000 Received: from localhost ([127.0.0.1]:32942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVttl-0004sp-MP for submit@debbugs.gnu.org; Sun, 20 Mar 2022 07:39:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVttj-0004sa-Gm for 54394@debbugs.gnu.org; Sun, 20 Mar 2022 07:39:00 -0400 Received: from [2001:470:142:3::e] (port=51168 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVttd-00009t-CD; Sun, 20 Mar 2022 07:38:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=EZdoa88MZ2YCICH5HWZjwjRubgc4/Sh77WY90Deg5q8=; b=CuKjWbZ3Uena2msNG9xm WnXEIzy4mwCxCW6EorwT452/oyrowTAAIrb/plj83LGurgZ0rMTqRs84ijMwp2bJ+aYNYhVMI2J+G Dr8BVOdjd/se8PAZhjUsVHWllnbunek/EOJvhiX3WGmfOetkXf0/KLJ1g9hfKBOCI9jG5T2p8t26j negee9ZCUpoGE1YS9tbzXaVooM9Ss8Qg2gaO5I7eA40BR/g1zDKHrqm+saKVfZ4H/gNeEmd47CXWr NUrj6v21Y2fKlZIH0macHn3dtDCfvMChwsOtMhG7CdddEyYs8T6CP3xS/2X2/cBhX1FSxNLJlFtnT 21Bg9vdioXGEww==; Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=39464 helo=dundal.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVttc-0005Eb-U1; Sun, 20 Mar 2022 07:38:53 -0400 From: Jan Nieuwenhuizen To: Timothy Sample Subject: Re: [bug#54394] [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap Organization: AvatarAcademy.nl References: <87v8wg40dl.fsf@ngyro.com> X-Url: http://AvatarAcademy.nl Date: Sun, 20 Mar 2022 12:38:50 +0100 In-Reply-To: <87v8wg40dl.fsf@ngyro.com> (Timothy Sample's message of "Mon, 14 Mar 2022 16:47:50 -0600") Message-ID: <878rt43lbp.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54394 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 54394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Timothy Sample writes: Hello! > This is culmination of a lot of work, so I=E2=80=99m excited to be submit= ting > it! The main thrust of this series is to update Gash and Gash-Utils, > and then remove most of the old GNU utilities we use during early > bootstrap. To elaborate, the current situation is that we climb a > ladder through time: first we build Bash 2, then we build Bash 4, and > finally we build Bash 5. This is true for most GNU utilities: Sed, > Gawk, Coreutils, etc. The reason? Until now, our Scheme > implementations of those utilities (Gash and Gash-Utils) were very > limited. Bash 2 used to be a lot more useful then Gash, for example. > Now, with recent releases of Gash and Gash-Utils, the Scheme utilities > are, in general, capable of powering the builds of modern GNU software. What an amazing piece of work. Not only adding support for this in Gash and Gash-Utils, also adding the "follow-up" for the Guix bootstrap. Wow! Not meaning to create more unwanted work for you, but I believe this could do with a blog post. I very much like your "climb a ladder through time" description. > To be clear, we still climb the time-ladder in a few cases. The main > ones are GCC, Glibc, and Binutils. For example, we have to use GCC 2 to > transition from TCC To GCC 4 (which is the last non-C++ GCC [1]). > Fixing this would require quite a bit of TCC hacking Yes, that needs work on MesCC, especially the Mes C Library, and TCC. Possibly some work on mpz/gmp. We definately want to jump from TCC to GCC 4.6 (the last modular distribution) in the (near) future. > We still use old versions of Gzip, Make, patch, and > Gawk. The fact that Gawk is still there disappoints me quite a bit, but > =E2=80=98glibc-mesboot=E2=80=99 fails in a way that I just can=E2=80=99t = figure out when > building with Gash-Utils. Yeah, I can imagine, especially after your (2nd?) rewrite of AWK. > Gzip is not strictly necessary, but also pretty easy to replace. and replacing possibly has quite a speed penalty. > I=E2=80=99m not sure, but I think patch is only there > to avoid using patches in =E2=80=98origin=E2=80=99 records during bootstr= ap. We now > have a way to do that, so it may no longer be necessary. Yes, I believe patch is needed for the manual "apply-boot-patch" stages to avoid adding a dependency on xz, created by adding patches to "origin" records. > Make will likely need to be rewritten in Scheme, but we have a head > start: Potato Make [2]. > > [2] https://github.com/spk121/potato-make Interesting! POSIX Makefile Parser Recipes can contain the following parser function (parse ...) reads a standard Makefile and creates rules based on its contents. Building glibc without GNU Make may be pretty difficult, though. > Here=E2=80=99s some detailed info for reviewers. > Ludovic Court=C3=A8s writes: > > The patches all LGTM! I think you can push them to =E2=80=98core-updat= es=E2=80=99 if > > there are no objections. > Pushed! (Maybe I didn=E2=80=99t leave enough time for objections =E2=80= =93 apologies if > it ends up requiring a revert! I=E2=80=99ll be around to work through any > issues this might cause.) Patches LGTM, and thanks for pushing. > The rest hopefully speak for themselves. Sadly, the last one is > something of a jumble. Originally I wanted to remove the utilities one > at a time, but it turns out there are interference effects. I can=E2=80= =99t > remember the exact details now, but to get an idea, removing both old > Bash and old Grep might work, but removing one and then the other (in > either order) might not. Hence, many utilities get updated in one > commit. That's quite understandable, and certainly acceptable. Much of this time-ladder was created by me, it was an enormous effort to find old (and some ancient) versions of the tools that worked well together. There are undocumented build dependencies all around. Some newer packages cannot be used to build older versions of other packages, etc. So, while this kludge was a necessary evil, I'm extremely happy we can now do without it. We should work towards a bootstrap that depends mainly on current packages, and strive to keep current packages bootstrappable. To summarize what you removed: bzip2 (not an old version) sed-1.18 sed-4.0.6 binutils-2.14 (really great!) bash-2.05b bash-4.4 gawk-3.0.0 tar-1.22 grep-2.0 coreutils-5.0 xz-5.0.0 (wow, that was difficult to build) that's 11 old and ancient packages, if have counted correctly. Greetings, Janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 21 11:17:33 2022 Received: (at 54394-done) by debbugs.gnu.org; 21 Mar 2022 15:17:33 +0000 Received: from localhost ([127.0.0.1]:37876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWJmn-0002Aa-Bx for submit@debbugs.gnu.org; Mon, 21 Mar 2022 11:17:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWJml-00024W-3Z for 54394-done@debbugs.gnu.org; Mon, 21 Mar 2022 11:17:31 -0400 Received: from [2001:470:142:3::e] (port=43996 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWJmf-00019c-0x; Mon, 21 Mar 2022 11:17:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=r4rDvyaf2BuqI6WEfZo9g5hFl7vcJKoZatqwejsl39U=; b=aXMdvBU5+Q4ML6HOxJpl enrgkvmw6jmbQy6ViK/8DGK3yiCNf3iTZnxVG9U/Xunijn8uWwZFzEt0zk6EyuIH4MfGJNuhYLZkZ tbAinWTCY4tzpwiF9cEiW5F6XcMByLWY9grvsvfGBwBv4ISHNjvOJiYmC8vAn4OY8h3uUHIL2Rmyz wWFiMzzmim+3nKGld+63JAB5XMwc0X892TC0azB/z/+2vGxEL1I9lMpO43Ot7xaudaM1weWkdqOS+ p3NOesNSh49ek+Myf5+jYTARBYsvx++mixUz155TUyGd/zvw1eYk8z55PtIL/nnIDeCOmkg15ac+m dMM/t47wNY6cSQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:49866 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWJme-0005lN-ID; Mon, 21 Mar 2022 11:17:24 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Timothy Sample Subject: Re: bug#54394: [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap References: <87v8wg40dl.fsf@ngyro.com> <8735jhdcrs.fsf@gnu.org> <87bky1zplh.fsf@ngyro.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 1 Germinal an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 21 Mar 2022 16:17:22 +0100 In-Reply-To: <87bky1zplh.fsf@ngyro.com> (Timothy Sample's message of "Sat, 19 Mar 2022 13:53:14 -0600") Message-ID: <87czifjpx9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54394-done Cc: 54394-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Timothy Sample skribis: >> Then Maxim, Ricardo, or myself (I think we=E2=80=99re the three people w= ho can >> do that currently) can upload bootar to ftp.gnu.org. Let us know. > > Yes, please! Done! https://ftp.gnu.org/gnu/guix/mirror/ Ludo=E2=80=99. From unknown Sat Aug 16 13:42:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 19 Apr 2022 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator