From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iG79OFqadmKZIwAAbAwnHQ (envelope-from ) for ; Sat, 07 May 2022 18:12:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qOUROFqadmIdfQAAG6o9tA (envelope-from ) for ; Sat, 07 May 2022 18:12:10 +0200 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 8C0E71027A for ; Sat, 7 May 2022 18:12:10 +0200 (CEST) Received: from localhost ([::1]:45026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnN2P-0006AM-NA for larch@yhetil.org; Sat, 07 May 2022 12:12:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnN2J-00067p-4R for guix-patches@gnu.org; Sat, 07 May 2022 12:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58913) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnN2I-00038Y-SA for guix-patches@gnu.org; Sat, 07 May 2022 12:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnN2I-0006NG-Nl for guix-patches@gnu.org; Sat, 07 May 2022 12:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55220] [PATCH v2 3/6] 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: Sat, 07 May 2022 16:12:02 +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.165193990724421 (code B ref 55220); Sat, 07 May 2022 16:12:02 +0000 Received: (at 55220) by debbugs.gnu.org; 7 May 2022 16:11:47 +0000 Received: from localhost ([127.0.0.1]:52799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN22-0006La-Om for submit@debbugs.gnu.org; Sat, 07 May 2022 12:11:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN21-0006Ku-7T for 55220@debbugs.gnu.org; Sat, 07 May 2022 12:11:45 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnN1w-00032o-2A for 55220@debbugs.gnu.org; Sat, 07 May 2022 12:11: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=qjBL13rKtG9zMnPoNlMBKnYEpm5ekMk+toRUAUm0KA4=; b=N+5AVQZ7yqMLuZCDn86V S0ob60deypb0v5KvYtW9A85O5+/FRPuxb0D5C7uloH4gkLsBJ/hgpj/QCDHZEqG7sAdHN0Z8VplDG /PGfIiKuFzQ84SVbe+8aVTlm58/QlJYwTKpHUdktEk2SKvIIoWJVIDzsTwoe94lZJVVvX4NYZ5WCo 1a1MkmbSw5VR5Chgu13tEvDwdLKFggKIhPV+vSpwBZRtkxHgBmODnkZY42Px4cNr2DYwwBKr5FtIF CUuvvZXXmVR4Onw2VNdQCN5XkajR/qdt6MvpamYi9HB904lTyQcxONOzfTE57Qxi0CSqSzjlgM6Hw bkFOnv/D71G8qg==; Received: from 71.125.192.77.rev.sfr.net ([77.192.125.71]:40324 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 1nnN1v-0004uM-Io; Sat, 07 May 2022 12:11:39 -0400 From: Mathieu Othacehe Date: Sat, 7 May 2022 18:11:23 +0200 Message-Id: <20220507161126.14553-4-othacehe@gnu.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220507161126.14553-1-othacehe@gnu.org> References: <20220507161126.14553-1-othacehe@gnu.org> MIME-Version: 1.0 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651939930; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=qjBL13rKtG9zMnPoNlMBKnYEpm5ekMk+toRUAUm0KA4=; b=Gs4EghYIGQLR7HVnHTwPX20aonoKAeWQWt5QEPgUyxA8gFvUgsELpeiQ0ftzGAp8OYycx6 VYfjgeHEQTLao6POjIih5y19HO9sutQaSSRofyOfcj7TMXLW1UOOT4OUlsTtUA7Egrw8p3 Rm+23/zhqnaaZEkUYkNczI3fTR+oJsrmX0slGnevlP8Yf6kQw5azFWTi0QgOZw96pf+Tje eibVoZsSduAnSN7UA2FTmPANvTNV67UuM6zqn3EFfZlYtQQiOD6TOPXAJO6NQFCU3FZTdW sx8YUXFa/iY7TViAXvaHQ9GK483ACkAKR6NEeif62iLWrYHFoOzVY7sFj8JvoA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651939930; a=rsa-sha256; cv=none; b=eXP823blRjhLnLc1ExsSzHpL59AznqyeXBC7vu8gFLw7EO//6IR5BuiC/zJHKvtQHpBrfs InQfK9BuSRyvJerzG5bzgfSkq4aFxOtljW/H+QzMn2uj+JrNsmge3EHcgQwzDpF8+GClBf r7TuNHGpkd3apI6J4ZSbbTmtjl/UxJF1pV5UsCRp7yfjr1FmENSQY3RsSE0owsl4qDblD9 asGUy8oFkDnfPjqWjOmwG0ZsjKDYJjXjKIyIuk/jw3moMRiW1BxQXAgeaE9//erbP7RRlz iwdT6deKmQ+7gXXOCe4XvIV0kl6piTWLv/VxbPSRS2T7SI031bhQkX4Pc+9xKA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=N+5AVQZ7; 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" X-Migadu-Spam-Score: -2.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=N+5AVQZ7; 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" X-Migadu-Queue-Id: 8C0E71027A X-Spam-Score: -2.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: xBBzu9wcHaXh * 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." -- 2.36.0