From patchwork Fri Mar 21 08:53:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40555 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 65CC727BBEA; Fri, 21 Mar 2025 08:55:45 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 EC77627BBE2 for ; Fri, 21 Mar 2025 08:55:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvY9j-000726-Pn; Fri, 21 Mar 2025 04:55:07 -0400 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 1tvY9h-0006zb-GZ for guix-patches@gnu.org; Fri, 21 Mar 2025 04:55:05 -0400 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 1tvY9h-0001de-4G for guix-patches@gnu.org; Fri, 21 Mar 2025 04:55:05 -0400 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=zgAsJsHPFnO7tCgaqLkxal6rB8RpcRZCj05pq1ODdEw=; b=L4KaleFSlgLAiqCY/CwOyZdE4dY7goIjEcdhJRdP6M6ypOW/FSbHClOvaBi/5HAxb+JtfWfE508wKcTggDHyrYqmNYlxCoiXgJIdyl5OzOy778E/THdsH07SkkeAX/317qqxfZXtbhDnTPJCvZ2UfHo/WuiXcQqAFyaqlpZyV1YpqMTuunBU47nLl76hw9lLkGGL+he9+Yl26l2W8/dqeiE2GH7sZ60zSsDIW9GsyKQnnqo4SDpC3IpTA1zSjWW3bmPEgWdhPi5ggHNlqJrJDY4glhSgh3iuuy6ZZc4NLAqpEoZHmBTziO93KZltlLsG1P0w5qQ0DvXswfUgtOalsQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvY9g-0001Bu-Vk; Fri, 21 Mar 2025 04:55:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77148] [PATCH 5/9] gnu: ovmf-aarch64: Update installed firmware. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 21 Mar 2025 08:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77148@debbugs.gnu.org Cc: Efraim Flashner , Maxim Cournoyer , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 77148-submit@debbugs.gnu.org id=B77148.17425472754306 (code B ref 77148); Fri, 21 Mar 2025 08:55:04 +0000 Received: (at 77148) by debbugs.gnu.org; 21 Mar 2025 08:54:35 +0000 Received: from localhost ([127.0.0.1]:35051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvY9C-00017M-Si for submit@debbugs.gnu.org; Fri, 21 Mar 2025 04:54:35 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:51482) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tvY8N-0000zl-29 for 77148@debbugs.gnu.org; Fri, 21 Mar 2025 04:53:45 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5dc89df7eccso2981279a12.3 for <77148@debbugs.gnu.org>; Fri, 21 Mar 2025 01:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742547217; x=1743152017; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=zgAsJsHPFnO7tCgaqLkxal6rB8RpcRZCj05pq1ODdEw=; b=Vzkzg7DjnAk8OfhDWKKkvCeh8dFwsiD/uu7bL6CGwdsTq6Q089Y6YTd566w8j4Z/Nf UwRjPVQrgHgQ7p/odpT7ecmjghK1Nnr5u6wF6o1/f8IhxA2CURvU1UbqQTFvkjXetq0V Rj669uk8xeHkohw6FKz8PeofpK/TKEeMW1BZj26zjM7ZvTGi+/pqOgLoePiPbwQ3Epm8 U62i1S1AKo1/mkW5p/7wEqGLgzp5ykLQUBifj/uXuyKOGEXUClefVjyvo9RsSjUtMVqZ LoS19ppt+8P3oaCQzJ7ljsHg/PKMELlE7Mr72tPG/zAbNXNAwBHQNdDKDDZzLC0Hz7C1 stiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742547217; x=1743152017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zgAsJsHPFnO7tCgaqLkxal6rB8RpcRZCj05pq1ODdEw=; b=f8+zeGwubYZ+KA55HfZJRoKqlc1AW/Jwba6brrM8C8hFj9Abr1rNeGBV4B29uNiOKV lAZh66cC5ofC80c0OD3RwFdzvKqcVW4JRXFnwp2vfMZNVjGLNau304E9723vCS4r7gsq l8oXu307mcYxyU4PdYCdB5qUABTBFosO7oTOMbX8vs3kf0oO39wGC4EG7z+hnj7bI0dP QPqZX7w2P7VwXWzG2QQUp3gry21J9QcSgkyaskBl/v8+UyiwQJE7/6kPmcuDZSRSvigM FqKYAq5caT+xxavZHC0xKCLQrZQqEHAgu4zgGmMoTbgDsia213Sj/2RwmPtuKblo3zPv 5PbA== X-Gm-Message-State: AOJu0Yzqfv2vi1Hjr0jRZXOd4sG1fouEOZv6Mg5++hjpcvaPnD49yVpp a7aBYhad1d+mzR5t4DctqSdZsze1Zmst1ggTw5K+K/xgmzejXEjYbPTvHjy2 X-Gm-Gg: ASbGncuXu5+ssu69sE5EuCsaggEtt5LTL8B33F/wqyofTStajbuQFZin7lexbLT8Ea/ Vyy7cy0JWDcr832Jk9T0fCP5ZmFjUbhx3L8kw2XgtzsWyQzIW1ahhV8/q7nXMCOUWVmo6je+0Y9 xNALjaU0ZbeabdfRdoYe2aTnsGwF5sam6JVZP5GThQbCtOGzUYMIvIPaDjGoMTt14pTzimiR7pG LPUvVUniLbpOcs9CLKyEkg/g/KTAW84fnrX9W7HPCFNc4jCjNwB87BPbAl55l2hjCRLaB5DXR/T q9NaA/Ib0Y8BrJ5obecjD4rCoHU+MiI2t+xtYQFn+fHcrQd5S4nDRSmOr5s= X-Google-Smtp-Source: AGHT+IFZW0ek0l5m2Q6CXrYcH4eNYlXUaT+tsxE9/7oGeZ8uTOhqEZGgV1GLeHaex7uGpj+35k4PiQ== X-Received: by 2002:a05:6402:51cd:b0:5e6:14ac:30f with SMTP id 4fb4d7f45d1cf-5ebcd40a83fmr1953597a12.2.1742547216739; Fri, 21 Mar 2025 01:53:36 -0700 (PDT) Received: from localhost ([31.210.181.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ebcd0dfdcesm940148a12.65.2025.03.21.01.53.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 01:53:36 -0700 (PDT) From: Efraim Flashner Date: Fri, 21 Mar 2025 10:53:06 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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/firmware.scm (ovmf-aarch64)[arguments]: Adjust the 'install phase to install another binary and to truncate the file to the expected length. Change-Id: I53958d5f2ca392e1033630e1dfd29d86c25a74fc --- gnu/packages/firmware.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e7d2e390acc..049fd9246fb 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1190,9 +1190,14 @@ (define-public ovmf-aarch64 (lambda _ (let ((fmw (string-append #$output "/share/firmware"))) (mkdir-p fmw) - (copy-file (string-append "Build/ArmVirtQemu-AARCH64/" - "RELEASE_GCC/FV/QEMU_EFI.fd") - (string-append fmw "/ovmf_aarch64.bin")))))))))))) + (with-directory-excursion "Build/ArmVirtQemu-AARCH64/RELEASE_GCC/FV" + ;; Make the files the desired length and then install them + (truncate-file "QEMU_EFI.fd" (* 64 1024 1024)) + (truncate-file "QEMU_VARS.fd" (* 64 1024 1024)) + (copy-file "QEMU_VARS.fd" + (string-append fmw "/ovmf_vars_aarch64.bin")) + (copy-file "QEMU_EFI.fd" + (string-append fmw "/ovmf_aarch64.bin"))))))))))))) (define-public ovmf-arm (let ((base (make-ovmf-firmware "armhf")))