From patchwork Tue Jan 2 19:09:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 58327 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 4CA9427BBEA; Tue, 2 Jan 2024 19:11:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 00ED427BBE2 for ; Tue, 2 Jan 2024 19:11:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKkAN-0007wd-V9; Tue, 02 Jan 2024 14:11:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rKkAI-0007w9-7P for guix-patches@gnu.org; Tue, 02 Jan 2024 14:11:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rKkAH-000293-Lb for guix-patches@gnu.org; Tue, 02 Jan 2024 14:11:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKkAK-0004Go-5O for guix-patches@gnu.org; Tue, 02 Jan 2024 14:11:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68220] [PATCH 1/3] gnu: stage0-posix: Update to 1.6.0 Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Jan 2024 19:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68220 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68220@debbugs.gnu.org Cc: Ekaitz Zarraga , janneke@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170422262616339 (code B ref -1); Tue, 02 Jan 2024 19:11:03 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jan 2024 19:10:26 +0000 Received: from localhost ([127.0.0.1]:51289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKk9h-0004FR-Hn for submit@debbugs.gnu.org; Tue, 02 Jan 2024 14:10:26 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKk9W-0004Ed-KC for submit@debbugs.gnu.org; Tue, 02 Jan 2024 14:10:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rKk9N-0007eB-St for guix-patches@gnu.org; Tue, 02 Jan 2024 14:10:05 -0500 Received: from dane.soverin.net ([2a10:de80:1:4091:b9e9:2215:0:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rKk9K-0001ns-AM; Tue, 02 Jan 2024 14:10:05 -0500 Received: from smtp.soverin.net (c04smtp-lb01.int.sover.in [10.10.4.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dane.soverin.net (Postfix) with ESMTPS id 4T4MqQ2p1tzSf; Tue, 2 Jan 2024 19:09:54 +0000 (UTC) Received: from smtp.soverin.net (smtp.soverin.net [10.10.4.100]) by soverin.net (Postfix) with ESMTPSA id 4T4MqP4Hx5zFv; Tue, 2 Jan 2024 19:09:53 +0000 (UTC) Authentication-Results: smtp.soverin.net; dkim=pass (2048-bit key; unprotected) header.d=elenq.tech header.i=@elenq.tech header.a=rsa-sha256 header.s=soverin1 header.b=rBRyPABk; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=soverin1; t=1704222594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQ58AccFqfD2l9TrXFFwAPPowyPnk12nEk7W0ImJNC0=; b=rBRyPABkVsToLMhVqInU+E7idOUQp10ru8XeIEIeqZTQwNt9xtiSyShpbzRnG3Idtad4Km BxA3UktqgwhuXIen4ItZSc/46FkDX8Yg0GD+8fZVRKaQZQp3PtCrCxNCtsdgUR0xKYgc8W PS+dHUS3OzrILRMGqtMnIjA1E2ZWhfQh+4D+jcM5a+mh9vn9PNN8UL+MJCY80ETj8ZfNCR JDSf6RsIz42NDRAkuN/h7gnLOb5XMEuFJnMBkoY+UBefbJgeAGLWZxuJZq/s7ESRSOwgb3 9BpUSFSKi4oe6qqI+XQXZL83dTO3EirAFLdheg6MP/ml7j/4r3Z7GIGuqjHcaQ== From: Ekaitz Zarraga Date: Tue, 2 Jan 2024 20:09:24 +0100 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=2a10:de80:1:4091:b9e9:2215:0:1; envelope-from=ekaitz@elenq.tech; helo=dane.soverin.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches In 1.6.0 we have all the inputs merged in the tarball so we don't need to add extra inputs in separate tarballs. * gnu/packages/commencement (bootstrap-seeds): Remove it. (stage0-posix): Update to 1.6.0 and take sub-packages from the tarball. Change-Id: Ic025335ecc66acecbc0a928995a07e521aeb7742 --- gnu/packages/commencement.scm | 117 ++++------------------------------ 1 file changed, 13 insertions(+), 104 deletions(-) base-commit: e8814809c2de6fe2f23169775207b3d2e537724f diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9124f0e2e0..1ef0b2e757 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2022 Ricardo Wurmus -;;; Copyright © 2022 Ekaitz Zarraga +;;; Copyright © 2022, 2023 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -302,97 +302,24 @@ (define (%boot-gash-inputs) ("bootar" ,bootar) ("guile" ,%bootstrap-guile))) -(define bootstrap-seeds - (package - (name "bootstrap-seeds") - (version "1.0.0") - (source (origin - (method url-fetch) - (uri (list - (string-append "mirror://gnu/guix/mirror/" - "bootstrap-seeds-" version ".tar.gz") - (string-append - "https://lilypond.org/janneke/guix/20220501/" - "bootstrap-seeds-" version ".tar.gz"))) - (sha256 - (base32 - "0scz2bx8fd8c821h6y1j3x6ywgxxns7iinyn9z32dnkiacfdcpfn")))) - (native-inputs (list bootar)) - (build-system trivial-build-system) - (arguments - (list #:guile %bootstrap-guile - #:modules '((guix build utils)) - #:builder - #~(begin - (use-modules (guix build utils)) - (let ((source #$(package-source this-package)) - (tar #$(this-package-native-input "bootar")) - (out #$output)) - (setenv "PATH" (string-append tar "/bin:")) - (invoke "tar" "xvf" source) - (mkdir-p out) - (copy-recursively "bootstrap-seeds" out))))) - (home-page "https://github.com/oriansj/bootstrap-seeds") - (synopsis "The initial bootstrap seeds: 357-byte hex0 and kaem shell") - (description - "This package provides pre-built binaries of the 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 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") - (mescc-tools - (origin - (method url-fetch) - (uri (list - (string-append - "mirror://gnu/guix/mirror/" - "mescc-tools-" mescc-tools-version ".tar.gz") - (string-append - "https://lilypond.org/janneke/guix/20220502/" - "mescc-tools-" mescc-tools-version ".tar.gz"))) - (sha256 - (base32 - "1xi6f48pf5bhajhfis189gpizxij7nbp1vzvsb1aafhz4skkiqvg")))) - (m2-planet - (origin - (method url-fetch) - (uri (list - (string-append - "mirror://gnu/guix/mirror/" - "M2-Planet-" m2-planet-version ".tar.gz") - (string-append - "https://lilypond.org/janneke/guix/20220502/" - "M2-Planet-" m2-planet-version ".tar.gz"))) - (sha256 - (base32 - "1xrn69sc5nz4hwaishqyrcidp1ncxwib9zswl45x378ddz3mmk7g"))))) (package (name "stage0-posix") - (version "1.4") + (version "1.6.0") (source (origin (method url-fetch) - (uri (list - (string-append "mirror://gnu/guix/mirror/" - "stage0-posix-" version ".tar.gz") - (string-append - "https://lilypond.org/janneke/guix/20220502/" - "stage0-posix-" version ".tar.gz"))) + (uri (string-append + "https://github.com/oriansj/" name "/releases/download/" + "Release_" version "/" name "-" version ".tar.gz")) (sha256 - (base32 - "1ammifkj33205qrpfm84yb1c99lwgbn4jsl1hd08aab8c9ffz6p4")))) + (base32 + "0p06wn95y6xbp2kcd81h2fm3wxvldd1qqyxgav0farl34xlzyq4j")))) (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux" "riscv64-linux")) - (native-inputs - `(("bootstrap-seeds" ,bootstrap-seeds) - ,@(%boot-gash-inputs))) + (native-inputs (%boot-gash-inputs)) (build-system trivial-build-system) (arguments (list @@ -401,9 +328,7 @@ (define stage0-posix #:builder #~(begin (use-modules (guix build utils)) - (let* ((bootstrap-seeds #$(this-package-native-input - "bootstrap-seeds")) - (source #$(package-source this-package)) + (let* ((source #$(package-source this-package)) (tar #$(this-package-native-input "bootar")) (bash #$(this-package-native-input "bash")) (coreutils #$(this-package-native-input "coreutils")) @@ -422,32 +347,16 @@ (define stage0-posix "riscv64") (else (error "stage0-posix: system not supported" target)))) - (kaem (string-append "../bootstrap-seeds/POSIX/" + (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" + (invoke kaem (string-append "kaem." stage0-cpu)) + (with-directory-excursion (string-append stage0-cpu "/bin") (install-file "hex2" bindir) (install-file "M1" bindir) (install-file "blood-elf" bindir) @@ -460,7 +369,7 @@ (define stage0-posix the bootstrap-seeds, the stage0-posix package first builds hex0 and then all the way up: hex1, catm, hex2, M0, cc_x86, M1, M2, get_machine (that's all of MesCC-Tools), and finally M2-Planet.") - (license license:gpl3+)))) + (license license:gpl3+))) (define mes-boot (package