From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IKQ3LAtRW2ccegAA62LTzQ:P1 (envelope-from ) for ; Thu, 12 Dec 2024 21:09:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id IKQ3LAtRW2ccegAA62LTzQ (envelope-from ) for ; Thu, 12 Dec 2024 22:09:31 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=hmLvdojs; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=k5PwiWP+; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734037771; a=rsa-sha256; cv=none; b=l2Akru6VosuUq8KUmA7Cb7wPLMwxAjkVQupK5VJ3a14S+tDotfzpUueBtitSzDwTEMsHF3 5ZWOcS7QDe/GDbEv7B8ChGGy9vmE5KUNvnIdvXeeyKaMGgY0lXG/+SauSVj3n6WsDIbQye GieSNWKOD+c34J6KRhBYWnYBhh557NSnfT/0luY/p2WAXdHieTLmI/wenxtkwCSY9u0VsT lNCaBsTq9KbIhkZwHMqIpU62OxycRSL2NCIkgYBTkw54oQwAvAyONe4ifFAAzqjoA+lt4+ JFhC3+PhOoK4HjIVRR6PYdRFtqBxiGByMrFrcq5/m3kw3UxENc8egDpeVUP3JQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=hmLvdojs; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=k5PwiWP+; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734037771; h=from:from:sender:sender:reply-to: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=TBwp4RFg2Lq/1Gto5w8q8qSUP1OjhTWIpWA7F8Bugsw=; b=q+HSoWmiODqRvm8gQ287100X2VOeHtbfrco6YRhsEK7Vjy5kJ+M5/RpayV4mm+ildmfdRh 57IelgTrbZYoNY2aWlT5QRsQ6TdRidKbcSOwyvOsjfqlgoQFc9M4Quiq1ywjjBd47r3eKl RSwa9vA6XQ7KVu27HnE6YWqSIDQ4bDa5b1dpfCTzgn4oORqbIhbHCSGDz35jYL2j4bNpBs n4RYNzlGAJaPVxzPu10LgItJdWbRUyxy5oVUCAQ0ztvTGf2ek0GuBgA5ZWf41BdAE4Za3H gnh1LDDOvkNb5e3qrRL7BTouNfzqw2LOycfd2+WEu8bSIcZodOnmFaWBIkh3Xw== 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 9EE217FAAA for ; Thu, 12 Dec 2024 22:09:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLqQp-0005tN-V1; Thu, 12 Dec 2024 16:09:11 -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 1tLqQk-0005sz-V2 for guix-patches@gnu.org; Thu, 12 Dec 2024 16:09:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tLqQk-0007g0-I8 for guix-patches@gnu.org; Thu, 12 Dec 2024 16:09:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=TBwp4RFg2Lq/1Gto5w8q8qSUP1OjhTWIpWA7F8Bugsw=; b=hmLvdojs7QerkHogO/DGjaErh6ihsb6cHXcTDBHV3+GEMXtzQk06qbqvLnaQn0Jw08OVLMRIu+Ajw7+MynrAYNqQTNikDTJ/d2wb/R7dL4Yrwvy2GyNn/kVnTkrQnKnDPRHBRp5LsMmumcaA5MFtDdIrdGTG04nfF98P27Hvo2WK0OxxytdbJenrQHEHEFPNMoenUHF6khf9cK7L5iP+/D4eId5xZoA5sKEED1dnljaWjLXNn5JOpJJLsWQYbs6IXjbrlFtxGLA0/vWO0V1qYErIc9+KJ6gFodz9jrRlNpZ9RkW9kCz0Bx3qy13GIEk249irkKov+BI52GCzOsUKrA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLqQg-0000x6-QB; Thu, 12 Dec 2024 16:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74842] [PATCH 3/4] gnu: u-boot-rockpro64-rk3399: Remove obsolete substitute. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 12 Dec 2024 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74842@debbugs.gnu.org Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74842-submit@debbugs.gnu.org id=B74842.17340376933564 (code B ref 74842); Thu, 12 Dec 2024 21:09:02 +0000 Received: (at 74842) by debbugs.gnu.org; 12 Dec 2024 21:08:13 +0000 Received: from localhost ([127.0.0.1]:40606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLqPt-0000vP-E1 for submit@debbugs.gnu.org; Thu, 12 Dec 2024 16:08:13 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37851 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLqPp-0000uH-UG for 74842@debbugs.gnu.org; Thu, 12 Dec 2024 16:08:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734037672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TBwp4RFg2Lq/1Gto5w8q8qSUP1OjhTWIpWA7F8Bugsw=; b=k5PwiWP+ngA6VXOPMhfBULgzC5xVaKzZC64QEaTYI2qT0RDAh2aPLIajRv8TfJvU16gbUu Lv9URcosnmb4olWIWaWWufJu0mjqCDJXDWg/9onFTM9gP/VOoEjEgZ7cSoYyOPEENFMjiw rCn5wNnAeonDyXaj8rjgLLT9ZMh5Ps5y3C8QgFlZ2LXo6u/zPWKjAqXgiQ9yhg8p92NQDl mho9LcIf9xcq8NcCAbryHHGPfVZYaEsj+xEeKGNqdrkUnM87v5IMDBm63wzg2FskABDVRj wUgRRVzoFUELI2IZHVhFkSH4y5T57/UcI7ve4RfpEN1FJfR0PXtenVfOZD8kMQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 35d34c08 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74842@debbugs.gnu.org>; Thu, 12 Dec 2024 21:07:52 +0000 (UTC) Date: Thu, 12 Dec 2024 22:07:10 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@rimm.ee> References: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@rimm.ee> 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 9EE217FAAA X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.17 X-Spam-Score: -3.17 X-TUID: 1I65pvgbyKlC * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)[arguments]: Merge substitutes. Remove non-matching substitute. Change-Id: I27dbc51c0eb95de9e1474c966a4e97f7cff26009 --- gnu/packages/bootloaders.scm | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 788c7dc9ef..15cdaddd7e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1475,26 +1475,8 @@ (define-public u-boot-rockpro64-rk3399 (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_SCSI(func) \\")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) + (("\"scsi_need_init=") + "\"setenv scsi_need_init")))))))) (inputs (modify-inputs (package-inputs base) (append arm-trusted-firmware-rk3399)))))) -- 2.45.2