From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 6Iv0GUcgv2NgBwAAbAwnHQ (envelope-from ) for ; Wed, 11 Jan 2023 21:47:03 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yCX+GEcgv2OrBQAAG6o9tA (envelope-from ) for ; Wed, 11 Jan 2023 21:47:03 +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 0607F23146 for ; Wed, 11 Jan 2023 21:47:03 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzv-0002zF-Av; Wed, 11 Jan 2023 15:46:59 -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 1pFhz1-00027m-8w for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -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 1pFhz1-00080d-1L for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz0-0007Lq-TN for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 10/12] gnu: u-boot-rockpro64-rk3399: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:46:02 +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.167346991428156 (code B ref 60224); Wed, 11 Jan 2023 20:46:02 +0000 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:14 +0000 Received: from localhost ([127.0.0.1]:44027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyE-0007Jy-3c for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:14 -0500 Received: from mail-vs1-f52.google.com ([209.85.217.52]:37497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy7-0007HB-B0 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:07 -0500 Received: by mail-vs1-f52.google.com with SMTP id k4so17015931vsc.4 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:07 -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=GTFkrf7A+Q8r0lxMHw4sE51ECtfd9Bhk87/xfTvdoY8=; b=NuJo1uJ9yTuCQk85F6lIlTEZzvkQgwagBK4VtGXqmskTVxNZCOlhgYO9Qd/RQBUiRW +tOuTZbepbjhIajZ8uw/hmnNuo4ypdE4RnrHQFpTgdfUpGkhy8prUkkzRfIHrhmB8znD PLhG9OvXNG3SsJd6W8jJvGY70UlHoZx4n4BaXurQafzLtuCArQFSdnHW/zOBSQFIwpZ7 vGrjr+3r6h8pkS35sgTGK9heAqtrRCLndJ2l2XOWX1moywOfioWrilONB5+/I8fb1kHs 7HC6upgZl1GTaAglOM6JbXS32zucuKgDaw22BPVP/9AscxuzKUPWK5Uo0dRl21DKTSKJ a9hw== 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=GTFkrf7A+Q8r0lxMHw4sE51ECtfd9Bhk87/xfTvdoY8=; b=A9T1wbceOeEGWvrkvdswGWQD0Zt/kS6YAIFRGS+iTjft4gOQUbDjlyuea0j35zB/+U Acs5MVniOhpMiWZ8Si3/VmXaIVkkAPVmOftdi19ba3JCmE+Ae2kooyQtJnNvVEQ7bRR2 NtRdnlojEQyctlhYNdgJjBVnL9wgz17w6z1tyDiHGnW3qS908mAt1tsoF03d4lF2IPZZ atqQMYufvtR2Ix9+9HTkK7d+mQgcyTn1akaFfaDSOStF0Y72kalC0Hlc4KeomNrcy2vu I2lw6g7xcDgiPSkdoXuy7RruhGFA71FnPmXTpJzdfhnNnaLkLOKSshN+gh6niukdBXG7 /zOQ== X-Gm-Message-State: AFqh2kpowz2QHWmM7eG/vzyOcIApJuSgUWciIxIy4xhPpNVheEgZnzik 84br4i5NUQegaG2D7ryMdx35XDUbiXxAn+vV X-Google-Smtp-Source: AMrXdXud6aD+lt71TqE++ICJ1VW4ciMTgbwUM5hzGq9VpExvGakEIt4TGKLEmZX61vs/IoBF3mZbYg== X-Received: by 2002:a05:6102:4b1:b0:3ca:3446:2cb2 with SMTP id r17-20020a05610204b100b003ca34462cb2mr32386824vsa.10.1673469901397; Wed, 11 Jan 2023 12:45:01 -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.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:45:01 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:31 -0500 Message-Id: <20230111204433.15305-10-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 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=1673470023; a=rsa-sha256; cv=none; b=hOg1Tap4PV5n2w4UnegmdlBI6QVOCFgpwfbLqn5BvEOXk6iQAH+KZbELF7ibjpl8Sc/jVk 7auRY4G6byEvGx3lFIyESaOxwFvvrNhec/3mgJ7RJdg2fjbo27O0I+l2UCaV7mvCEc5zeg MtHMtyf8cEakgKmvlDy28jk0IL+somr6Z+nyFw8XXMoA5AaqRycsgf7U7L6Vq+GtXYP2N7 bx6sQDEY/pnqhad7XtIVC/ILWu6f+3G1qezn0UMx+KaOhPMPBs/Kx3jlhXB44++zGlm5xl nqN4GOeHXWEyamNsmKuV6IHl567RUa6+ThJwcuryQloUsmqS1dNRMvVlULjouw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=NuJo1uJ9; 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=1673470023; 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=GTFkrf7A+Q8r0lxMHw4sE51ECtfd9Bhk87/xfTvdoY8=; b=sgMmSu9KTm+/dHp1uEDrkG+nfyUjVhsF67MQDt+cvds6U9uk9AvQMoIO2NLgIMkJYAbk2F Ku3vTZnUn2yWnNUwwas4m/CwZqstqjaz5RVu2CbeRUpHF8aboEKplPTv+4izlvaqirwibY lQpR5tMUGKBES1Uu5YmiI6kLOYwBuvFly31UprpL7bgjqJgLnGYG0dp1bC6KyJbRUIJChi 4c1dVZp0POIrtrPjBUo/Q34NAbw3+5NBQ8VwJFrJGvsWCZIBG93ma/ggmCqG1Zi1N9rCD/ FRkvBYsa/iwDR6sDngLFNexYZmj7Z2p83keiAQgu8htSBArnilVrj83sqOpdpg== X-Migadu-Spam-Score: 0.00 X-Spam-Score: 0.00 X-Migadu-Queue-Id: 0607F23146 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=NuJo1uJ9; 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: kJgY6y8AfYhu * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399) [phases]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- Changes in v4: - Make the arm-trusted-firmware-rk3399 a regular input Changes in v3: - New commit. 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 b2e15b88f1..0878dd3168 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1185,37 +1185,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"))) -- 2.38.1