From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2HmyGRg0vmaG7AAA62LTzQ:P1 (envelope-from ) for ; Thu, 15 Aug 2024 17:00:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 2HmyGRg0vmaG7AAA62LTzQ (envelope-from ) for ; Thu, 15 Aug 2024 19:00:08 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Nj5uACkH; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=cjJcofFe; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1723741208; 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=mVgmWv9seh9SgDbJ94cnUruZZbyTAo8ZO5DBC2yiNcc=; b=Zt4SbgSzXXozeCy9BN/z1cPrv31FmogWyGGZCE8Z5spmiSBFiTOlydlYNO1lS1GFo/l68H lOzqnhqOtugPa804SCCaF9pSlTTOezv/n85tvlwQZgU6LNrFR3HOoREZ2pDw6jtDm759lr dApiRobM8oyh86FnMQnBV0mD4u8I3aqCPUFLEPwmGo2tdLj/CdhFd10LztqrdzIQTM4qWc RNVAOQ3OB6LHuUQaIpJrdeaVMg60WfsDdjblYFA4fKHH45lOxeSwxWcvlKBRUy2jWWsXnI en/gSBjddY92CCPFWoQHQiqiwuKKfZzV40xBt3KUZAV1UZnUChbtA9AJjtm/8w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723741208; a=rsa-sha256; cv=none; b=EjnDZjU0xgKpPDz/y+6XsVTkroL2wjKfsmtiI8hi4V3++v4DshubN21maQJMJEib9x3yCc 7lzhigQoWHIC96ecs9phzEMYsVojxk1W6IH5YjanhQdluG9JT1GsQD4WSuVV3rzg1N8CBU LdfkLF7vKQQp3l/9ZSVoAGc7gl9x48It1jdf5XQaPSBOYzyKf0ogUv0j7ZooyMwibdAHlf rFs3AIDuEJ64b5bOkwg1R1MguWYbcj9nwTnGOnZJdcEruzf+vcZcNmEM4KcfOYZqcplCae yxBhiN1y5gyr9hlGrkerVfwuCwm5Ap1NG0cM2wjswVVWIsjApm7VM1HSB/lhmw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Nj5uACkH; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=cjJcofFe; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 F10597874C for ; Thu, 15 Aug 2024 19:00:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sedpG-000295-Hd; Thu, 15 Aug 2024 12:59:50 -0400 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 1sedoz-00024U-4Z for guix-patches@gnu.org; Thu, 15 Aug 2024 12:59:36 -0400 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 1sedot-0003Sh-Ix; Thu, 15 Aug 2024 12:59:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=mVgmWv9seh9SgDbJ94cnUruZZbyTAo8ZO5DBC2yiNcc=; b=Nj5uACkHZhpZyIEIITGxZlJz4JlKgQ4mzo8QvloermTcOyOj2VIzG/HNKQMUeJi55mZSqCcfYTVXWecRq+zTQUyAbaCV0MVo2t/hCkxnfTxP6lj64Wsik3n+CQUUJ25f0ObxmPyaMlEAMRFlIspcMSfmz8836k7BuTbz+CBD4ZGLXixRU9/XCdXR3BDXuxROluezr6Glxu+kTF9FoobyMEk12uVvg03wAHeCBhvxRqaoQD1vFKlP1NmsYw6PFuFcjWkFeJhWJWY5+4fkUjSVsx83AhR3Wnmglisz6t2QKCxldjD9r6xgWbRHnnYl99PGTOt9hUBPgiRvdSdF3Td3xg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sedpT-0003SX-V4; Thu, 15 Aug 2024 13:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72643] [PATCH core-updates 4/6] DRAFT gnu: glibc-bootstrap: Update i586-gnu variant. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 15 Aug 2024 17:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72643@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 72643-submit@debbugs.gnu.org id=B72643.172374117613198 (code B ref 72643); Thu, 15 Aug 2024 17:00:03 +0000 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:36 +0000 Received: from localhost ([127.0.0.1]:49672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedp1-0003Qe-Un for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedox-0003Pi-5D for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoH-0003R0-FB; Thu, 15 Aug 2024 12:58:49 -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=mVgmWv9seh9SgDbJ94cnUruZZbyTAo8ZO5DBC2yiNcc=; b=cjJcofFe3XSVADaPJzXo zToRaZrhMlRNkqnzHQj0l/xEI7gw2f+m8A/tknu+DUslDUmzp6bPR+p0Fuz0qd+uL8eKfyOd6O0Xp I2TP79FYpnIqGQb2vRqy+V9dqiC2F2rW9w7OejJqnE7mXFoJMJuAE2XIgkFkDkUGOFXlFj2l1PuYi SgaJM151d9nE1rTq8FFhXwLA/BfRZim4pcNP7Q9SF+NzMcgijKIdG+CCKOOSfTqJnfpX2Wq+L40Vm QerLOp8cntqs3aloZhyR0ejf7cpoA706DCrJldxMtM11f4Gj+6SVeQFMEn7JLxPsTE4maAEXBfP54 8NPyuA8+UTfOCA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 15 Aug 2024 18:58:32 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.06 X-Spam-Score: -5.06 X-Migadu-Queue-Id: F10597874C X-Migadu-Scanner: mx11.migadu.com X-TUID: QrfaxvrUqCT8 DRAFT: Change it when glibc-bootstrap tarball is uploaded somewhere. ‘glibc-stripped-2.39-i586-pc-gnu.tar.xz’ was built from x86_64-linux from the previous commit with: ./pre-inst-env guix build --target=i586-pc-gnu \ -e '((@@ (gnu packages make-bootstrap) %glibc-bootstrap-tarball))' Fixes . * gnu/packages/bootstrap.scm (%bootstrap-glibc): Update i586-gnu variant. Change-Id: I2d770e8001896059e1f27e50f7a4ddf15e4b5812 --- gnu/packages/bootstrap.scm | 105 +++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a36bb289cd..e79fa36cb0 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2024 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver ;;; Copyright © 2017, 2020, 2024 Efraim Flashner ;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen @@ -37,7 +37,7 @@ (define-module (gnu packages bootstrap) #:select (raw-derivation derivation-input derivation->output-path)) #:use-module (guix utils) #:use-module ((guix build utils) #:select (elf-file?)) - #:use-module ((guix gexp) #:select (lower-object)) + #:use-module ((guix gexp) #:select (lower-object local-file)) #:use-module (guix monads) #:use-module (guix memoization) #:use-module (guix i18n) @@ -758,55 +758,58 @@ (define %bootstrap-glibc (inputs `(("tar" ,(bootstrap-executable "tar" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system))) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("armhf-linux" - "/20150101/glibc-2.20.tar.xz") - ("aarch64-linux" - "/20170217/glibc-2.25.tar.xz") - ("powerpc64le-linux" - "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") - ("i586-gnu" - "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") - ("powerpc-linux" - "/20200923/glibc-2.32.tar.xz") - ("riscv64-linux" - "/20210725/glibc-2.31.tar.xz") - (_ - "/20131110/glibc-2.18.tar.xz"))) - %bootstrap-base-urls)) - (sha256 - (match (%current-system) - ("x86_64-linux" - (base32 - "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")) - ("i686-linux" - (base32 - "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")) - ("armhf-linux" - (base32 - "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn")) - ("aarch64-linux" - (base32 - "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")) - ("powerpc64le-linux" - (base32 - "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")) - ("riscv64-linux" - (base32 - "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")) - ("i586-gnu" - (base32 - "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) - ("powerpc-linux" - (base32 - "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) - ("mips64el-linux" - (base32 - "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))) + ("tarball" ,(if (string=? (%current-system) "i586-gnu") + (local-file + (search-auxiliary-file "glibc-stripped-2.39-i586-pc-gnu.tar.xz")) + (bootstrap-origin + (origin + (method url-fetch) + (uri (map (cut string-append <> "/" (%current-system) + (match (%current-system) + ("armhf-linux" + "/20150101/glibc-2.20.tar.xz") + ("aarch64-linux" + "/20170217/glibc-2.25.tar.xz") + ("powerpc64le-linux" + "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") + ("i586-gnu" + "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") + ("powerpc-linux" + "/20200923/glibc-2.32.tar.xz") + ("riscv64-linux" + "/20210725/glibc-2.31.tar.xz") + (_ + "/20131110/glibc-2.18.tar.xz"))) + %bootstrap-base-urls)) + (sha256 + (match (%current-system) + ("x86_64-linux" + (base32 + "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")) + ("i686-linux" + (base32 + "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")) + ("armhf-linux" + (base32 + "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn")) + ("aarch64-linux" + (base32 + "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")) + ("powerpc64le-linux" + (base32 + "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")) + ("riscv64-linux" + (base32 + "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")) + ("i586-gnu" + (base32 + "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) + ("powerpc-linux" + (base32 + "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) + ("mips64el-linux" + (base32 + "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description synopsis) (home-page #f) -- 2.45.2