From patchwork Mon May 13 08:21:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64386 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 040D127BBE9; Mon, 13 May 2024 09:25:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 5070127BBE2 for ; Mon, 13 May 2024 09:25:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzp-0003Wy-Hg; Mon, 13 May 2024 04:25:21 -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 1s6QzZ-0003Tg-Qt for guix-patches@gnu.org; Mon, 13 May 2024 04:25:07 -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 1s6QzY-0001S5-I3 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzY-0001WP-R4; Mon, 13 May 2024 04:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 10/11] gnu: ovmf: Deprecate in favor of ovmf-x86-64. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70913 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70913@debbugs.gnu.org Cc: Efraim Flashner , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886645762 (code B ref 70913); Mon, 13 May 2024 08:25:04 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:24 +0000 Received: from localhost ([127.0.0.1]:59442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qys-0001Um-66 for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:24 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:49281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qya-0001SP-32 for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:06 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4200ee47de7so11558615e9.2 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588578; x=1716193378; 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=wdI2kdsfxTtBhYk50hSn6HR44YFnElecTJ3IyG+eDdE=; b=MUeImHVf/EL+AeV/BX4sk1GtMYilut4bvgJIa8e7qV1mAIzjvALgyD4Gaouu6TsX2W nbqzcgl9DRx6S7lx0LQsfXIbg0KONmgILo5nQFP9SO8iGbDOY0iWCsUJ2AXruMx2k/HL nac4R0DfxrKM43/uVHh1vHmCq59EAYZ/fHXtAOjuxZnOmPgB16ou0AAgDdrPDXmZ05wt 3MDKiptDODM/WbUvyNbAEHzkyqeYgby+x8FqxGcWyG+FjfeMrOTlCj1CEeHyf/Kr9Hrq XxBA6O0zrNEFMAnc33n0/MoZ8pUdSvL6i/zVDC4XRe80l6HXKZrEX/HqYjRvBAL1hkjl PNuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588578; x=1716193378; 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=wdI2kdsfxTtBhYk50hSn6HR44YFnElecTJ3IyG+eDdE=; b=oKwf0mhMhvbo7YU3pfUzl3md5RXlkKc03MznBcD5RKd7qtcG3krzz2k7fErOCcWrAt W3DbXrERnOECSSN7oGIafIUhf4oTOqvhjNYKLtMiZLNz7WpMtWitj/XmGNCX/Dm07ptX ssCeNNBhpmw+WEtRyHho+gS3j3rMJF4z59KwrP+5lnHZI2AKPojLdCESmOidKzZF/zew siVFQtlQzOHkVeXbrbpvSTexDojKn2VTplD83BrSQE/nOFeyYa1dzkqVs5s7VKKlu0fy c0GlkA8Tb//Ib1TudE6XK6rKJT3m3dL91gt6qAHL0pknhFp4tpZkwoBdBgL2fSNlKJCy PK0Q== X-Gm-Message-State: AOJu0YxULdZoTFmoQzAvXZ49YJ7I5fQaHPlgsBD2ZmSXoZX475FyxrBn H3u0ahGSONoNg4z7KMvyYgA6ZAAfWptlQetEj3gX27/EjKbjEGaWhJnmt0q5 X-Google-Smtp-Source: AGHT+IF8vXm1lfBp3e5tGKt4Wa9lS8bNDNzrBBY78rdgbUmarzhLmzBA0oPNNm4kXTXZlHIJgaem7A== X-Received: by 2002:a05:600c:5605:b0:41c:7ac7:17f5 with SMTP id 5b1f17b1804b1-41feab42b76mr64773065e9.24.1715588577661; Mon, 13 May 2024 01:22:57 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42011d91edfsm55232045e9.44.2024.05.13.01.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:57 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:59 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 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): Deprecate package in favor of ovmf-x86-64. Change-Id: I912c2b122f80a7f3fd473b8d91ae6e714b27808f --- gnu/packages/firmware.scm | 100 +------------------------------------- 1 file changed, 2 insertions(+), 98 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index b0638382cb..55f78c3da6 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -30,6 +30,7 @@ (define-module (gnu packages firmware) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) + #:use-module (guix deprecation) #:use-module (guix packages) #:use-module (guix platform) #:use-module (guix download) @@ -1074,104 +1075,7 @@ (define-public ovmf-riscv64 (install-file "RISCV_VIRT_VARS.fd" fmw)))))))))))) (define-public ovmf - (let ((toolchain-ver "GCC5")) - (package - (name "ovmf") - (version "202311") - (source (origin - (method git-fetch) - (uri (git-reference - ;; OVMF is part of the edk2 source tree. - (url "https://github.com/tianocore/edk2") - (recursive? #t) ;edk2 now uses a lot of submodules - (commit (string-append "edk2-stable" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "136dl5cxpjpg37whzlqq7jrrjsgybmwrgkbbmks8xaixqmzwhbw0")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; No check target. - #:target #f ; Package produces firmware. - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "edksetup.sh" - (("^return \\$\\?") - "exit $?")))) - (replace 'configure - (lambda _ - (let* ((cwd (getcwd)) - (tools (string-append cwd "/BaseTools")) - (bin (string-append tools "/BinWrappers/PosixLike"))) - (setenv "WORKSPACE" cwd) - (setenv "EDK_TOOLS_PATH" tools) - (setenv "PYTHON3_ENABLE" "TRUE") - (setenv "PYTHON_COMMAND" "python3") - (setenv "PATH" (string-append (getenv "PATH") ":" bin)) - (invoke "bash" "edksetup.sh") - (substitute* "Conf/tools_def.txt" - ;; Guix gcc is compiled without pie - ;; The -no-pie flag causes the Ia32 build to fail - (("-no-pie") "")) - (substitute* "Conf/target.txt" - (("^TARGET[ ]*=.*$") "TARGET = RELEASE\n") - (("^TOOL_CHAIN_TAG[ ]*=.*$") - (string-append "TOOL_CHAIN_TAG = " #$toolchain-ver "\n")) - (("^TARGET_ARCH[ ]*=.*$") - (string-append "TARGET_ARCH = IA32" - #$@(if (string=? "x86_64-linux" (%current-system)) - '(", X64") - '()) - "\n")) - (("^MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*$") - (format #f "MAX_CONCURRENT_THREAD_NUMBER = ~a~%" - (number->string (parallel-job-count))))) - ;; Build build support. - (setenv "CC" "gcc") - (invoke "make" "-C" tools)))) - (replace 'build - (lambda _ - (invoke "build" "-a" "IA32" "-t" #$toolchain-ver - "-p" "OvmfPkg/OvmfPkgIa32.dsc"))) - #$@(if (string=? "x86_64-linux" (%current-system)) - #~((add-after 'build 'build-x64 - (lambda _ - (invoke "build" "-a" "X64" "-t" #$toolchain-ver - "-p" "OvmfPkg/OvmfPkgX64.dsc")))) - #~()) - (replace 'install - (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) - (mkdir-p fmw) - (for-each - (lambda (file) - (copy-file (string-append "Build/OvmfIa32/RELEASE_" - #$toolchain-ver "/FV/" file ".fd") - (string-append fmw "/" (string-downcase file) "_ia32.bin")) - #$@(if (string=? "x86_64-linux" (%current-system)) - #~((copy-file (string-append "Build/OvmfX64/RELEASE_" - #$toolchain-ver "/FV/" file ".fd") - (string-append fmw "/" (string-downcase file) "_x64.bin"))) - #~())) - (list "OVMF" - "OVMF_CODE" - "OVMF_VARS")))))))) - (native-inputs - `(("acpica" ,acpica) - ("nasm" ,nasm) - ("perl" ,perl) - ("python-3" ,python-3) - ("util-linux" ,util-linux "lib"))) - (supported-systems '("x86_64-linux" "i686-linux")) - (home-page "https://www.tianocore.org") - (synopsis "UEFI firmware for QEMU") - (description "OVMF is an EDK II based project to enable UEFI support for -Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") - (license (list license:expat - license:bsd-2 license:bsd-3 license:bsd-4))))) + (deprecated-package "ovmf" ovmf-x86-64)) (define* (make-arm-trusted-firmware platform #:key (triplet "aarch64-linux-gnu"))