From patchwork Mon May 2 11:18:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 39054 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 520BF27BBEA; Mon, 2 May 2022 12:29:56 +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 0CEF327BBE9 for ; Mon, 2 May 2022 12:29:56 +0100 (BST) Received: from localhost ([::1]:41760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlUFX-00006I-6z for patchwork@mira.cbaines.net; Mon, 02 May 2022 07:29:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlU63-0001gd-5Q for guix-patches@gnu.org; Mon, 02 May 2022 07:20:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41127) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlU60-0005Zw-7O for guix-patches@gnu.org; Mon, 02 May 2022 07:20:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlU60-0005jj-2Q for guix-patches@gnu.org; Mon, 02 May 2022 07:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55220] [PATCH 3/4] ci: Do not rely on hardcoded cross-targets lists. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 11:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55220 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55220@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 55220-submit@debbugs.gnu.org id=B55220.165149039822014 (code B ref 55220); Mon, 02 May 2022 11:20:03 +0000 Received: (at 55220) by debbugs.gnu.org; 2 May 2022 11:19:58 +0000 Received: from localhost ([127.0.0.1]:35018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlU5u-0005j0-HH for submit@debbugs.gnu.org; Mon, 02 May 2022 07:19:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlU5t-0005ik-F3 for 55220@debbugs.gnu.org; Mon, 02 May 2022 07:19:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54140) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlU5n-0005Z2-35 for 55220@debbugs.gnu.org; Mon, 02 May 2022 07:19:52 -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=wQ7OyDYkad7e/MUysSzkGO6zVsY4n2OvNHNnUnBkXQM=; b=pFosVcFbcvZkTCNGC/ID 3EuYqN4e9GchlWd7yXzoyep4TmLGvme0U/8sCIuH5cy7+2DBNSoXJRtmfhdtNO6DnkAyZIrsRkANq +b26+QxNnHV5d2AikUmn6x0lrTWZrjnGPEt4HA010bRyA9V1ylCrh06QcHdQ1h2X/ud0FZIwgGdkR dB1JFy9HWx6gNq8uFehXKR3VjQdy0wgDApE56NEPRN7ZnfKc3ABNIrxTou26R9xTeUzihwxLrC1oq RO+4Voekdoi7RB79feEfAGQEXXiiNVnt1vn3Fjzx2wXFA4jGRc2dkQt/cbpDddqS1eyBejw6GxPfA RItP61xt4DKRvw==; Received: from 71.125.192.77.rev.sfr.net ([77.192.125.71]:33768 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlU5Q-0004xO-ET; Mon, 02 May 2022 07:19:32 -0400 From: Mathieu Othacehe Date: Mon, 2 May 2022 13:18:58 +0200 Message-Id: <20220502111859.13605-3-othacehe@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502111859.13605-1-othacehe@gnu.org> References: <20220502111859.13605-1-othacehe@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/ci.scm (%cross-targets): Remove it ... (cross-jobs): ... and use the targets procedure instead. * etc/release-manifest.scm: Adapt it. Signed-off-by: Mathieu Othacehe --- etc/release-manifest.scm | 4 ++-- gnu/ci.scm | 15 ++------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index e7e64efda4..1098f491ba 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -23,7 +23,7 @@ (use-modules (gnu packages) (guix packages) (guix profiles) - ((gnu ci) #:select (%cross-targets)) + ((gnu platform) #:select (targets)) ((gnu services xorg) #:select (%default-xorg-modules)) (guix utils) (srfi srfi-1) @@ -144,7 +144,7 @@ (define %cross-manifest %packages-to-cross-build))) ;; XXX: Important bits like libsigsegv and libffi don't support ;; RISCV at the moment, so don't require RISCV support. - (delete "riscv64-linux-gnu" %cross-targets)))) + (delete "riscv64-linux-gnu" (targets))))) (define %cross-bootstrap-manifest (manifest diff --git a/gnu/ci.scm b/gnu/ci.scm index 35fd583f75..9de1b54fc8 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -55,6 +55,7 @@ (define-module (gnu ci) #:use-module (gnu packages multiprecision) #:use-module (gnu packages make-bootstrap) #:use-module (gnu packages package-management) + #:use-module (gnu platform) #:use-module (gnu system) #:use-module (gnu system image) #:use-module (gnu system vm) @@ -71,7 +72,6 @@ (define-module (gnu ci) image->job %core-packages - %cross-targets channel-source->package arguments->systems @@ -169,17 +169,6 @@ (define (packages-to-cross-build target) (drop-right %core-packages 6) %core-packages)) -(define %cross-targets - '("mips64el-linux-gnu" - "arm-linux-gnueabihf" - "aarch64-linux-gnu" - "powerpc-linux-gnu" - "powerpc64le-linux-gnu" - "riscv64-linux-gnu" - "i586-pc-gnu" ;aka. GNU/Hurd - "i686-w64-mingw32" - "x86_64-w64-mingw32")) - (define (cross-jobs store system) "Return a list of cross-compilation jobs for SYSTEM." (define (from-32-to-64? target) @@ -221,7 +210,7 @@ (define (either proc1 proc2 proc3) package target system)) (packages-to-cross-build target))) (remove (either from-32-to-64? same? pointless?) - %cross-targets))) + (targets)))) (define* (guix-jobs store systems #:key source commit) "Return a list of jobs for Guix itself."