From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C49D815812D for ; Tue, 07 Jan 2025 11:47:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74AC4E079C; Tue, 07 Jan 2025 11:47:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA61DE0794 for ; Tue, 07 Jan 2025 11:47:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAF6B340C9C for ; Tue, 07 Jan 2025 11:47:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24EA21BA2 for ; Tue, 07 Jan 2025 11:47:32 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1736250305.e8a2877218db0a79e0b05c78b17afabf534d556b.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2/files/descriptors/, sys-firmware/edk2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-firmware/edk2/edk2-202411.ebuild sys-firmware/edk2/files/descriptors/50-edk2-riscv64-qcow2-nosb.json X-VCS-Directories: sys-firmware/edk2/files/descriptors/ sys-firmware/edk2/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: e8a2877218db0a79e0b05c78b17afabf534d556b X-VCS-Branch: master Date: Tue, 07 Jan 2025 11:47:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d36d70d-ba85-41bb-9dd7-414cf0f07f35 X-Archives-Hash: 32aab815b21d2368e85bfe7e0bfa3655 commit: e8a2877218db0a79e0b05c78b17afabf534d556b Author: James Le Cuirot gentoo org> AuthorDate: Mon Jan 6 14:17:26 2025 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 7 11:45:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a28772 sys-firmware/edk2: Add riscv support to 202411 Can't keyword it yet though because of unkeyworded dependencies. Use edk2-bin instead. Signed-off-by: James Le Cuirot gentoo.org> sys-firmware/edk2/edk2-202411.ebuild | 16 +++++++++++ .../descriptors/50-edk2-riscv64-qcow2-nosb.json | 33 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/sys-firmware/edk2/edk2-202411.ebuild b/sys-firmware/edk2/edk2-202411.ebuild index da6bb82c9717..fac445b9165e 100644 --- a/sys-firmware/edk2/edk2-202411.ebuild +++ b/sys-firmware/edk2/edk2-202411.ebuild @@ -93,6 +93,14 @@ pkg_setup() { UNIT1="QEMU_VARS.qcow2" FMT="qcow2" ;; + riscv) + TARGET_ARCH="RISCV64" + QEMU_ARCH="riscv64" + ARCH_DIRS="${DIR}/RiscVVirtQemu" + UNIT0="RISCV_VIRT_CODE.qcow2" + UNIT1="RISCV_VIRT_VARS.qcow2" + FMT="qcow2" + ;; esac DOC_CONTENTS="This package includes the TianoCore EDK II UEFI firmware for ${QEMU_ARCH} @@ -252,6 +260,10 @@ src_compile() { mk_fw_vars arm64 Build/ArmVirtQemu-AARCH64.secboot_INSECURE/"${BUILD_DIR}"/FV/QEMU_VARS.fd raw_to_qcow2 64m Build/ArmVirtQemu-AARCH64*/"${BUILD_DIR}"/FV/QEMU_{EFI,VARS}.fd ;; + riscv) + mybuild -a RISCV64 -p OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc + raw_to_qcow2 32m Build/RiscVVirtQemu/"${BUILD_DIR}"/FV/RISCV_VIRT_{CODE,VARS}.fd + ;; esac } @@ -282,6 +294,10 @@ src_install() { newins Build/ArmVirtQemu-AARCH64${TYPE}/"${BUILD_DIR}"/FV/QEMU_VARS.qcow2 QEMU_VARS${TYPE}.qcow2 done ;; + riscv) + insinto ${DIR}/RiscVVirtQemu + doins Build/RiscVVirtQemu/"${BUILD_DIR}"/FV/RISCV_VIRT_{CODE,VARS}.qcow2 + ;; esac insinto /usr/share/qemu/firmware diff --git a/sys-firmware/edk2/files/descriptors/50-edk2-riscv64-qcow2-nosb.json b/sys-firmware/edk2/files/descriptors/50-edk2-riscv64-qcow2-nosb.json new file mode 100644 index 000000000000..a8d6e7498dd9 --- /dev/null +++ b/sys-firmware/edk2/files/descriptors/50-edk2-riscv64-qcow2-nosb.json @@ -0,0 +1,33 @@ +{ + "description": "UEFI for RISC-V VMs", + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode" : "split", + "executable": { + "filename": "/usr/share/edk2/RiscVVirtQemu/RISCV_VIRT_CODE.qcow2", + "format": "qcow2" + }, + "nvram-template": { + "filename": "/usr/share/edk2/RiscVVirtQemu/RISCV_VIRT_VARS.qcow2", + "format": "qcow2" + } + }, + "targets": [ + { + "architecture": "riscv64", + "machines": [ + "virt", + "virt-*" + ] + } + ], + "features": [ + + ], + "tags": [ + + ] +}