From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yOBrEyTExGONbgEAbAwnHQ (envelope-from ) for ; Mon, 16 Jan 2023 04:27:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KMVzEiTExGOxUgEAG6o9tA (envelope-from ) for ; Mon, 16 Jan 2023 04:27:32 +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 EF64F39302 for ; Mon, 16 Jan 2023 04:27:31 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9J-0000FD-Ig; Sun, 15 Jan 2023 22:27: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 1pHG9I-0000Ds-4E for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27: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 1pHG9H-0005pD-S6 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9H-0007sy-Nn for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 05/13] 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, 16 Jan 2023 03:27:03 +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 , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383957030134 (code B ref 60224); Mon, 16 Jan 2023 03:27:03 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:10 +0000 Received: from localhost ([127.0.0.1]:60058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007ps-43 for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:36857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8K-0007oC-HK for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:04 -0500 Received: by mail-qt1-f174.google.com with SMTP id x5so141572qti.3 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:04 -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=fDtzNjXRQEQ/FtltpH7Y2ETPCCP0JWIg+abDkgsAPP0=; b=T5bQAegduhe4oEmuLD2FMzTnHuj2YUiICLA9RIA2tSdfBLoGpQVHGamKCGw0QNYpuP /HXfEeTyiCDzH8XQ7OAGjh3dDQO1gbB38RTXeQm0tsClwpFVb1YyeAJmwzTTircRUGIR 21enXvfviTAzlioD0luiGxEQtc8oEYWbAQo727jStEhKPLrPULRsvBRjY2fn/VWCok0k JrTPAQSa0mwGO1kN6jtGAkQwGAu836/UGRg4O6HhKcs9XReZgTp+lQ9efGGbYA7I7EED q6Gq9FArRI6Atgle7bybExNkFBajMDwFdewH3v0d4GINQxHU7amebqChxg4WxwtGEkMW kGFA== 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=fDtzNjXRQEQ/FtltpH7Y2ETPCCP0JWIg+abDkgsAPP0=; b=bF6Xa1dwZ+m96irZLVMITyd61UclJDakjckcA03KEVQPjLxjlRRxn4er4RdyzK6cvD 7dDBTusP+TnlCbRASCXPEV5g1HRneUAL1GYV5VWj6UqAg7vINJFNrFcCyAs8az598mdV LMOMfmiizI/dGw97ghnRHy+dcTblOsR9nb7/RxyQVHOXUrbaAiJJJimhydlC0LOL9hFB yVkitb05ZTQfJ+wL4w9pynDny74eGeGAbsxgbVc/49VwRvRLGFg6XVyCYy+Xfpj6YbND Jtz43pdBtvV4XHL6Aww/racZ+eeDGD/YLGW0Yr/QjZcoezMOs85MqCF0zmmMe3wUZTxX QnKw== X-Gm-Message-State: AFqh2kqRLQ8QEFDFju/yYUT+VcQPSvhOp/VaiCJDTi3R3mzaz7gP+SuQ 0ZCx7F08ZaIA6QUzLPk+vdUFWBgTitzO5KZn X-Google-Smtp-Source: AMrXdXvuzz93hjOFMAfpcj1ku71hQ+nSzvsOh1k9aZ2s5fZ1n1NnIxe+DbE2EA2XjkBlUae1NK/iiQ== X-Received: by 2002:ac8:7766:0:b0:3a5:f9cb:886f with SMTP id h6-20020ac87766000000b003a5f9cb886fmr118465442qtu.29.1673839558996; Sun, 15 Jan 2023 19:25:58 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:58 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:36 -0500 Message-Id: <20230116032544.1378-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-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-Seal: i=1; s=key1; d=yhetil.org; t=1673839652; a=rsa-sha256; cv=none; b=mRqF3DSQH6yh+qkqZC2qNK2aLheT2g7IcDcC7kzIwA6PK0e5cJTDXrZfiNpChXpEPRQT82 wj2+A2JCtR+Ij9p+O4uEnp+mj+laBnqm5AD68DwVJf3YZulCxddGI7BcNSoQucsyjWl+22 uC1pIHJ3J7fKyiIsm7Dxg0sXGXf3mghmlB1TrnBV92T2FayUVylwCk/Q9/1qK0gvWvqGeI zgQsMVEthfXmXEEKcGJuGmlJgh5341JzuqTiRBgxIMu198MWIfeTD4O9RDcQ9iR877ZwQH l0I8EZ8PZn/C5X50QMNB/wip/CsVvWXKDWsb0byaErenZO3PE9OlZh3NOJ9iRw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=T5bQAegd; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673839652; 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=fDtzNjXRQEQ/FtltpH7Y2ETPCCP0JWIg+abDkgsAPP0=; b=D+FKgBOV1/sDOt+0jMn0nrqExZ0uyuhywzD/JJHyl21qdBEQkMK86L6vOxJyPpNglT5oLl dMyp/YnjBnl9I4v3nQZ71CJ0gLVryJRcAkOvGIpDIP8cLWCLPkD29Agkrz/bxNSwL1xwDB iHVrFTTGl2mQdchBghXrVWQu7+kAUA2zueL1e07d68L2z+DGv9edLshkbN3DQ/50icGtdP y9JOecHxeYMtwlJ0uhIWaIhn3Kc05pEbM8X7kOfYqoDkYNrgeT85qCU3LV/IPYVpWc/C6f 5fh0enKyWwaIFcsJp+bom9VmtItC9SC/iPAVldETrQPR+Oczxc1TBTUifNtP9w== X-Migadu-Spam-Score: -0.02 X-Spam-Score: -0.02 X-Migadu-Queue-Id: EF64F39302 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=T5bQAegd; 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-TUID: E2X57lglFkhA * 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 b7a31c8b48..290d832a83 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -860,12 +860,14 @@ (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 () - (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