From patchwork Mon May 13 08:21:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64391 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 B1A8227BBE2; Mon, 13 May 2024 09:26:05 +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 74DFC27BBE2 for ; Mon, 13 May 2024 09:26:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzo-0003Vl-6T; Mon, 13 May 2024 04:25:20 -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-0003Ti-RI 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-0001Nt-3H 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-0001WH-DU; Mon, 13 May 2024 04:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 03/11] gnu: Add 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.17155886625755 (code B ref 70913); Mon, 13 May 2024 08:25:04 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:22 +0000 Received: from localhost ([127.0.0.1]:59440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyq-0001Uf-3h for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:22 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:53388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyN-0001Rc-6j for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:05 -0400 Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-34da35cd01cso3764865f8f.2 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588565; x=1716193365; 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=RXza6De7SkR7SGuU2rSmgFqO5c20PeiSkh55XyCJhrw=; b=mJqdxfiX0XNtMwFLlykm/q5+pTmU51Jz9J7AEYENcaO1vskqayqwQ2bDN1Kbfm16HP 6pQol0zdqxSXEN3PJJR7hkcFBQqrsrRE1S4LS+zGE4NrAbh3KW+NQL5WMZw5wouh4Sg0 yCmZiI+5fbCJHjbyaGM0mNN3ytRYhDWM34JJ80pmi1yqJI9r7urDhN0ZapiHmN17GfSU kOUG83UhfePqfWsU4t8knLaHA5mcrN8FLMOwQ69b+/As1ekGVFNOk3XxJdRCtWU9zA+V st7wPV6hNVJ1B73V7w2wAkwOZ0bOX1ja2bzXMk1BvthJa1vyu68qiQpNoJnVhnL5nM3X mhgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588565; x=1716193365; 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=RXza6De7SkR7SGuU2rSmgFqO5c20PeiSkh55XyCJhrw=; b=VH10tAp2ao3i7A29hLWJw9KVS4NcxxDHm0InN6JLwjka76RVY2rBMrAJVNh/15o67U Sj2j10SlMH1RLV0Ca19xlXRmO6YzIvQhV3ZyzG87kHJoVNKBrGKeInmxxca1k4xTme62 ioZphWE9EV6/L3eMAavARntv1zPib0m6zkdnYkq9NrKEYbXqtAVRRE5UAUjeFCc90GWp 2vqNVFbv9tUmU9vX2nODAD1xEAjrm/8gprAbRm8ZkAwozMSAEF67oLRsGD0sWmIz2PkE 0E9GHqMd3NKxgJWUjHQdnAf0vwEE28QiHPA8rOk5GdaqSo2NY1NqXI0+tuXE4detpBhD OqDQ== X-Gm-Message-State: AOJu0YyCQPqed5Su7fuYYVrU4ZzEomwFFIEqOxbxiD2kkeFymTPOeSGh cbQvEQhMFDp/hT+FEkCD5FhO3eTOU5IFu9VfJiq224JXp10GRBfjNk6qTDGf X-Google-Smtp-Source: AGHT+IG8WSPrpZsGOpdO8I2Vg/dkF0TtJiT6vXoj7brdd5L9WYKsNo3WwyoqM0M7j/YVgnAiHKB24w== X-Received: by 2002:a5d:6741:0:b0:34d:74cb:b048 with SMTP id ffacd0b85a97d-3504a73de83mr7520438f8f.34.1715588564637; Mon, 13 May 2024 01:22:44 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b8a78e8sm10591002f8f.61.2024.05.13.01.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:44 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:52 +0300 Message-ID: <95a7a669b300c7f80a703e08c4027ed56fee47d0.1715588342.git.efraim@flashner.co.il> 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 (make-ovmf-firmware): New procedure. (ovmf-x86-64): New variable. Change-Id: I283065577b5507f3b7d695eaa67a6d248174bcf5 --- gnu/packages/firmware.scm | 133 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index f3bb51bcb1..40ca541437 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -869,6 +869,139 @@ (define-public edk2-tools @end itemize") (license license:bsd-2))) +(define* (make-ovmf-firmware arch) + (let ((toolchain "GCC") + (arch-string (match arch + ("x86_64" "X64") + ("i686" "IA32") + ("aarch64" "AARCH64") + ("armhf" "ARM") + ("riscv64" "RISCV64") + ("loongarch64" "LOONGARCH64") + (_ "NONE")))) + (package + (inherit edk2-tools) + (name (string-append "ovmf-" arch)) + (arguments + (list + #:tests? #f ; No check target. + #:target #f ; Package produces firmware. + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "edksetup.sh" + (("^return \\$\\?") + "exit $?")))) + (add-before 'configure 'set-env + (lambda _ + (unless (string-prefix? #$arch #$(%current-system)) + (setenv (string-append #$toolchain "_X64_PREFIX") + "x86_64-linux-gnu-") + (setenv (string-append #$toolchain "_IA32_PREFIX") + "i686-linux-gnu-") + (setenv (string-append #$toolchain "_AARCH64_PREFIX") + "aarch64-linux-gnu-") + (setenv (string-append #$toolchain "_ARM_PREFIX") + "arm-linux-gnueabihf-") + (setenv (string-append #$toolchain "_RISCV64_PREFIX") + "riscv64-linux-gnu-") + (setenv (string-append #$toolchain "_LOONGARCH64_PREFIX") + "loongarch64-linux-gnu-")))) + (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/target.txt" + (("^TARGET[ ]*=.*$") "TARGET = RELEASE\n") + (("^TOOL_CHAIN_TAG[ ]*=.*$") + (string-append "TOOL_CHAIN_TAG = " #$toolchain "\n")) + (("^TARGET_ARCH[ ]*=.*$") + (string-append "TARGET_ARCH = " #$arch-string + "\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" #$arch-string "-t" #$toolchain "-p" + (match #$arch + ("x86_64" + "OvmfPkg/OvmfPkgX64.dsc") + ("i686" + "OvmfPkg/OvmfPkgIa32.dsc") + ((or "aarch64" "armhf") + "ArmVirtPkg/ArmVirtQemu.dsc") + ("riscv64" + "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc") + (_ #t))))) + (add-before 'install 'install-efi-shell + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (for-each + (lambda (file) + (copy-file file + (string-append fmw "/Shell_" + (string-downcase #$arch-string) + ".efi"))) + (find-files "Build" "Shell\\.efi")))))))) + (native-inputs + (append + (list acpica + nasm + perl + python-3 + (list util-linux "lib")) + (if (not (string-prefix? arch (%current-system))) + (if (string=? arch "armhf") + (list (cross-gcc "arm-linux-gnueabihf") + (cross-binutils "arm-linux-gnueabihf")) + (list (cross-gcc (string-append arch "-linux-gnu")) + (cross-binutils (string-append arch "-linux-gnu")))) + '()))) + (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))))) + +(define-public ovmf-x86-64 + (let ((base (make-ovmf-firmware "x86_64"))) + (package + (inherit base) + (name "ovmf-x86-64") + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (for-each + (lambda (file) + (copy-file + (string-append "Build/OvmfX64/RELEASE_GCC" + "/FV/" file ".fd") + (string-append fmw "/" (string-downcase file) "_x64.bin"))) + (list "OVMF" + "OVMF_CODE" + "OVMF_VARS")))))))))))) + (define-public ovmf (let ((toolchain-ver "GCC5")) (package