From patchwork Wed Jan 11 20:44:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46049 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 D615F27BBED; Wed, 11 Jan 2023 20:46:01 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 B611527BBE9 for ; Wed, 11 Jan 2023 20:45:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyD-0001cK-Ly; Wed, 11 Jan 2023 15:45:13 -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 1pFhy6-0001S5-9B for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:07 -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 1pFhy6-0007hh-1M for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007Ig-SV for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 04/12] 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: Wed, 11 Jan 2023 20:45:05 +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.167346990428033 (code B ref 60224); Wed, 11 Jan 2023 20:45:05 +0000 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:04 +0000 Received: from localhost ([127.0.0.1]:44005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy4-0007Hx-6f for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:45591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxz-0007Fx-KL for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:00 -0500 Received: by mail-qt1-f182.google.com with SMTP id h21so14684737qta.12 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:44:59 -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=ILU4Wz1bHMxXkNR2GaBUvWsHaoi0acuVI+aXhZqLlqs=; b=iY4SWqqxvhsmuqwu5TKDnvnpXp8/KHfGPkLILCcirnI7JuiOwLr/LZvW/34TkdsDH9 fI1AqrgZpMWNQuUXiUDIO9LTyeEJiplzwKbnqTuBDwBNW8p31bOfoTT+YtoPWz6nNjP0 yWAKrZ34O8lsUVEljLJ3R/eKfKQwkyNr/vwvcm7Yleq+dDWjP23Rat/BPissw4Fa7kHj oHkg5450UR9oLCEFeXjsPf+pMXNVzphZuITEqSIVS49xUhFkGpQfemswDkbb1SwTMRA4 gvDKmFCXEoL1QewAvhTjbiyxeurZyXRWAe+0FkyVBx51H2OcNeV622jBgINYpw3/rc2y SiEg== 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=ILU4Wz1bHMxXkNR2GaBUvWsHaoi0acuVI+aXhZqLlqs=; b=NJI9L3J2MW8MwpPlxlmE9WjRZTF/HvOMTDndqMBecIqWao9MHKmbP12KTfZduAOp4k Tt/IaPupSo6RVvUonliwv8yCOPHXIithHUb6eC3dtzFntav2Imm5qAvYK/WK10VCsuiC CckViEQWIZCY1dk/ue2vh00sN3FVb/WnPHK2ljBGVDYudScxlJqarsuPM0SKU5hs5pZ+ mgGCYjmo6/ggYpN7nlNIBuIVpaBORcAkxdXREVaydShZHBsTJMpQXqOW4N7IiQD528Af +/AE5l4POP541nJTHBKDLZCI+gOHE0q+8+JsgGma9e26Weguocm070beHZSoS99TKE2t 4UEQ== X-Gm-Message-State: AFqh2kq0YsihRdJyWedFZJ+uf6w4yRIZ7oHyUhncO+PKFfsQVhf5FtDw ok/q7ht2FBKmXQKLvPGv6d+dBAXy8Bn2BRkX X-Google-Smtp-Source: AMrXdXuvN7MfQ1iBGyTx++G6+UoU7ar8PThKZB06LBEY/jBBjWgACGjBFZzAryZa/sJNS2CaFszMPA== X-Received: by 2002:ac8:6f07:0:b0:3ab:c8c6:51c2 with SMTP id bs7-20020ac86f07000000b003abc8c651c2mr44812787qtb.62.1673469894074; Wed, 11 Jan 2023 12:44:54 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:53 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:25 -0500 Message-Id: <20230111204433.15305-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 4a27a36d78..e48b55018b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -864,14 +864,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-"