From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2ExGDbVslGVXOQEAkFu2QA (envelope-from ) for ; Tue, 02 Jan 2024 21:06:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iOydBrVslGVz+QAA62LTzQ (envelope-from ) for ; Tue, 02 Jan 2024 21:06:13 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elenq.tech header.s=soverin1 header.b="fy/aLQYn"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704225972; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4CRr3DnyCxxTNXd5XVb3Ek04YEzVn/gcpr9fbQY9ipo=; b=p9BxsNa+8P+MasTQpwZhw3JxLFq1V4Bk23S714gHPJBawUZHW0u4OKDdia1VUxASweLlJo rglsZshF8wvFkk1oNloOqWLJfHeM3R8iPFLnZajgS3FpjRHdZQ10CxUMjax2oK0oFIuNqK LFr8UwGH1+1wp+86z/DT3lgNPuoxAU0RuUZQ0X160jIgogFMA4rGJafei33sgrns5yAhmO TcQfUX1RDA0rsj7zV/XJz1SolERCMNLWQ7VLw2mtQzgPXKv0U7uV/l3nKHrfEEwY4XVbzV 6tiSgKV4McYVzbkGhS05bCmzqZXw8WdgmrporrgIup6I7MYIr6Np5lwoW49UgA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elenq.tech header.s=soverin1 header.b="fy/aLQYn"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704225972; a=rsa-sha256; cv=none; b=KawjGRxdBEwBp3jGBBgPY0ANBQos0DzA2fdA3lSQcRQVMpxD6UDkFrdtoAyQsHyXAKGKJg jn8C0qHKRlEcEMA3f0J/vrG9pCUd3/PfiDXvWdF6/A3WZL7frPutaDsY4FCHdKbvM4NdGg 6MnZ7WLVAJbouyiHxcKM24yI4CW6xyu6xxKzJGWHxUHlbqYHt8MdfSrwHGl1PmYXv2IUDc Z7Pf5dNPCKQ1i0OBWwgg9iFidEgWJxdSUeBEzqcW0cBpBSOoW31FOPBzv6HZw5GB/q0PF3 EMJCvkWqXZ14RseG1yxGO8i3E50+TSSQBIqwopdg4Z+W6wx4EtWF4WiGlit2XQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 93AAC10262 for ; Tue, 2 Jan 2024 21:06:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKl1V-0004Am-Uz; Tue, 02 Jan 2024 15:06:01 -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 1rKl1T-00049P-HI for guix-patches@gnu.org; Tue, 02 Jan 2024 15:05:59 -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 1rKl1T-0002tC-9V for guix-patches@gnu.org; Tue, 02 Jan 2024 15:05:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKl1V-0007oS-Rx for guix-patches@gnu.org; Tue, 02 Jan 2024 15:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68222] [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 20:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68222 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68222@debbugs.gnu.org Cc: Ekaitz Zarraga Received: via spool by 68222-submit@debbugs.gnu.org id=B68222.170422591629908 (code B ref 68222); Tue, 02 Jan 2024 20:06:01 +0000 Received: (at 68222) by debbugs.gnu.org; 2 Jan 2024 20:05:16 +0000 Received: from localhost ([127.0.0.1]:51391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKl0l-0007mK-Gu for submit@debbugs.gnu.org; Tue, 02 Jan 2024 15:05:16 -0500 Received: from dane.soverin.net ([2a10:de80:1:4092:b9e9:2294:0:1]:55869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKl0g-0007ly-Hu for 68222@debbugs.gnu.org; Tue, 02 Jan 2024 15:05:14 -0500 Received: from smtp.soverin.net (unknown [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 4T4P313XRVz2xW4; Tue, 2 Jan 2024 20:05:01 +0000 (UTC) Received: from smtp.soverin.net (smtp.soverin.net [10.10.4.99]) by soverin.net (Postfix) with ESMTPSA id 4T4P306jtlz3Q; Tue, 2 Jan 2024 20:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=soverin1; t=1704225901; 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: in-reply-to:in-reply-to:references:references; bh=4CRr3DnyCxxTNXd5XVb3Ek04YEzVn/gcpr9fbQY9ipo=; b=fy/aLQYnnc9k31ZYD/eJwsEjmvYjlBXrJ7Kpyx/lHWmNmYx+H7EdhU0LTsHHZrqKTzdN6t i2FpvP/NBNwlCtvGd0CQthvNNA5xgUmDpzoOLqYAkbOw098vREBaxn5n4xGk/lQyv9ooON +b7vsecswU8k+BU37sFLXRqsXxTI+WMlzQQ0A2d+sbbbLr+wlXVzpWqhqNZlaUZ0RtcR60 mUUGuXDGHaOGzlO6WDVrjSxBbUbh4KQeip3zOob8HjFtCPww2s+Qhdc9+tZKpLEcH8mw7l 33bs7psBt29zLiHKMXXq9T0aNff6CnFbm6dDEwG31qarBV4drRjMV8TVu34QMQ== From: Ekaitz Zarraga Date: Tue, 2 Jan 2024 21:04:42 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.36 X-Spam-Score: -4.36 X-Migadu-Queue-Id: 93AAC10262 X-TUID: HVkAclPvOenp 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(-) 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 -- 2.41.0