From patchwork Mon May 2 18:24:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39065 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1866027BBEA; Mon, 2 May 2022 19:25:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 35E3527BBEB for ; Mon, 2 May 2022 19:25:21 +0100 (BST) Received: from localhost ([::1]:46746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajY-000515-AO for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajG-00050w-FA for guix-patches@gnu.org; Mon, 02 May 2022 14:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajG-0000wO-6o for guix-patches@gnu.org; Mon, 02 May 2022 14:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajG-0003FN-3i for guix-patches@gnu.org; Mon, 02 May 2022 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 1/8] commencement: Add bootstrap-seeds. References: <20220502182105.32068-1-janneke@gnu.org> In-Reply-To: <20220502182105.32068-1-janneke@gnu.org> Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151588912376 (code B ref 55227); Mon, 02 May 2022 18:25:02 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:49 +0000 Received: from localhost ([127.0.0.1]:37966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaix-0003DQ-5Z for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiv-0003Cr-6R for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlaip-0000sJ-T5; Mon, 02 May 2022 14:24:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=CEbWSejJp5JPN2yFQjFpOMmaCElJ28CfMDCj9YST+WY=; b=GAXo9QjsslULJ3 64vumfI/OeQT8Z+YGk5gbs+gTwwsYlwIEjeTg4+1VJZo+YtLo3TshYusxUQMOCww9449PIXNd4t2y TUDMoEbToVAnudHxLGXaVTpAowxtO47HBKooyQAvA72nbGYCZK8Jd4KDWzk4GXojpfPj7qK+t5DAH ZDZdaV6SlKM6vv9Ec3rr7XFIT0MynYGsgScK+18XPwFHJTEEWOONI2gx52ykEhiSFN7mFk+FRXKuK kVxXm2YXA72RETSkrVCCy5EjmKBop/0tchvX1/OzC9rmZLwES6jdhnRgkTSr2NBIN49B/N50Tyoio b71E7bOx6Hg/iWQPKNNQ==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlaip-0006Dq-HH; Mon, 02 May 2022 14:24:35 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:27 +0200 Message-Id: <20220502182434.32130-1-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (bootstrap-seeds): New variable. --- gnu/packages/commencement.scm | 42 ++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9d6ed5fd08..663ffacd56 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2020, 2022 Timothy Sample ;;; Copyright © 2020 Guy Fleury Iteriteka @@ -266,6 +266,46 @@ (define (%boot-gash-inputs) ("bootar" ,bootar) ("guile" ,%bootstrap-guile))) +(define bootstrap-seeds + (package + (name "bootstrap-seeds") + (version "1.0.0") + (source + (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://lilypond.org/janneke/guix/20220501/" + "bootstrap-seeds-" version ".tar.gz")) + (sha256 + (base32 + "0scz2bx8fd8c821h6y1j3x6ywgxxns7iinyn9z32dnkiacfdcpfn"))))) + (native-inputs `(("bootar" ,bootar))) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "bootar")) + (out (assoc-ref %outputs "out"))) + (setenv "PATH" (string-append tar "/bin:")) + (invoke "tar" "xvf" source) + (mkdir-p out) + (copy-recursively "bootstrap-seeds" out) + #t)))) + (home-page "https://github.com/oriansj/bootstrap-seeds") + (synopsis "The initial bootstrap seeds: 357-byte hex0 and kaem shell") + (description + "A prebuilt version of the initial bootstrap seeds. It contains a +hex0-seed and an optional kaem-minimal shell. The size of the hex0 seeds are +for knight: 250 bytes, x86-linux:(357 bytes, x86_64-linux: 431 bytes, and +aarch64-linux 526 bytes. These can be used to build stage0: hex0, hex1, hex2, +M1, and M2-Planet.") + (license license:gpl3+))) + (define %bootstrap-mes-rewired (package (inherit mes) From patchwork Mon May 2 18:24:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39068 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9115B27BBE9; Mon, 2 May 2022 19:25:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BFDDB27BBEB for ; Mon, 2 May 2022 19:25:22 +0100 (BST) Received: from localhost ([::1]:46832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajZ-00054T-Tl for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051H-9H for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajG-00011S-MW for guix-patches@gnu.org; Mon, 02 May 2022 14:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajG-0003FV-JU for guix-patches@gnu.org; Mon, 02 May 2022 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 2/8] commencement: Add stage0-posix. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589012404 (code B ref 55227); Mon, 02 May 2022 18:25:02 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:50 +0000 Received: from localhost ([127.0.0.1]:37976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaj2-0003DZ-V0 for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiv-0003Cs-NV for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlaiq-0000sV-Ff; Mon, 02 May 2022 14:24:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=L8JCq6pen70E+Gihv/t6OrCxwyT1UqFj7/AEOfH+k7g=; b=NCsinWmwopLfbATL165E Z9Iksc5ejPRL2q8zH70gk1SwurMpUYMrL4my7SPnL5eaUUAlQgy4oLRKblhm7PY2LBcpmhDhCOfJl EkPX9R7935QyrJnPVNrLsfKGfDJsjsCCuu11ZropIH3Xj24OHqppsv4XNGOI1Wr/y7+VyjfH/YFyR Zf/RrJtLi5e1sPbJXopJiUtwIpTMNnbrZ2YE1V9AlZIAjxMryaRtM22h3cGssLnd+Mp6nglOgyHeD G+4maBjuGWXicPDkJMHATZ4WrvgFcRLq2SzJKmk3lAu0mpnRtKiohsdWFslyLk89HBw/EXd1b+/bC XkQgVPtEASObaw==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlaiq-0006Dq-3n; Mon, 02 May 2022 14:24:36 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:28 +0200 Message-Id: <20220502182434.32130-2-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Stage0-posix is a skeleton for bootstrapping all of Stage0 for POSIX systems. On x86-linux, from the 357-byte hex0-seed binary from the bootstrap-seeds, it builds hex0, kaem, hex1, catm, hex2, M0, cc_x86, M1, M2, get_machine, (mescc-tools), and M2-Planet. * gnu/packages/commencement.scm (stage0-posix): New variable. --- gnu/packages/commencement.scm | 109 ++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 663ffacd56..24e1e6ec8c 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -306,6 +306,115 @@ (define bootstrap-seeds M1, and M2-Planet.") (license license:gpl3+))) +(define stage0-posix + ;; The initial bootstrap package: no binary inputs except those from + ;; `bootstrap-seeds, for x86 a 357 byte binary seed: `x86/hex0-seed'. + (let ((mescc-tools-version "1.4.0") + (m2-planet-version "1.9.0")) + (package + (name "stage0-posix") + (version "1.4") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://lilypond.org/janneke/guix/20220502/" + "stage0-posix-" version ".tar.gz")) + (sha256 + (base32 + "1ammifkj33205qrpfm84yb1c99lwgbn4jsl1hd08aab8c9ffz6p4"))))) + (native-inputs + `(("bootstrap-seeds" ,bootstrap-seeds) + ("mescc-tools" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://lilypond.org/janneke/guix/20220502/" + "mescc-tools-" mescc-tools-version ".tar.gz")) + (sha256 + (base32 + "1xi6f48pf5bhajhfis189gpizxij7nbp1vzvsb1aafhz4skkiqvg"))))) + ("m2-planet" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://lilypond.org/janneke/guix/20220502/" + "M2-Planet-" m2-planet-version ".tar.gz")) + (sha256 + (base32 + "1xrn69sc5nz4hwaishqyrcidp1ncxwib9zswl45x378ddz3mmk7g"))))) + ,@(%boot-gash-inputs))) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((bootstrap-seeds (assoc-ref %build-inputs "bootstrap-seeds")) + (mescc-tools (assoc-ref %build-inputs "mescc-tools")) + (m2-planet (assoc-ref %build-inputs "m2-planet")) + (source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "bootar")) + (bash (assoc-ref %build-inputs "bash")) + (coreutils (assoc-ref %build-inputs "coreutils")) + (guile (assoc-ref %build-inputs "guile")) + (out (assoc-ref %outputs "out")) + (bindir (string-append out "/bin")) + (target (or ,(%current-target-system) + ,(%current-system))) + (stage0-cpu + (cond + ((or (string-prefix? "x86_64-linux" target) + (string-prefix? "i686-linux" target)) + "x86") + ((or (string-prefix? "aarch64-linux" target) + (string-prefix? "armhf-linux" target)) + "armv7l") + (else + (error "stage0-posix: system not supported" target)))) + (kaem (string-append "../bootstrap-seeds/POSIX/" + stage0-cpu "/kaem-optional-seed"))) + (setenv "PATH" (string-append tar "/bin:" + coreutils "/bin:" + bash "/bin")) + (invoke "tar" "xvf" source) + (chdir (string-append "stage0-posix-" ,version)) + (copy-recursively bootstrap-seeds "bootstrap-seeds") + (invoke "tar" "xvf" mescc-tools) + (rmdir "mescc-tools") + (symlink (string-append "mescc-tools-" ,mescc-tools-version) + "mescc-tools") + (invoke "tar" "xvf" m2-planet) + (rmdir "M2-Planet") + (symlink (string-append "M2-Planet-" ,m2-planet-version) + "M2-Planet") + (rmdir "M2libc") + (symlink "M2-Planet/M2libc" "M2libc") + (mkdir-p bindir) + (with-directory-excursion stage0-cpu + (with-output-to-file "mes-m2.kaem" + (lambda _ (display ""))) + (with-output-to-file "mescc-tools-extra.kaem" + (lambda _ (display ""))) + (invoke kaem "kaem.run")) + (with-directory-excursion "bin" + (install-file "hex2" bindir) + (install-file "M1" bindir) + (install-file "blood-elf" bindir) + (install-file "kaem" bindir) + (install-file "get_machine" bindir) + (install-file "M2-Planet" bindir)))))) + (home-page "https://github.com/oriansj/stage0-posix/") + (synopsis "The initial bootstrap package, builds stage0 up to M2-Planet") + (description + "Starting from an 357-byte hex0 provided by the bootstrap-seeds, +stage0-posix builds hex0, kaem, hex1, catm, hex2, M0, cc_x86, M1, +M2, get_machine, (mescc-tools), and M2-Planet.") + (license license:gpl3+)))) + (define %bootstrap-mes-rewired (package (inherit mes) From patchwork Mon May 2 18:24:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39071 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 038DB27BBEA; Mon, 2 May 2022 19:25:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6C29627BBE9 for ; Mon, 2 May 2022 19:25:40 +0100 (BST) Received: from localhost ([::1]:47702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajr-0005fg-IZ for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051L-SO for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajH-000160-7O for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajH-0003Fe-3b for guix-patches@gnu.org; Mon, 02 May 2022 14:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 3/8] commencement: mes-boot: Update to 0.24, build with M2-Planet. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589112411 (code B ref 55227); Mon, 02 May 2022 18:25:03 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:51 +0000 Received: from localhost ([127.0.0.1]:37978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaj4-0003E1-9e for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiw-0003Cv-8b for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlair-0000sc-2B; Mon, 02 May 2022 14:24:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=tHfPN02GlYHVNOQL5uG3tB4RfNuGJS46S/62nSFC2GE=; b=UbsM7aPXSAC2ZL26nRIn cdYS6Uk9EPwPnNcnv/hab2q/ZivL/qagyVyMxO3lqifHgwPS3J6mbYZ5/Hxvl727QMKkXVL1+wBTa AQ+ypgZDoyPj0PELf/ByduK5wED7UTHHc+0jfK6HMV30T23+CKtAm1VyVlCDcGq9FnvsT3LAi/7ko cAWbE0e84HNLnUtsYFmUgpmWEdikFGz+Zn1IWnkci/lSlUomYfk2ymPZ0IQxeDdTQ2wkbXv1bS00n zzXp+hdY3/E7vrvgLMiDXI3R51S42XvgI1o447OJIeJbJNRDejARZkIzV3ABy65F/UrK8A3PRNaoi wgutrjbjnWhEIw==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlaiq-0006Dq-Mh; Mon, 02 May 2022 14:24:36 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:29 +0200 Message-Id: <20220502182434.32130-3-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (mes-boot)[source]: Update to 0.24. [native-inputs]: Add stage0-posix, remove %bootstrap-mescc-tools and %bootstrap-mes-rewired, and update nyacc to 1.00.2. --- gnu/packages/commencement.scm | 61 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 24e1e6ec8c..468a846e76 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -527,27 +527,28 @@ (define mes-boot (package (inherit mes) (name "mes-boot") - (version "0.22") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mes/" - "mes-" version ".tar.gz")) - (sha256 - (base32 - "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) + (version "0.24") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "00lrpm4x5qg0l840zhbf9mr67mqhp8gljcl24j5dy0y109gf32w2"))))) (inputs '()) (propagated-inputs '()) (native-inputs - `(("nyacc-source" ,(origin (inherit (package-source nyacc-0.99)) - (snippet #f))) - ("mes" ,%bootstrap-mes-rewired) - ("mescc-tools" ,%bootstrap-mescc-tools) + `(("m2-planet" ,stage0-posix) + ("nyacc-source" ,(bootstrap-origin + (origin (inherit (package-source nyacc-1.00.2)) + (snippet #f)))) ,@(%boot-gash-inputs))) (arguments `(#:implicit-inputs? #f #:tests? #f #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:strip-binaries? #f ;no strip yet #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-seeds @@ -556,44 +557,42 @@ (define mes-boot (with-directory-excursion ".." (invoke "tar" "-xvf" nyacc-source))))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out")) - (gash (assoc-ref %build-inputs "bash")) - (mes (assoc-ref %build-inputs "mes")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gash (assoc-ref inputs "bash")) + (mes (assoc-ref inputs "mes")) (dir (with-directory-excursion ".." (getcwd)))) - (setenv "AR" (string-append "gash " (getcwd) "/scripts/mesar")) - (setenv "BASH" (string-append gash "/bin/bash")) - (setenv "CC" (string-append mes "/bin/mescc")) - (setenv "GUILE_LOAD_PATH" - (string-append - mes "/share/mes/module" - ":" dir "/nyacc-0.99.0/module")) + (setenv "GUILE_LOAD_PATH" (string-append + dir "/nyacc-1.00.2/module")) (invoke "gash" "configure.sh" (string-append "--prefix=" out) - (string-append "--host=i686-linux-gnu"))))) + "--host=i686-linux-gnu")))) (replace 'build (lambda _ - (invoke "sh" "bootstrap.sh"))) + (invoke "gash" "bootstrap.sh"))) (delete 'check) (replace 'install - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (substitute* "install.sh" ; show some progress ((" -xf") " -xvf") (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd) (string-append space "echo '" cmd "'\n" space cmd "\n"))) - (invoke "sh" "install.sh") + (invoke "gash" "install.sh") ;; Keep ASCII output, for friendlier comparison and bisection - (let* ((out (assoc-ref %outputs "out")) + (let* ((out (assoc-ref outputs "out")) (cache (string-append out "/lib/cache"))) (define (objects-in-dir dir) (find-files dir (lambda (name stat) (and (equal? (dirname name) dir) - (or (string-suffix? ".o" name) + (or (string-suffix? ".M1" name) + (string-suffix? ".hex2" name) + (string-suffix? ".o" name) (string-suffix? ".s" name)))))) (for-each (lambda (x) (install-file x cache)) - (append (objects-in-dir ".") + (append (objects-in-dir "m2") + (objects-in-dir ".") (objects-in-dir "mescc-lib"))))))))) (native-search-paths (list (search-path-specification From patchwork Mon May 2 18:24:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39070 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 86A4A27BBEB; Mon, 2 May 2022 19:25:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3100727BBEA for ; Mon, 2 May 2022 19:25:40 +0100 (BST) Received: from localhost ([::1]:47668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajr-0005eX-AT for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051K-RR for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajH-000164-Nj for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajH-0003Fl-Jx for guix-patches@gnu.org; Mon, 02 May 2022 14:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 4/8] commencement: tcc-boot0: Use NYACC-1.00.2. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589612436 (code B ref 55227); Mon, 02 May 2022 18:25:03 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:56 +0000 Received: from localhost ([127.0.0.1]:37980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaj5-0003E8-0v for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiw-0003Cw-Rp for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlair-0000sj-Kp; Mon, 02 May 2022 14:24:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=kMza4Gr9LDR+PqH98ngJVKcet5qZB/r1Ot6yDO2gQ50=; b=etoHDQ3rYXFYoMnmTjDY OGfrGUSlJPEosVv2TKiWihEsH5Id+/RShNShdBSDlRFo05rD+p1oW/+Ggjo5unU8EeeIyQdyko/5h NIiZj75MfjM4hnBQcvrNoyUpT1r1VtPjeHK13FD/HuVI+kDnTl4tIN/RDHK1LF2ImvZFEEIAQX4gp gNHcPyc0KC1amDGeYdEVLWfQ9k94lBOvyX+IK1BGlggC8jSSI3+DX5GZir0ZpOzectd8o20UOmG+8 XdxoOc2suTDWunCQ+nwaT3Lq9g3T9Jn7RVN2dXsmdBfOMrI7MFMhkIw+ym7O7Kh6tK8Lehubq1Iu3 y2ArcPj0bSU79Q==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlair-0006Dq-9J; Mon, 02 May 2022 14:24:37 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:30 +0200 Message-Id: <20220502182434.32130-4-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (tcc-boot0): Call 'bootstrap-origin' on source and on the source of NYACC-0.99. Use https source URL. Update NYACC to 1.00.2. --- gnu/packages/commencement.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 468a846e76..7f1ba7aa6a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019, 2020, 2021, 2022 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2020, 2022 Timothy Sample ;;; Copyright © 2020 Guy Fleury Iteriteka @@ -618,22 +618,24 @@ (define tcc-boot0 (inherit tcc) (name "tcc-boot0") (version "0.9.26-1103-g6e62e0e") - (source (origin - (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/mes/20191117/" - "/tcc-" version ".tar.gz")) - (sha256 - (base32 - "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng")))) + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://lilypond.org/janneke/mes/20191117/" + "/tcc-" version ".tar.gz")) + (sha256 + (base32 + "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng"))))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) - ("nyacc-source" ,(origin (inherit (package-source nyacc-0.99)) - (snippet #f))) + ("nyacc-source" ,(bootstrap-origin + (origin (inherit (package-source nyacc-1.00.2)) + (snippet #f)))) ("mescc-tools" ,%bootstrap-mescc-tools) ,@(%boot-gash-inputs))) (arguments From patchwork Mon May 2 18:24:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39067 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 67E0E27BBE9; Mon, 2 May 2022 19:25:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6F3DD27BBEA for ; Mon, 2 May 2022 19:25:22 +0100 (BST) Received: from localhost ([::1]:46798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajZ-00053T-Jo for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051O-Ul for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajI-000166-JV for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajI-0003G0-GT for guix-patches@gnu.org; Mon, 02 May 2022 14:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 5/8] commencement: tcc-boot0: Update to 0.9.26-1136-g0fbeb2dd. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589712452 (code B ref 55227); Mon, 02 May 2022 18:25:04 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:57 +0000 Received: from localhost ([127.0.0.1]:37984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlajA-0003Ef-QH for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaix-0003Cy-Fo for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlais-0000sr-97; Mon, 02 May 2022 14:24:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=PdCJNvzTnPXpDd7Xrdnxj8gKl18o2JjEfPug3Icz+yw=; b=rdOw43jEhc3vDK8EOdyO koAXduFCubXg54TG/ihqg5YexOUathJaY95OGwcJF9NK6VNHe2PgjgHaP4Y0/dXEMb/jVZhBW3fGg VcH/Jv1msSf8rb1gfuZFfZ5aHL1Fkf2h0fh8n3HnGb15M78O/9duMlm61wB0iC7bkU8HxGHyV2hSY apUhCHf0fe6PyXv6SPcFK3dgCtqzjD1syfFJG7KPNnXAza0FO5krUGgVXgk0cYEilz7AXOCMIYGrP 21XW2Nnpn0pT4U0C0IGM7tta66HZ1RYClxRnkk3uWVThwTwfoTL8OuBRybHQCS7VgtiyZ4ux168r1 YqpWIXUfBCjVoQ==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlair-0006Dq-TO; Mon, 02 May 2022 14:24:38 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:31 +0200 Message-Id: <20220502182434.32130-5-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (tcc-boot0)[source]: Update to 0.9.26-1136-g0fbeb2dd. [native-inputs]: Add stage0-posix and mes-boot, remove %bootstrap-mescc-tools and %bootstrap-mes-rewired. --- gnu/packages/commencement.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7f1ba7aa6a..8b8b243754 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -608,7 +608,7 @@ (define (objects-in-dir dir) (define tcc-boot0 - ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11 + ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 30 ;; patches. In a very early and rough form they were presented to the ;; TinyCC developers, who at the time showed no interest in supporting the ;; bootstrappable effort; we will try again later. These patches have been @@ -617,26 +617,26 @@ (define tcc-boot0 (package (inherit tcc) (name "tcc-boot0") - (version "0.9.26-1103-g6e62e0e") + (version "0.9.26-1136-g5bba73cc") (source (bootstrap-origin (origin (method url-fetch) (uri (string-append - "https://lilypond.org/janneke/mes/20191117/" + "https://lilypond.org/janneke/tcc/" "/tcc-" version ".tar.gz")) (sha256 (base32 - "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng"))))) + "1y2f04qwdqg7dgxiscbf0ibybx2gclniwbbcsxpayazzii2cvji3"))))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) + ("mescc-tools" ,stage0-posix) ("nyacc-source" ,(bootstrap-origin (origin (inherit (package-source nyacc-1.00.2)) (snippet #f)))) - ("mescc-tools" ,%bootstrap-mescc-tools) ,@(%boot-gash-inputs))) (arguments `(#:implicit-inputs? #f @@ -651,18 +651,17 @@ (define tcc-boot0 (with-directory-excursion ".." (invoke "tar" "-xvf" nyacc-source))))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) (dir (with-directory-excursion ".." (getcwd))) - (interpreter "/lib/mes-loader")) - - (setenv "prefix" out) - (setenv "GUILE_LOAD_PATH" - (string-append dir "/nyacc-0.99.0/module")) - + (interpreter "/lib/mes-loader") + (mes (assoc-ref inputs "mes")) + (mescc (string-append mes "/bin/mescc"))) (substitute* "conftest.c" (("volatile") "")) - + (setenv "prefix" out) + (setenv "GUILE_LOAD_PATH" + (string-append dir "/nyacc-1.00.2/module")) (invoke "sh" "configure" "--cc=mescc" (string-append "--prefix=" out) @@ -672,7 +671,7 @@ (define tcc-boot0 (replace 'build (lambda _ (substitute* "bootstrap.sh" ; Show some progress - (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{PROGRAM_PREFIX[}]tcc) [^\"]*[^\\])\n" all space cmd) + (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{program_prefix[}]tcc) [^\"]*[^\\])\n" all space cmd) (string-append space "echo \"" cmd "\"\n" space cmd "\n"))) (invoke "sh" "bootstrap.sh"))) @@ -892,8 +891,8 @@ (define tcc-boot (string-append out "/include")) (copy-recursively (string-append tcc "/lib") (string-append out "/lib")) - (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") - (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (invoke "./tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "./tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) (delete-file (string-append out "/lib/tcc/libtcc1.a")) (copy-file "libtcc1.a" From patchwork Mon May 2 18:24:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39069 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 43B1927BBEB; Mon, 2 May 2022 19:25:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 08EEA27BBE9 for ; Mon, 2 May 2022 19:25:40 +0100 (BST) Received: from localhost ([::1]:47644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajr-0005dV-5C for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051N-Up for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajI-000165-5q for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajI-0003Ft-2S for guix-patches@gnu.org; Mon, 02 May 2022 14:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 6/8] bootstrap: Remove %bootstrap-mescc-tools, %bootstrap-mes. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589612444 (code B ref 55227); Mon, 02 May 2022 18:25:04 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:56 +0000 Received: from localhost ([127.0.0.1]:37982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlajA-0003EX-Da for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiy-0003D1-3Q for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlais-0000sy-SY; Mon, 02 May 2022 14:24:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=iOVLtEkMtDshtLU0RT0isnJjRmmtfR9bgioBYJwVZwQ=; b=oZ4zMsAv6UWf2g2BScT+ 1q2OnUB24kc5Gdc9Mc8FPrC2N5bIVhDmFOmlHWnKYu0sW8hWEGCDe84+6i9kKKfY3UpWhM2b4E5XG Fo0HdempzFWmVt/HPr/esiQjYPc1QFoiuDA1J7vX0KN+NQNcpXhW4RnkwCPELLT2UxcWV/isVGuG5 oVKoV5I6HKlA3wqT3bfCTIbRqaDSlS+JU5/2L69hImhk2uevJcAyWoxUmAo3RWVW74t/zQxoveehW EEnuPbJK9Kssfnza4g66o9RCtPWgjW9CRMvtCaOIUNu3VskiihriosiN0FCfoCHOVGC/kEtwLEOSQ oapgjIDZ8DYOGQ==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlais-0006Dq-Fs; Mon, 02 May 2022 14:24:38 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:32 +0200 Message-Id: <20220502182434.32130-6-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootstrap.scm (%bootstrap-inputs): Remove %bootstrap-mescc-tools, %bootstrap-mes. --- gnu/packages/bootstrap.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 8bd0c4eaf3..03242f0e7b 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1035,9 +1035,7 @@ (define (%bootstrap-inputs) ;; own packages. (match (%current-system) ((or "i686-linux" "x86_64-linux") - `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) - ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) - ("mes" ,%bootstrap-mes))) + `(("linux-libre-headers" ,%bootstrap-linux-libre-headers))) (_ `(("libc" ,%bootstrap-glibc) ("gcc" ,%bootstrap-gcc) From patchwork Mon May 2 18:24:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39066 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D7B9D27BBE9; Mon, 2 May 2022 19:25:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B9A3D27BBE9 for ; Mon, 2 May 2022 19:25:21 +0100 (BST) Received: from localhost ([::1]:46782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajY-00052y-Qe for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051P-W9 for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00016F-Io for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajJ-0003GF-FW for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 7/8] commencement: Remove %bootstrap-mes-rewired. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589812466 (code B ref 55227); Mon, 02 May 2022 18:25:05 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:58 +0000 Received: from localhost ([127.0.0.1]:37988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlajC-0003Ev-7P for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiy-0003D3-LY for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlait-0000t5-Es; Mon, 02 May 2022 14:24:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=cIr9hTG5K5LHbtR7alw5BeviehUb3UixB9bxj90sm/w=; b=Th+elYrxHL47c6cDA/Km 9TbMXqzt/jG3R1vNWLP5KwqJu+JDyRcoWYoi0+aWOtOJJm1T/VCcgn17L9EFO/97PBCcwb3alsUOv fIi6LFosHiEzZ5UAy91GnVAgr0KwfcjtPo509g/dDBvuHm8JRD3ROrti9ZUDnTi0peLBoLnhUqWST npzVzsMKKOF7RIkuaNxwo4Fs1+KalMigw+2ziMLJQbr3DdRw+q9jlwgG+EDltwDpG+7cflCB/oFKm DJWrN0hZvFnlYGmgTxKIL6y2LLZrMTxCZjdJFpw8PxJBEtKsM5OsfOsLQaa69tqdHPKwBmKqWPJMr Egmw1pE4zP0ZdA==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlait-0006Dq-3J; Mon, 02 May 2022 14:24:39 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:33 +0200 Message-Id: <20220502182434.32130-7-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (%bootstrap-mes-rewired): Remove. --- gnu/packages/commencement.scm | 108 ---------------------------------- 1 file changed, 108 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8b8b243754..ffc8a5dd37 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -415,114 +415,6 @@ (define stage0-posix M2, get_machine, (mescc-tools), and M2-Planet.") (license license:gpl3+)))) -(define %bootstrap-mes-rewired - (package - (inherit mes) - (name "bootstrap-mes-rewired") - (version "0.19") - (source #f) - (native-inputs `(("mes" ,%bootstrap-mes) - ("gash" ,gash-boot))) - (inputs '()) - (propagated-inputs '()) - (outputs '("out")) - (build-system trivial-build-system) - (arguments - `(#:guile ,%bootstrap-guile - #:modules ((guix build utils)) - - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((mes (assoc-ref %build-inputs "mes")) - (gash (assoc-ref %build-inputs "gash")) - (mes-bin (string-append mes "/bin")) - (guile (string-append mes-bin "/mes")) - (mes-module (string-append mes "/share/mes/module")) - (out (assoc-ref %outputs "out")) - (bin (string-append out "/bin")) - (mescc (string-append bin "/mescc")) - (module (string-append out "/share/mes/module"))) - (define (rewire file) - (substitute* file - ((mes) out) - (("/gnu/store[^ ]+mes-minimal-[^/)}\"]*") out) - (("/gnu/store[^ ]+guile-[^/]*/bin/guile") guile) - (("/gnu/store[^ ]+bash-[^/)}\"]*") gash))) - - (mkdir-p bin) - (for-each (lambda (file) (install-file file bin)) - (find-files mes-bin)) - (mkdir-p module) - (copy-recursively (string-append mes-module "/mes") - (string-append module "/mes")) - (copy-recursively (string-append mes-module "/srfi") - (string-append module "/srfi")) - (for-each rewire - ;; Cannot easily rewire "mes" because it - ;; contains NUL characters; would require - ;; remove-store-references alike trick - (filter (negate (cut string-suffix? "/mes" <>)) - (find-files bin))) - (rewire (string-append module "/mes/boot-0.scm")) - - (delete-file mescc) - (with-output-to-file mescc - (lambda _ - (display (string-append - "\ -#! " gash "/bin/sh -LANG=C -LC_ALL=C -export LANG LC_ALL - -MES_PREFIX=${MES_REWIRED_PREFIX-" out "/share/mes} -MES=" bin "/mes -export MES MES_PREFIX - -MES_ARENA=${MES_REWIRED_ARENA-10000000} -MES_MAX_ARENA=${MES_REWIRED_ARENA-10000000} -MES_STACK=${MES_REWIRED_STACK-1000000} -export MES_ARENA MES_MAX_ARENA MES_STACK - -$MES -e '(mescc)' module/mescc.scm -- \"$@\" -")))) - (chmod mescc #o555) - - (with-directory-excursion module - (chmod "mes/base.mes" #o644) - (copy-file "mes/base.mes" "mes/base.mes.orig") - (let ((base.mes (open-file "mes/base.mes" "a"))) - (display " -;; A fixed map, from Mes 0.21, required to bootstrap Mes 0.21 -(define (map f h . t) - (if (or (null? h) - (and (pair? t) (null? (car t))) - (and (pair? t) (pair? (cdr t)) (null? (cadr t)))) '() - (if (null? t) (cons (f (car h)) (map f (cdr h))) - (if (null? (cdr t)) - (cons (f (car h) (caar t)) (map f (cdr h) (cdar t))) - (if (null? (cddr t)) - (cons (f (car h) (caar t) (caadr t)) (map f (cdr h) (cdar t) (cdadr t))) - (error 'unsupported (cons* 'map-4: f h t))b ))))) -" base.mes) - (close base.mes)) - - (chmod "mes/guile.mes" #o644) - (copy-file "mes/guile.mes" "mes/guile.mes.orig") - (let ((guile.mes (open-file "mes/guile.mes" "a"))) - (display " -;; After booting guile.scm; use Mes 0.21; especially: MesCC 0.21 -(let* ((self (car (command-line))) - (prefix (dirname (dirname self)))) - (set! %moduledir (string-append prefix \"/mes/module/\")) - (setenv \"%numbered_arch\" \"true\")) - -" guile.mes) - (close guile.mes))) - #t)))))) - (define mes-boot (package (inherit mes) From patchwork Mon May 2 18:24:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39072 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D6D1927BBEA; Mon, 2 May 2022 19:25:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8B00127BBE9 for ; Mon, 2 May 2022 19:25:52 +0100 (BST) Received: from localhost ([::1]:48322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlak3-00065x-Oq for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051M-Uj for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44097) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajJ-000169-49 for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajJ-0003G8-0Q for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 8/8] doc: Add the "Full Source Bootstrap". Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589812460 (code B ref 55227); Mon, 02 May 2022 18:25:04 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:58 +0000 Received: from localhost ([127.0.0.1]:37986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlajB-0003En-68 for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiz-0003D5-Bc for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlaiu-0000tJ-42; Mon, 02 May 2022 14:24:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=wD5Qlwd3LLIEnyBzF6LuxcAeKhQK2PLSZD/0/mKk/iE=; b=fYRgVzluZctE+f9t9AKZ XMO6j5BJSrkNelyekmonASX5rFQsouNkAf0xh/hURUgI3abFX41qDOZDPG8uD/LGdOXtLUkEJLGH0 1+1QIWXWm9qOgPKic+yfJ1aWsDT0ea2ciQKyuzeMWpBa4Z7Sc3e2rZ8EjyD6w1QPAZYYumMC+obs2 tdx5mMgoXmG6ORTkUcdgvz3I5UMutUn2UzKsLpaG+ANakJPYh3Og7sJ9TVNqhiL6vQcs4GbJZZlNN VqZ2fqGtYiGdEwSbd9BuEjDuGohk7Zn+iSAlUYSj6XQO6NjSw11YKQjXBAX+zmNuuNHQRC3GNPC/A SjnWk6W/5raopg==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlait-0006Dq-O3; Mon, 02 May 2022 14:24:39 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:34 +0200 Message-Id: <20220502182434.32130-8-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi (Reduced Binary Seed Bootstrap): Update and rename to... (Full Source Bootstrap): ...this. * doc/images/gcc-core-mesboot0-graph.dot: Regenerate. --- doc/guix.texi | 77 +++++----- doc/images/gcc-core-mesboot0-graph.dot | 187 ++++++++++--------------- 2 files changed, 116 insertions(+), 148 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7bd80a1592..3c08d6be1a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36,7 +36,7 @@ Copyright @copyright{} 2016, 2017, 2018, 2021 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nikita Gillmann@* -Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@* +Copyright @copyright{} 2016, 2017, 2018, 2019, 2021 Jan Nieuwenhuizen@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Christopher Baines@* @@ -394,7 +394,7 @@ Installing Debugging Files Bootstrapping -* Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. +* Full Source Bootstrap:: A Bootstrap worthy of GNU. * Preparing to Use the Bootstrap Binaries:: Building that what matters most. @end detailmenu @@ -39491,12 +39491,12 @@ re-create them if needed (@pxref{Preparing to Use the Bootstrap Binaries}). @menu -* Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. +* Full Source Bootstrap:: A Bootstrap worthy of GNU. * Preparing to Use the Bootstrap Binaries:: Building that what matters most. @end menu -@node Reduced Binary Seed Bootstrap -@section The Reduced Binary Seed Bootstrap +@node Full Source Bootstrap +@section The Full Source Bootstrap Guix---like other GNU/Linux distributions---is traditionally bootstrapped from a set of bootstrap binaries: Bourne shell, command-line tools provided by GNU @@ -39511,28 +39511,43 @@ about 250MB (@pxref{Bootstrappable Builds,,, mes, GNU Mes}). Auditing or even inspecting these is next to impossible. For @code{i686-linux} and @code{x86_64-linux}, Guix now features a -``Reduced Binary Seed'' bootstrap @footnote{We would like to say: ``Full -Source Bootstrap'' and while we are working towards that goal it would -be hyperbole to use that term for what we do now.}. - -The Reduced Binary Seed bootstrap removes the most critical tools---from a -trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C -Library are replaced by: @code{bootstrap-mescc-tools} (a tiny assembler and -linker) and @code{bootstrap-mes} (a small Scheme Interpreter and a C compiler -written in Scheme and the Mes C Library, built for TinyCC and for GCC). - -Using these new binary seeds the ``missing'' Binutils, GCC, and the GNU -C Library are built from source. From here on the more traditional -bootstrap process resumes. This approach has reduced the bootstrap -binaries in size to about 145MB in Guix v1.1. - -The next step that Guix has taken is to replace the shell and all its +``Full Source'' bootstrap. This bootstrap is rooted in @file{hex0-seed} +from the @url{https://savannah.gnu.org/projects/stage0, Stage0} package. +The source code of this initial hex0 program is a file called +@c XXX TODO: udpate to savannah url, once accepted there +@url{https://github.com/oriansj/bootstrap-seeds/blob/master/POSIX/x86/hex0_x86.hex0,@file{hex0_x86.hex0}} +and is written in the @code{hex0} language. + +Hex0 is self hosting, which means that it can build itself: + +@example +./hex0-seed hex0_x86.hex0 hex0 +@end example + +Hex0 it is the ASCII-equivalent of the binary program and can be +produced by doing something much like: + +@example +sed 's/[;#].*$//g' hex0_x86.hex0 | xxd -r -p > hex0 +chmod +x hex0 +@end example + +It is because of this ASCII-binary equivalence that we can bless this +initial 357-byte binary as source, and hence `Full Source Bootstrap''. + +The bootstrap then continues: @code{hex0} builds @code{hex1} and then on +to @code{M0}, @code{hex2}, @code{M1}, @code{mescc-tools} and finally +@code{M2-Planet}. Then, using @code{mescc-tools}, @code{M2-Planet} we +build Mes (@pxref{Top, GNU Mes Reference Manual,, mes, GNU Mes}, a +Scheme interpreter and C compiler in Scheme). Frome here on starts +the more traditional @code{C}-based bootstrap of the GNU System. + +Another step that Guix has taken is to replace the shell and all its utilities with implementations in Guile Scheme, the @emph{Scheme-only bootstrap}. Gash (@pxref{Gash,,, gash, The Gash manual}) is a POSIX-compatible shell that replaces Bash, and it comes with Gash Utils which has minimalist replacements for Awk, the GNU Core Utilities, Grep, -Gzip, Sed, and Tar. The rest of the bootstrap binary seeds that were -removed are now built from source. +Gzip, Sed, and Tar. Building the GNU System from source is currently only possible by adding some historical GNU packages as intermediate steps@footnote{Packages @@ -39548,22 +39563,10 @@ The graph below shows the resulting dependency graph for @code{gcc-core-mesboot0}, the bootstrap compiler used for the traditional bootstrap of the rest of the Guix System. -@c ./pre-inst-env guix graph -e '(@@ (gnu packages commencement) gcc-core-mesboot0)' | sed -re 's,((bootstrap-mescc-tools|bootstrap-mes|guile-bootstrap).*shape =) box,\1 ellipse,' > doc/images/gcc-core-mesboot0-graph.dot +@c ./pre-inst-env guix graph -e '(@@ (gnu packages commencement) gcc-core-mesboot0)' | sed -re 's,((bootstrap-seeds|guile-bootstrap).*shape =) box,\1 ellipse,' > doc/images/gcc-core-mesboot0-graph.dot @image{images/gcc-core-mesboot0-graph,6in,,Dependency graph of gcc-core-mesboot0} -The only significant binary bootstrap seeds that remain@footnote{ -Ignoring the 68KB @code{mescc-tools}; that will be removed later, -together with @code{mes}.} are a Scheme interpreter and a Scheme -compiler: GNU Mes and GNU Guile@footnote{Not shown in this graph are the -static binaries for @file{bash}, @code{tar}, and @code{xz} that are used -to get Guile running.}. - -This further reduction has brought down the size of the binary seed to -about 60MB for @code{i686-linux} and @code{x86_64-linux}. - -Work is ongoing to remove all binary blobs from our free software -bootstrap stack, working towards a Full Source Bootstrap. Also ongoing -is work to bring these bootstraps to the @code{arm-linux} and +Work is ongoing to to bring these bootstraps to the @code{arm-linux} and @code{aarch64-linux} architectures and to the Hurd. If you are interested, join us on @samp{#bootstrappable} on the Freenode diff --git a/doc/images/gcc-core-mesboot0-graph.dot b/doc/images/gcc-core-mesboot0-graph.dot index 191582ed4c..ef4e3a441e 100644 --- a/doc/images/gcc-core-mesboot0-graph.dot +++ b/doc/images/gcc-core-mesboot0-graph.dot @@ -1,114 +1,79 @@ digraph "Guix package" { - "139781154519456" [label = "gcc-core-mesboot0@2.95.3", shape = box, fontname = Helvetica]; - "139781154519456" -> "139781154519632" [color = darkgoldenrod]; - "139781154519456" -> "139781154520688" [color = darkgoldenrod]; - "139781154519456" -> "139781034971312" [color = darkgoldenrod]; - "139781154519456" -> "139781154520160" [color = darkgoldenrod]; - "139781154519456" -> "139781034971664" [color = darkgoldenrod]; - "139781154519456" -> "139781154519984" [color = darkgoldenrod]; - "139781154519456" -> "139781154519808" [color = darkgoldenrod]; - "139781154519456" -> "139781154520512" [color = darkgoldenrod]; - "139781154519456" -> "139781034971488" [color = darkgoldenrod]; - "139781154519456" -> "139781034972896" [color = darkgoldenrod]; - "139781154519456" -> "139781034972368" [color = darkgoldenrod]; - "139781154519456" -> "139781034973072" [color = darkgoldenrod]; - "139781154519456" -> "139781131267872" [color = darkgoldenrod]; - "139781154519632" [label = "binutils-mesboot0@2.14", shape = box, fontname = Helvetica]; - "139781154519632" -> "139781154520688" [color = peachpuff4]; - "139781154519632" -> "139781034971312" [color = peachpuff4]; - "139781154519632" -> "139781154520160" [color = peachpuff4]; - "139781154519632" -> "139781034971664" [color = peachpuff4]; - "139781154519632" -> "139781154519984" [color = peachpuff4]; - "139781154519632" -> "139781154519808" [color = peachpuff4]; - "139781154519632" -> "139781154520512" [color = peachpuff4]; - "139781154519632" -> "139781034971488" [color = peachpuff4]; - "139781154519632" -> "139781034972896" [color = peachpuff4]; - "139781154519632" -> "139781034972368" [color = peachpuff4]; - "139781154519632" -> "139781034973072" [color = peachpuff4]; - "139781154519632" -> "139781131267872" [color = peachpuff4]; - "139781154520688" [label = "bash-mesboot0@2.05b", shape = box, fontname = Helvetica]; - "139781154520688" -> "139781034971488" [color = magenta]; - "139781154520688" -> "139781034971840" [color = magenta]; - "139781154520688" -> "139781034972896" [color = magenta]; - "139781154520688" -> "139781034972368" [color = magenta]; - "139781154520688" -> "139781034973072" [color = magenta]; - "139781154520688" -> "139781131267872" [color = magenta]; - "139781034971488" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; - "139781034971488" -> "139781034971840" [color = dimgrey]; - "139781034971488" -> "139781034972896" [color = dimgrey]; - "139781034971488" -> "139781034972368" [color = dimgrey]; - "139781034971488" -> "139781034973072" [color = dimgrey]; - "139781034971488" -> "139781131267872" [color = dimgrey]; - "139781034971840" [label = "tcc-boot0@0.9.26-1103-g6e62e0e", shape = box, fontname = Helvetica]; - "139781034971840" -> "139781034972016" [color = magenta]; - "139781034971840" -> "139781131266816" [color = magenta]; - "139781034971840" -> "139781034972896" [color = magenta]; - "139781034971840" -> "139781034972368" [color = magenta]; - "139781034971840" -> "139781034973072" [color = magenta]; - "139781034971840" -> "139781131267872" [color = magenta]; - "139781034972016" [label = "mes-boot@0.22", shape = box, fontname = Helvetica]; - "139781034972016" -> "139781034972192" [color = cyan3]; - "139781034972016" -> "139781131266816" [color = cyan3]; - "139781034972016" -> "139781034972896" [color = cyan3]; - "139781034972016" -> "139781034972368" [color = cyan3]; - "139781034972016" -> "139781034973072" [color = cyan3]; - "139781034972016" -> "139781131267872" [color = cyan3]; - "139781034972192" [label = "bootstrap-mes-rewired@0.19", shape = ellipse, fontname = Helvetica]; - "139781034972192" -> "139781131266640" [color = darkseagreen]; - "139781034972192" -> "139781034972896" [color = darkseagreen]; - "139781131266640" [label = "bootstrap-mes@0", shape = ellipse, fontname = Helvetica]; - "139781034972896" [label = "gash-boot@0.2.0", shape = box, fontname = Helvetica]; - "139781034972896" -> "139781034973072" [color = darkviolet]; - "139781034972896" -> "139781131267872" [color = darkviolet]; - "139781034973072" [label = "bootar@1", shape = box, fontname = Helvetica]; - "139781034973072" -> "139781131267872" [color = darkviolet]; - "139781131267872" [label = "guile-bootstrap@2.0", shape = ellipse, fontname = Helvetica]; - "139781131266816" [label = "bootstrap-mescc-tools@0.5.2", shape = ellipse, fontname = Helvetica]; - "139781034972368" [label = "gash-utils-boot@0.1.0", shape = box, fontname = Helvetica]; - "139781034972368" -> "139781034973072" [color = darkseagreen]; - "139781034972368" -> "139781034972896" [color = darkseagreen]; - "139781034972368" -> "139781131267872" [color = darkseagreen]; - "139781034971312" [label = "bzip2-mesboot@1.0.8", shape = box, fontname = Helvetica]; - "139781034971312" -> "139781034971488" [color = cyan3]; - "139781034971312" -> "139781034971840" [color = cyan3]; - "139781034971312" -> "139781034972896" [color = cyan3]; - "139781034971312" -> "139781034972368" [color = cyan3]; - "139781034971312" -> "139781034973072" [color = cyan3]; - "139781034971312" -> "139781131267872" [color = cyan3]; - "139781154520160" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; - "139781154520160" -> "139781034971488" [color = red]; - "139781154520160" -> "139781034971840" [color = red]; - "139781154520160" -> "139781034972896" [color = red]; - "139781154520160" -> "139781034972368" [color = red]; - "139781154520160" -> "139781034973072" [color = red]; - "139781154520160" -> "139781131267872" [color = red]; - "139781034971664" [label = "gzip-mesboot@1.2.4", shape = box, fontname = Helvetica]; - "139781034971664" -> "139781034971840" [color = red]; - "139781034971664" -> "139781034972896" [color = red]; - "139781034971664" -> "139781034972368" [color = red]; - "139781034971664" -> "139781034973072" [color = red]; - "139781034971664" -> "139781131267872" [color = red]; - "139781154519984" [label = "patch-mesboot@2.5.9", shape = box, fontname = Helvetica]; - "139781154519984" -> "139781034971488" [color = blue]; - "139781154519984" -> "139781034971840" [color = blue]; - "139781154519984" -> "139781034972896" [color = blue]; - "139781154519984" -> "139781034972368" [color = blue]; - "139781154519984" -> "139781034973072" [color = blue]; - "139781154519984" -> "139781131267872" [color = blue]; - "139781154519808" [label = "sed-mesboot0@1.18", shape = box, fontname = Helvetica]; - "139781154519808" -> "139781034971488" [color = red]; - "139781154519808" -> "139781034971840" [color = red]; - "139781154519808" -> "139781034972896" [color = red]; - "139781154519808" -> "139781034972368" [color = red]; - "139781154519808" -> "139781034973072" [color = red]; - "139781154519808" -> "139781131267872" [color = red]; - "139781154520512" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; - "139781154520512" -> "139781034971312" [color = darkviolet]; - "139781154520512" -> "139781034971488" [color = darkviolet]; - "139781154520512" -> "139781034971840" [color = darkviolet]; - "139781154520512" -> "139781034972896" [color = darkviolet]; - "139781154520512" -> "139781034972368" [color = darkviolet]; - "139781154520512" -> "139781034973072" [color = darkviolet]; - "139781154520512" -> "139781131267872" [color = darkviolet]; + "139803511371136" [label = "gcc-core-mesboot0@2.95.3", shape = box, fontname = sans]; + "139803511371136" -> "139803511371312" [color = red]; + "139803511371136" -> "139803511372016" [color = red]; + "139803511371136" -> "139803511371488" [color = red]; + "139803511371136" -> "139803511371664" [color = red]; + "139803511371136" -> "139803511371840" [color = red]; + "139803511371136" -> "139803507105792" [color = red]; + "139803511371136" -> "139803511373600" [color = red]; + "139803511371136" -> "139803507105968" [color = red]; + "139803511371136" -> "139803749199472" [color = red]; + "139803511371312" [label = "binutils-mesboot0@2.20.1a", shape = box, fontname = sans]; + "139803511371312" -> "139803511372016" [color = dimgrey]; + "139803511371312" -> "139803511371488" [color = dimgrey]; + "139803511371312" -> "139803511371664" [color = dimgrey]; + "139803511371312" -> "139803511371840" [color = dimgrey]; + "139803511371312" -> "139803507105792" [color = dimgrey]; + "139803511371312" -> "139803511373600" [color = dimgrey]; + "139803511371312" -> "139803507105968" [color = dimgrey]; + "139803511371312" -> "139803749199472" [color = dimgrey]; + "139803511372016" [label = "gzip-mesboot@1.2.4", shape = box, fontname = sans]; + "139803511372016" -> "139803511372192" [color = magenta]; + "139803511372016" -> "139803507105792" [color = magenta]; + "139803511372016" -> "139803511373600" [color = magenta]; + "139803511372016" -> "139803507105968" [color = magenta]; + "139803511372016" -> "139803749199472" [color = magenta]; + "139803511372192" [label = "tcc-boot0@0.9.26-1136-g5bba73cc", shape = box, fontname = sans]; + "139803511372192" -> "139803511372368" [color = magenta]; + "139803511372192" -> "139803511372544" [color = magenta]; + "139803511372192" -> "139803507105792" [color = magenta]; + "139803511372192" -> "139803511373600" [color = magenta]; + "139803511372192" -> "139803507105968" [color = magenta]; + "139803511372192" -> "139803749199472" [color = magenta]; + "139803511372368" [label = "mes-boot@0.24", shape = box, fontname = sans]; + "139803511372368" -> "139803511372544" [color = darkviolet]; + "139803511372368" -> "139803507105792" [color = darkviolet]; + "139803511372368" -> "139803511373600" [color = darkviolet]; + "139803511372368" -> "139803507105968" [color = darkviolet]; + "139803511372368" -> "139803749199472" [color = darkviolet]; + "139803511372544" [label = "stage0-posix@1.4", shape = box, fontname = sans]; + "139803511372544" -> "139803511373072" [color = peachpuff4]; + "139803511372544" -> "139803507105792" [color = peachpuff4]; + "139803511372544" -> "139803511373600" [color = peachpuff4]; + "139803511372544" -> "139803507105968" [color = peachpuff4]; + "139803511372544" -> "139803749199472" [color = peachpuff4]; + "139803511373072" [label = "bootstrap-seeds@1.0.0", shape = ellipse, fontname = sans]; + "139803511373072" -> "139803507105968" [color = cyan3]; + "139803507105968" [label = "bootar@1b", shape = box, fontname = sans]; + "139803507105968" -> "139803749199472" [color = dimgrey]; + "139803749199472" [label = "guile-bootstrap@2.0", shape = ellipse, fontname = sans]; + "139803507105792" [label = "gash-boot@0.3.0", shape = box, fontname = sans]; + "139803507105792" -> "139803507105968" [color = darkviolet]; + "139803507105792" -> "139803749199472" [color = darkviolet]; + "139803511373600" [label = "gash-utils-boot@0.2.0", shape = box, fontname = sans]; + "139803511373600" -> "139803507105968" [color = red]; + "139803511373600" -> "139803507105792" [color = red]; + "139803511373600" -> "139803749199472" [color = red]; + "139803511371488" [label = "patch-mesboot@2.5.9", shape = box, fontname = sans]; + "139803511371488" -> "139803511371840" [color = darkseagreen]; + "139803511371488" -> "139803511372192" [color = darkseagreen]; + "139803511371488" -> "139803507105792" [color = darkseagreen]; + "139803511371488" -> "139803511373600" [color = darkseagreen]; + "139803511371488" -> "139803507105968" [color = darkseagreen]; + "139803511371488" -> "139803749199472" [color = darkseagreen]; + "139803511371840" [label = "make-mesboot0@3.80", shape = box, fontname = sans]; + "139803511371840" -> "139803511372192" [color = blue]; + "139803511371840" -> "139803507105792" [color = blue]; + "139803511371840" -> "139803511373600" [color = blue]; + "139803511371840" -> "139803507105968" [color = blue]; + "139803511371840" -> "139803749199472" [color = blue]; + "139803511371664" [label = "tcc-boot@0.9.27", shape = box, fontname = sans]; + "139803511371664" -> "139803511371840" [color = peachpuff4]; + "139803511371664" -> "139803511372192" [color = peachpuff4]; + "139803511371664" -> "139803507105792" [color = peachpuff4]; + "139803511371664" -> "139803511373600" [color = peachpuff4]; + "139803511371664" -> "139803507105968" [color = peachpuff4]; + "139803511371664" -> "139803749199472" [color = peachpuff4]; }