From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iPmiK88psmMIWwEAbAwnHQ (envelope-from ) for ; Mon, 02 Jan 2023 01:48:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KElFK88psmPA7wAAauVa8A (envelope-from ) for ; Mon, 02 Jan 2023 01:48:15 +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 4C67D3AA4F for ; Mon, 2 Jan 2023 01:48:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8zm-0002Uk-QD; Sun, 01 Jan 2023 19:48:06 -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 1pC8zj-0002Qd-4j for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48: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 1pC8zi-0004gL-S2 for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8zi-0007MQ-O7 for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 11/11] gnu: u-boot-rockpro64-rk3399: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:48: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042728063 (code B ref 60224); Mon, 02 Jan 2023 00:48:02 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:07 +0000 Received: from localhost ([127.0.0.1]:42095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yp-0007IZ-C4 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:07 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:46974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yn-0007Fz-N5 for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 Received: by mail-qt1-f175.google.com with SMTP id x11so21459402qtv.13 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47:05 -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=yzdYZR6pQ6RJE5r4awWAw/YDqx1d+cyJY2KTG3qyMyo=; b=Awwv9cSC/4AtpKNPEcIXN2wORablJiOzDIIOlS5z3bryYSGkx5ZKMcjpJX1kYbvhXW vFsi+3vsV3V+dnlyzXI9RnkflPEblGmG6JEkvvxUiryhVdGS3XpNGslkOiGVsC7Skii+ nDn2TPae2ljVZfcdtvCrgPU8kMMlVcyGqO3T87+g15behC9qK1ojSu7ZWJZFfGbKSDjD 0vyxr8V4WETQVOYxwXbq5HOuFDFUnDLY2WgCbfvm6iPAnXED3MAPUbxydDUKRDOPdjb6 zaxOvHB3bxqfQcIxqdrEe8/V8mnVr8sX2+1xepAP8lp0dFj4lchdvcx4a7aU3V9og43m kblw== 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=yzdYZR6pQ6RJE5r4awWAw/YDqx1d+cyJY2KTG3qyMyo=; b=DIEnmo3yVmheCYv9+tuNkUsqrTjttZ+f8JgbbOZBauCHXWP93Dmwlovo14eUuDkVKV 3G1t5Vj6R9rhdVm8j35P8ik+ZNmKJV7XMEi5A//09SMbr38GTUKG7oAxZA9lfFXwYs+E vrG5zXf7AK45Y9VFmDybb5W/WKwgzC8AjwGqyk+tfVO8toiU3pXwxN4eAUBO4FOwpUUp FZqgU/NayuZqqHIVJcbmIxnMpRttLUY4y+IiDrkaQLGRDrLCCxROV44KhyS1IilHtQGu U84s7D03TJswagHWcgvgwqIdPV6v/NUrAIvsQ2SP3A1MNOkbPzGJNI41nxkqX9QDiRgr egCg== X-Gm-Message-State: AFqh2kp6TwQ949VI1uqBPnzd6VjJ2pyiFhFNayuZ54pOaOIu0+c4P1Mh RiNBVwtlm1UUe64BSRas9ZONTxZWkeH8Sg== X-Google-Smtp-Source: AMrXdXv1GDK7l+tqrUbEjXmjbrkkxHOADmbQQ7VrGMNlQxn5QOhrrqolFqq9YVyWgk6d4YnGsc+bSQ== X-Received: by 2002:ac8:6050:0:b0:3a8:84f:1d3a with SMTP id k16-20020ac86050000000b003a8084f1d3amr50359079qtm.9.1672620420233; Sun, 01 Jan 2023 16:47:00 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:59 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:36 -0500 Message-Id: <20230102004637.3920-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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=1672620495; a=rsa-sha256; cv=none; b=Iw0zIz+rf4ClWkzj9epAjKDMPuwM+ckYZFWkrOymfQl86/qAJZt53Ak9Br3IYoLz8Ua/Fa QwsRkD3gHQd5/GSUtLk7szwQlxogwzzAaIOtRP02+Bn/qtykBcAaO+jgdlU3vTf5Ujvqns yGQC5W5RdCU8D8xFOILXHFTpOY1UnkwFJRZcude/+nXAWXilBsDfExauKBk3NiY5gSE6Lb ExJxJWjixduiv6EGJDQqnBssw+JToGZNV+y6vaZ8w+7QUsFdA4RpSVcMZUu/6m3QwmiGzh l2mnMMoVqdzatFTOVP8BFraZccw2VMfffAV08pO8vpjXEvyaBBa6CFT9DGtP8Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Awwv9cSC; 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=1672620495; 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=yzdYZR6pQ6RJE5r4awWAw/YDqx1d+cyJY2KTG3qyMyo=; b=lQ0yH/z4zSf0FfSspAUSvcmLT0g36lmk9UXA9WT8r8O1cT2n0oCXlFonxA0+0g1GsTQI2b JqxJHU+uIGotjI/tF/6Xdtv/+8mUou3BBZhhQuB/c2BReYKauEcgWreu/gjcuTqT07/D5E rbz3nIjA/rsxWs0n47G2S1f2ogAUeYkBkP84jEO2l+UG27iGYF31ygu9qnSeAPO5Z3xi+b lXT4+5SKfzIgvHRrxbSTLe2eymmc0Y96MdBWVfYpT0uM0HN/HRmR/qbyanlwBKtEdP3sVB BDIJ1oX5y41R+1IyrG9fDM1Hs5Ia0rTNHbQdGK1Aro5bwOgaEg3ilRV1LtZvZg== X-Spam-Score: -3.05 X-Migadu-Queue-Id: 4C67D3AA4F Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Awwv9cSC; 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-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -3.05 X-TUID: VQdz5vG8pVUi * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399) [phases]: Use gexps. {set-environment}: Search native-inputs as well as inputs. [native-inputs]: Use modify-inputs. --- Changes in v3: - New commit. gnu/packages/bootloaders.scm | 45 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 18750c2ad4..6b985c4572 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1167,37 +1167,38 @@ (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 (or native-inputs 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))))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + (modify-inputs (package-native-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