From patchwork Mon Jan 16 03:25:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46172 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 7F3F327BBED; Mon, 16 Jan 2023 03:27:27 +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 581AC27BBE9 for ; Mon, 16 Jan 2023 03:27:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9M-0000Hp-CU; Sun, 15 Jan 2023 22:27:08 -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 1pHG9K-0000Gg-PG for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -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 1pHG9K-0005pq-HL for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9K-0007tr-DU for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 11/13] gnu: u-boot-rockpro64-rk3399: Use gexps and fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:06 +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.167383958330214 (code B ref 60224); Mon, 16 Jan 2023 03:27:06 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:23 +0000 Received: from localhost ([127.0.0.1]:60074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8c-0007r9-Lu for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:40926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007pV-Sm for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:12 -0500 Received: by mail-qt1-f181.google.com with SMTP id jr10so16467155qtb.7 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:11 -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=0vMnnyqvc1WmPs7eKBIh9WVuvVcTB+tCa/NVI9WymVU=; b=H83keKuAa2FPPWfrbAc1skM2WrNQw4IhLvJ8FWIfXTC+A8VGS5fdjDI4tpV9jjeOiU Ol0JPThdel8KgZ8OCf5NlrqXUxOzQVJ24wt6EsxQQTXFxxyi3ycz4VFNj4E8HxA7aso3 P+uHt5LJrDCnY1j+jxIQAjsufSO6e1BHxRpYFmzld6s9MSOfAx9QLZUzLIqxHUGDQ8xw eMbAFteUEueDu7ZTq2fvdEpnacLGV2pLTLDYNchsxsbsI3WQmf+J4iLlso0udH/VC2rj bTK3q7vivQOz7NQdsF6Z1MeHw1p/erNpxDfya0hc9ime6LPHrToMH0ZihCS4uB9hbBSw AjUg== 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=0vMnnyqvc1WmPs7eKBIh9WVuvVcTB+tCa/NVI9WymVU=; b=BdPKKJIJLM0XcDbvv59H7Dq/D0Tx1iz6W48zvZvijMqvYrsOAcGwVZzuG0NCzQGN0+ l9PYkhntEdI1oLZJ2Rf/NRtD9U75hmyWVVK6OPg49W+MRASbGphXXMAfvdUwPImdWIwN 92omqTkPfO9RdT5q+qWjLaEH/z54rwBJg5ouDLD1NZ/Q8K6JRdDuQ1/9bqnXZLayms/6 ePQU5rkjFWIO7oJmAHfkbig87Yv0xJrMGQgA4JqZTnIC8UMvpRjNzTIcQZlgP04uqFWj F5E7GS8inpHM9IBDw1CdWEkCn3QBHsQN3jg5BU7qzXRRxi5HCdewMqSiVwmj73mW/9mG lVJQ== X-Gm-Message-State: AFqh2kpdrLDal8X5DR4Bv6l3AgZ5KsOmchhFJU3H1GV+ptug++5PKDvF u76fh5WlepZUPEOJBXtTqwsZDNkpSib61NPz X-Google-Smtp-Source: AMrXdXsePiM4Qim3RNDO8xjTSytg37d9YpC6qMlNUn6cSdU2v1ni3guU1vgQ3bUrsZOtwVY6R/L0NQ== X-Received: by 2002:ac8:73da:0:b0:3b6:2f46:937c with SMTP id v26-20020ac873da000000b003b62f46937cmr4858298qtp.37.1673839566192; Sun, 15 Jan 2023 19:26:06 -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.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:05 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:42 -0500 Message-Id: <20230116032544.1378-11-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 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-rockpro64-rk3399) [phases]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Make the arm-trusted-firmware-rk3399 a regular input gnu/packages/bootloaders.scm | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d9f9672f77..9da97232ea 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1176,37 +1176,36 @@ (define-public u-boot-rockpro64-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - (add-after 'unpack 'patch-header - (lambda _ - (substitute* "include/config_distro_bootcmd.h" - (("\"scsi_need_init=false") - "\"setenv scsi_need_init false") - (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") - "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) - (substitute* "include/configs/rockchip-common.h" - (("#define BOOT_TARGET_DEVICES\\(func\\)") - " + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) + (add-after 'unpack 'patch-header + (lambda _ + (substitute* "include/config_distro_bootcmd.h" + (("\"scsi_need_init=false") + "\"setenv scsi_need_init false") + (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") + "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) + (substitute* "include/configs/rockchip-common.h" + (("#define BOOT_TARGET_DEVICES\\(func\\)") + " #if CONFIG_IS_ENABLED(CMD_SCSI) #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #else #define BOOT_TARGET_SCSI(func) #endif #define BOOT_TARGET_DEVICES(func)") - (("BOOT_TARGET_NVME\\(func\\) \\\\") - "\ + (("BOOT_TARGET_NVME\\(func\\) \\\\") + "\ BOOT_TARGET_NVME(func) \\ BOOT_TARGET_SCSI(func) \\")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-pinebook-pro-rk3399 (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu")))