From patchwork Tue Dec 20 18:34:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45471 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 AE0C727BBE9; Tue, 20 Dec 2022 18:44:29 +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 5678127BBEB for ; Tue, 20 Dec 2022 18:44:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSL-0008Bw-EV; Tue, 20 Dec 2022 13:35:14 -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 1p7hSG-00089K-Sa for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSE-0000Gm-0S for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSD-0004Jj-On for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 8/9] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156130316547 (code B ref 60224); Tue, 20 Dec 2022 18:35:05 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:35:03 +0000 Received: from localhost ([127.0.0.1]:46480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hSA-0004Im-IE for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:35:02 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:42938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRx-0004HD-3Z for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:49 -0500 Received: by mail-qt1-f170.google.com with SMTP id i20so11737589qtw.9 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:49 -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=rLAbkqSUh3FJ0hRFx6EspuZRuc3JcG7Lb4vxiJCGejI=; b=dfE66axutUbOZsikIwbxPqp9sZmPs7ydAYXGLCNb1MH6xKcwrIUAIw85AEPiINSGyo cl/rgBE/x3BYhVlSEe1VAW405BL1EEhbwo8lciUCQWrdH9btJzhUxEIh2EJw7D1E+k7E mezoEUdOlOzlK76llFAlaQi14pmJ8EmfHm43dcLRc7DGQrE/q8wKsIwerUjgjnwPbjmS d+H62Wbxq8BA5bXulF2hK3VL4JLK+cT2j0nI/PlCm/XliLLMm9d4duzy1EKYS0xZvM+e ic3rPJvRNdiUcW70bjnc0LAlHstmIWdOG+L2AOqNRx+b0QTMp+sfplDg8zqUiJbDlB6/ M21Q== 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=rLAbkqSUh3FJ0hRFx6EspuZRuc3JcG7Lb4vxiJCGejI=; b=CwQbbkLhcNYjq14kf8h6g1DKGbuOn/1nLBFzCT+eJ4c9vSlZaqTfiHo2LccEVgp1XX LbeIsoaUd+aPOPI6gjWDz1hlecM4IZfKsh12CL3P2L3u3JetfRELKENT4ytO6Z+ySRFA htkmUrs7st3fNQ/cVff7r1hDLHpR91oNEn4qCPrbbr8LN+hOySjJJC6ByIX6dFG0yNv0 2kK8+F3yZiqeZr/GREgOnvBWwON2Q2mWZEpil260cEStcQCLPwNIWvDWUzAgCDMf1dQJ yrftw9WRb7WtmNbF7OHOw+1Ah6WrhC0gKLJ7hC4Mo8/bHo2O2v2Dvm0rEQ5zGkbqFJIp AGTg== X-Gm-Message-State: AFqh2kryJ3xSXnWYl2dL8Af8EARdwVvvItXGBzlNvuzw2YpAoUK+lcux sAAIRWqJJumzvHrsm+f0oKz1DuBeQAEKwK8l X-Google-Smtp-Source: AMrXdXvJWi73TG7OcNGxISuZYVgNQe291uGdMxMvDeISWkMV5AhuGrfV4eP18IZnwrw/Gr1NpkL3Vg== X-Received: by 2002:a05:622a:1f17:b0:3a9:8370:63d4 with SMTP id ca23-20020a05622a1f1700b003a9837063d4mr5238926qtb.42.1671561283494; Tue, 20 Dec 2022 10:34:43 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:43 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:26 -0500 Message-Id: <20221220183427.31752-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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 (u-boot-sifive-unmatched) [arguments]: Use gexps. Use search-input-file. [inputs]: Remove labels. Use modify-inputs. --- gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ce7be6f7b1..fa11fa4bc7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1044,15 +1044,14 @@ (define-public u-boot-sifive-unmatched (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((opensbi (string-append (assoc-ref inputs "firmware") - "/fw_dynamic.bin"))) - (setenv "OPENSBI" opensbi)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "OPENSBI" (search-input-file inputs + "fw_dynamic.bin")))))))) (inputs - `(("firmware" ,opensbi-generic) - ,@(package-inputs base)))))) + (modify-inputs (package-inputs base) + (append opensbi-generic)))))) (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu")))