From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +I5YNJIpsmN8gwEAbAwnHQ (envelope-from ) for ; Mon, 02 Jan 2023 01:47:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id GLU1NJIpsmPqaAAA9RJhRA (envelope-from ) for ; Mon, 02 Jan 2023 01:47:14 +0100 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 8E2E99E23 for ; Mon, 2 Jan 2023 01:47:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yn-0001rC-OY; Sun, 01 Jan 2023 19:47:05 -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 1pC8ym-0001qk-SY for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pC8ym-0004Ws-Ax for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8ym-0007HD-6d for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 04/11] gnu: make-u-boot-package: Allow disabling cross-compilation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042127910 (code B ref 60224); Mon, 02 Jan 2023 00:47:04 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:01 +0000 Received: from localhost ([127.0.0.1]:42069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yi-0007G0-Va for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:01 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:37591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yg-0007Ev-Nv for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:59 -0500 Received: by mail-qv1-f45.google.com with SMTP id o17so14802325qvn.4 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OgZ6xvQ4kBs21bBADQZvWxhuklkjFG1Jj1/h6hid/HI=; b=BtPF4ANtQborNozjbfVNWWjU0X7L45Pz/Q6lM84JWWhowo69htCYKeTcUrjr2UbVDQ FmeO9sL/6TeecZ3HHJX7tL958Xbnlcm1hucX5djvxQE5JfamRu7aBeKOqEr+33Nt/LhT LDeWZj/TJPGTjqXgi5uzLXYQDhJjb8bBqZfP+8Oe3V52WZvvHUgwagmaGV5NOcoGsxon nPS4YKJENiHr8zxsZEK2yzFCoaQVIGseljo2hCkG+knvdPYwH6cIMEBegfDxyDgM4FOt 6uGztB0el9CehiL59RZMSYuhFKQZSGBk00G9Hw7B7uGRfCXqGS6O3jgGK4Czl1VdQERm 07fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OgZ6xvQ4kBs21bBADQZvWxhuklkjFG1Jj1/h6hid/HI=; b=rzhYCzNKeRjVjvBWzv32CScN7Yh/ObqU8Fe77qlPisAmdTjLy4z7EOq+1/UvEqW2Kg 0vXL0mcBV1+JegW2/DCdLULAaoiCrj/ZQ+I+3GZjSK+vkvJOcFloq9DLYYABWLM93ORX HIbuwd1mILiZp6QKofwTTwfR/DBgPiaRBzSrDRvXmRu35HULbXRqAA7akOzqrJnZSj0Q 2sZLW5/j9MvcWq3aNcqvvIT/Qtrd5ZqHg5ouT8UMchxTD6r1B68u18JUfj6F0cBLZV/K jDfgBdDmxiCGpGiyX4xtaIsfCetvzkuwE7gtPrJVXRJT6qJwQZUxIs4UC6wNxPN7dniW BZfw== X-Gm-Message-State: AFqh2krRTuLkpQC/g5+29U81BthNlVUdDh0SDisO2iMeudWjHkbIed/Y G1YhEr7OgD1qkdzEsjln593Wsiq9QtR+hg== X-Google-Smtp-Source: AMrXdXsn1UB8GUkH3uWv5mi49LKzKJmnPnp7TC+qbl/qpN3nTXnu8/pny910dzuoRKg9f9Dmd00ZwA== X-Received: by 2002:a0c:f906:0:b0:531:be1a:89af with SMTP id v6-20020a0cf906000000b00531be1a89afmr7822269qvn.6.1672620413115; Sun, 01 Jan 2023 16:46:53 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:52 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:29 -0500 Message-Id: <20230102004637.3920-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-1-maxim.cournoyer@gmail.com> 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672620434; 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=OgZ6xvQ4kBs21bBADQZvWxhuklkjFG1Jj1/h6hid/HI=; b=CP0a3FGFbZV2LxvZKWsDutTfgGy2jvIJXkLdOrtGPa50lexYLTfClTQb5T8ocuFrdxsPM3 WQhDr5bX39aE/bsIG7k4yqqqz2A+71oZRm6gkJ0pVjzpM710M5UT70fgNkIhNPsCh+4zmU oerAV25EERP86NhVTwVd9rPf2Q+0JIakBNSd4T5RJzh/ko9A02cj+sxIGV37ruYNskSZi9 l8U/+YgFfLseO71tM0y2QeRvWM6udOK7dHr8ISN1R1yjS3P0qm65zbPIJfKKPFRMw3ji3F FVf0pXMUU1ojDBZCUPQR74kk4XG4GCxDbfjwICfFZE6ui7dPZudbpwebMluK0A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=BtPF4ANt; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672620434; a=rsa-sha256; cv=none; b=gtcgOA4pc5EyBeoSpYjhLC3fvLEZvQBwUTg+WLkKhOmaiZwyrejTOXNVui+YSHiKHoErqp HKvPiLvhTe6HojweD5yLhIDC4foJB+He2HXfKzx7lPKtyEvekEgGAIOzKI9eAQXSpt2X0Q ATfJrjX0PMJpZR3DcJjDyOM2ysggbyI5eVm/tV2f4njWR0x4/ca28rw/QtGb1z0iAONOdO 8W6TqjbmhRpa5Gyshx0O+a1DPEumdmQA6Idll8AHgNgxljMT1i1psxWZa+aEuuGvGKwdWX d7WWS7/ysIsWhZWxAvc+a16r0dxohoFFaUYYffAmIgltseT1WE/WpL3lFaNFSw== X-Spam: Yes X-Migadu-Queue-Id: 8E2E99E23 X-Migadu-Spam: Yes X-Spam-Score: 6.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=BtPF4ANt; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 6.45 X-TUID: 0KN1GKAhVCF9 * gnu/packages/bootloaders.scm (make-u-boot-package): Accept #f for the TRIPLET argument to disable cross-compilation. Update doc. --- (no changes since v1) gnu/packages/bootloaders.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c3c15d557a..1a4415b858 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -859,14 +859,16 @@ (define*-public (make-u-boot-package board triplet (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. -NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description. U-BOOT can be used when a fork or a -different version of U-Boot must be used." +TRIPLET may also be set to #f to disable cross-compilation. NAME-SUFFIX is +appended to the package name, while APPEND-DESCRIPTION is appended to the +package description. U-BOOT can be used when a fork or a different version of +U-Boot must be used." (let ((native-build? (lambda () ;; Note: %current-system is a *triplet*, unlike its ;; name would suggest. - (string=? (%current-system) - (gnu-triplet->nix-system triplet))))) + (or (not triplet) ;disable cross-compilation + (string=? (%current-system) + (gnu-triplet->nix-system triplet)))))) (package (inherit u-boot) (name (string-append "u-boot-" -- 2.38.1