From patchwork Fri Mar 21 08:53:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40551 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 53D1327BBEA; Fri, 21 Mar 2025 08:55:18 +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 D73EB27BBE2 for ; Fri, 21 Mar 2025 08:55:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvY9h-00070V-VX; Fri, 21 Mar 2025 04:55:05 -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 1tvY9f-0006y7-Ih for guix-patches@gnu.org; Fri, 21 Mar 2025 04:55:03 -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 1tvY9e-0001Tm-VY for guix-patches@gnu.org; Fri, 21 Mar 2025 04:55:03 -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=BOgAEKiNRW+VTR3/PvvcUstToh5xLwsfIeQOW4EpJn4=; b=qPpIqcYNk/R/aOy3arJQWb/gz5q/403ASw4vXbfO0mtjsCTmbjmY6Nz7VWUruSkuasYa5UNo8qmbqe+fHgrSI2uT6byXJGgLHMIGyNSUZshXX6HSDKByrzqp/wEMMnBXDBiBGDBihKrmP8cEL6LPLnDiNBgfRNfjTkz3NV6rlhB8huXUPUGbbU03NmroO4rdGGgeQA/lViEjf557tMZVKHdKy1W1Oee2/vJD/6fUPRsMZLl+QwkffXw29m/Qs6Jinb+QBXQlEOTNS9FqzXyYeaka/Y8/kD2I2lW+HoRoLx+WRuhBgeTSnPsoG1geXM/qbDmVFVQP2yaxUWCUkr2K2A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvY9e-0001Al-OU; Fri, 21 Mar 2025 04:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77148] [PATCH 6/9] gnu: ovmf-arm: 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:02 +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.17425472584200 (code B ref 77148); Fri, 21 Mar 2025 08:55:02 +0000 Received: (at 77148) by debbugs.gnu.org; 21 Mar 2025 08:54:18 +0000 Received: from localhost ([127.0.0.1]:35042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvY8v-00015f-Aw for submit@debbugs.gnu.org; Fri, 21 Mar 2025 04:54:17 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:52732) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tvY8P-00010E-AV for 77148@debbugs.gnu.org; Fri, 21 Mar 2025 04:53:47 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-ac298c8fa50so310188566b.1 for <77148@debbugs.gnu.org>; Fri, 21 Mar 2025 01:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742547219; x=1743152019; 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=BOgAEKiNRW+VTR3/PvvcUstToh5xLwsfIeQOW4EpJn4=; b=Ulgtnhgmt4AKuDntHMlCHEee5d0KiPni7S38wpVyUsXuYaVmyq+YzBZk52m+MSZA9u xhwiXNhKF4q7mYZ4i05Qan4TglM6Ms2sAZZBG2jcmV1qHnMzHSQhofGPeURa6/lUozbN 2DaQnfL9PDogu8a86m/tVjYG4SwsfoVJKbJrz9246XQo5mBV/lbjt3XetiV82+DdCUd/ LLLudwDi8h7zq/vnBoUrKZB+l99uslRpQaqiXBUZEeVSWkSyOPuNn5oHq8zxgPsltWnC f53a6mkk4O1DSoQJjMhQ++Drx/F9VHYLT3S7Hfs1TxISAl0pTWZjBPcAHyCawNkYXU59 qJYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742547219; x=1743152019; 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=BOgAEKiNRW+VTR3/PvvcUstToh5xLwsfIeQOW4EpJn4=; b=KmmVJxuE6fnltLUAMRDDC/xIPlXrQYsYxYPE31k+LAyYHtZOXh1gi0jaNh+6lm76yQ n/K960WIjcEQ/QM/c+4pV5pXE4PT5vxP3MWWUBcXo7NVzc98X/Flz2DdPlVxAqGDYWNQ Uy7l+S7eTU0wG3ccwv4XvLZW+R2fMWyBBligvJxpwjlFmg+YFfR/o6h/ppyHnekLbgOp S7TASX/dZ2jNlbYkHerCGCI0s2vasu4CAwvN9bU6aUTVS6vOoZnUXkQQQy9QMjyTN9Ty kk50MD+Iaj4okeVLlVOag+WRRs6j70ljbaC9rbh6Sz//+yK5dc+l4Y4xHQ9X6mFQLM+N fgPg== X-Gm-Message-State: AOJu0YzhumG1bMpXv+3h3mBUN6I7PUs2SGcG3FS+b11uK+Ip/+s6gwd+ OUIQwua5DGuDUPQV5QEjQxhk3jIpnZoa6QLf/6qhZSe3nKUFus8P5erKyera X-Gm-Gg: ASbGncu8FCMT11OeF4q/smQiTa2HjQCx2oju2l3c7r1NV0vZFd8jMzoBSuXV4/n/gTu v9o8jwP0SpqTVKjVtQfLlqMpqmUWWrRgW+vKwRog44MXPkeERV0tYOw6aY0d7bcV9tG1UY4ROME H+9yZ7JN9vUUDNI8Xxx8QgwjUNnx4vGOCoZHb0wO51Rc4MzHI6l+Rm4Ts0eYYNeV2mC4k767G6g TAl4XgM04U7Btvk0h3Juh401x+ApoCz3rxYXANe4omj2MPOqaw8iuPSXS98FEEcB+pMS3ZB6lJf ++MakmZaCZUyokE+8B4e9UTeRqqqfUU6mCZiJrQmQpNvypLH X-Google-Smtp-Source: AGHT+IHG4yUnXDy6mbHr64lIDlMdQnMLqCRDr+mM2C5sqDJTlwQPJ9cWfP6Py2lUiLRMhTVU6DQhtA== X-Received: by 2002:a17:907:c88a:b0:ac3:c91b:7461 with SMTP id a640c23a62f3a-ac3f26abe3emr249886666b.46.1742547218764; Fri, 21 Mar 2025 01:53:38 -0700 (PDT) Received: from localhost ([31.210.181.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3ef86f1c1sm111166666b.8.2025.03.21.01.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 01:53:38 -0700 (PDT) From: Efraim Flashner Date: Fri, 21 Mar 2025 10:53:07 +0200 Message-ID: <98dd0a2a69547fc403323d9027a25f87d84cdaba.1742546953.git.efraim@flashner.co.il> 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-arm)[arguments]: Adjust the 'install phase to install another binary and to truncate the file to the expected length. Change-Id: Ic3319c88ed03c9c80e466ef78eae60837158a456 --- 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 049fd9246fb..c8220fe3d66 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1212,9 +1212,14 @@ (define-public ovmf-arm (lambda _ (let ((fmw (string-append #$output "/share/firmware"))) (mkdir-p fmw) - (copy-file (string-append "Build/ArmVirtQemu-ARM/" - "RELEASE_GCC/FV/QEMU_EFI.fd") - (string-append fmw "/ovmf_arm.bin")))))))))))) + (with-directory-excursion "Build/ArmVirtQemu-ARM/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_arm.bin")) + (copy-file "QEMU_EFI.fd" + (string-append fmw "/ovmf_arm.bin"))))))))))))) (define-public ovmf-riscv64 (let ((base (make-ovmf-firmware "riscv64")))