From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 YK5jBliaZGeATgEAe85BDQ:P1 (envelope-from ) for ; Thu, 19 Dec 2024 22:12:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id YK5jBliaZGeATgEAe85BDQ (envelope-from ) for ; Thu, 19 Dec 2024 23:12:40 +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=PYlNVk5P; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=hQ7l46FX; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734646359; 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=p0hDgotjIC0W4dCzBEeewC7ugzFv+Z063LQQz4t4oTg=; b=pihMqKjynt/ULFxa6KvlpW0dXtxW3gQUHSumQIXqxG7sTYAx8mlqo0soGf6tqNleg/pxcd Yskjit7vR27v3SQRHeAreOea8UJ7lBLkE5qrXMYj+zjOPr+t8ELMC6ukd5lJqfmuq3h2h7 JfKPjqQlDZvSs9ch0YQyeR/+NNFuf8yhC0pMqDjS+SVwSHr/93UAga4j/EfkiYsL35Io8g W2sEXE3LsbnZD7Ec0QuuToRoCCPBvoJOblFkbPu8avHD+kIUrj/3XYdi4OWmT4aSOK8ZN0 WCcxlUAS1gXMuPUMfydfhQlruwiN1+LebHcCOleEoLxQ4GKLAkbV56694YT14Q== 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=PYlNVk5P; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=hQ7l46FX; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734646359; a=rsa-sha256; cv=none; b=NwjF5hx/K2mAiyGql/dkfHsJqLRtswKroT6neLD2AiciX54jmo9hYX+CiS3v/USaC5gcjc wKEni8ipkNUqAYvchfSmMYXAI53fmIQSDQcZs2VsMqMkkAaiMbLX3o89cJ0Y2yyVrjiSzA tJMkcwnooeQK2m8Jlc5bm6A1Ms8Dvz+pXNvgF7uaAr2uRbiYOsOGA0RcGxH5fehAp5LcBv EixFqoUwchJg2KZQexAjkw/uW2mNHdmwAsWLbQCOe6SzSI1NaCTOZnspzH5kc1WvgpCce+ 8kbyit01zTim16d8q6MfCb8lrPD+f6xmue3QKLa2It+9soXdCdChi9yz+pt9BA== 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 D29FF7FB36 for ; Thu, 19 Dec 2024 23:12:39 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOOkm-00035L-4Z; Thu, 19 Dec 2024 17:12:20 -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 1tOOkX-000327-3Z for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:07 -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 1tOOkW-0007qW-RD for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:04 -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=p0hDgotjIC0W4dCzBEeewC7ugzFv+Z063LQQz4t4oTg=; b=PYlNVk5PP4nW4V33V0ADHiMa7RoocqU565tRtnnkGHja7byp9Cm/KeX5n16/QmzbNUehjeGPOU2nMkPNBXEW6s6Li4txYTe6DQf0+zPinHY7Sm8V82kReVj1WoViBJic+L0y/XTAijS9VY8jYEWJcWueYbsT+TqSK7xj/E+P99X8qsFRv+4n1b+yfPV2vvzVDRBjp5jMrMccjL/UfOHeLgs9WlMgp/W0CGB2AR1sSxc3cgz8LpLb4FocsOuuDt8mmMMIJU8pp2Njm9oWpMKtQTKsiIyXiMtQJXMOzhWsMPGuv5vkp6TDmoHYZ2bPrt2sMBOzeLdHqeIC7XKL9siRPg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOOkW-0007tr-Ki; Thu, 19 Dec 2024 17:12:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 5/6] gnu: make-arm-trusted-firmware: Update to 2.12. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 22:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74849@debbugs.gnu.org Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74849-submit@debbugs.gnu.org id=B74849.173464630830276 (code B ref 74849); Thu, 19 Dec 2024 22:12:04 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 22:11:48 +0000 Received: from localhost ([127.0.0.1]:40445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkG-0007sA-4w for submit@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:48 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58395 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkA-0007qj-6t for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734646285; 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=p0hDgotjIC0W4dCzBEeewC7ugzFv+Z063LQQz4t4oTg=; b=hQ7l46FXuTIx2JJAgUDGFv27ouFq3wPKk8lvBiEbF0pFGqDAbkRUZLl/VcjJJDPCf7XTEm RrYFLgZgpQ4mOShLv+ggQmAkqrHtBSc1uOnFWCKUutfzbP9OTBDfhoQcLK8Rk86fOn+PJt VstTwQyutrkL9z8CDiQVSrJymZ10qPjz+UQum+iqAAk2jxV+aEA3IXBqj10gZgvkkKrnwy g+xF7vTg0V0uEX7i3eRdsr16uRawQ5yN9c6/xZYH70bjYnki4WOBKC0n9l9HDCVRlvUgWQ R9u8FJz9SZa8/jnQc9Se0QhNyRm+EEIKj3tSE+7ArteMIKyywPMwc4ck9aOUpg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 3537c64c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Thu, 19 Dec 2024 22:11:25 +0000 (UTC) Date: Thu, 19 Dec 2024 23:10:34 +0100 Message-ID: <252aca03db260a19297a87d50cc539c1cace1ebb.1734645720.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: 0.76 X-Spam-Score: 0.76 X-Migadu-Queue-Id: D29FF7FB36 X-TUID: NZH2EFvwH4tX * gnu/packages/firmware.scm (make-arm-trusted-firmware): Update to 2.12. [arguments]: Select correct objcopy and objdump variants. [native-inputs]: Add python to avoid warnings. Change-Id: Iccff10b16090913fe5c99491d8335f8ede09038c --- gnu/packages/firmware.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 3e76681c66..81ebd5efd8 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1108,7 +1108,7 @@ (define* (make-arm-trusted-firmware platform (string=? (%current-system) (gnu-triplet->nix-system triplet)))) (package (name (guix-name "arm-trusted-firmware-" platform)) - (version "2.9") + (version "2.12") (source (origin (method git-fetch) @@ -1118,7 +1118,7 @@ (define* (make-arm-trusted-firmware platform (commit (string-append "v" version)))) (file-name (git-file-name "arm-trusted-firmware" version)) (sha256 - (base32 "16fjbn1zck0d8b554h8lk1svqqn0zlawvrlkjxry9l71s9h4vd0p")) + (base32 "18rzhygvq0afcylirq9yis3kaa1nli14k2jrm64ih85gz4nhl99w")) (modules '((guix build utils))) ;; Remove binary blobs: they don't reference a source or license. (snippet #~(for-each delete-file (find-files "." "\\.bin$"))))) @@ -1128,7 +1128,15 @@ (define* (make-arm-trusted-firmware platform #:target (and (not (native-build?)) triplet) #:phases #~(modify-phases %standard-phases - (delete 'configure) ;no configure script + (replace 'configure ;no configure script + ;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31 + (lambda _ + (unless #$(native-build?) + (substitute* "plat/rockchip/rk3399/drivers/m0/Makefile" + (("-oc") "-oc-default")) + (substitute* "make_helpers/build_macros.mk" + (("-oc") "-oc-default") + (("-od") "-od-default"))))) (replace 'install (lambda _ (for-each (lambda (file) @@ -1138,9 +1146,10 @@ (define* (make-arm-trusted-firmware platform #~(list (string-append "PLAT=" #$platform) #$@(if (not (native-build?)) (list (string-append "CROSS_COMPILE=" triplet "-")) - '()) + '("CC=gcc")) "DEBUG=1") #:tests? #f)) ;no test suite + (native-inputs (list python)) (home-page "https://www.trustedfirmware.org/") (synopsis "Secure world software for ARMv7-A and ARMv8-A") (description -- 2.45.2