From ef0fedb39c21a343a3f316726f272bad9005b22c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Mar 2025 01:49:51 +0000 Subject: gentoo auto-resync : 12:03:2025 - 01:49:51 --- sys-firmware/edk2/Manifest | 5 +++- sys-firmware/edk2/edk2-202411.ebuild | 26 +++++++++++++++-- .../50-edk2-loongarch64-qcow2-nosb.json | 33 ++++++++++++++++++++++ sys-firmware/edk2/files/edk2-202411-gcc15.patch | 32 +++++++++++++++++++++ sys-firmware/edk2/files/edk2-202411-loong.patch | 33 ++++++++++++++++++++++ 5 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 sys-firmware/edk2/files/descriptors/50-edk2-loongarch64-qcow2-nosb.json create mode 100644 sys-firmware/edk2/files/edk2-202411-gcc15.patch create mode 100644 sys-firmware/edk2/files/edk2-202411-loong.patch (limited to 'sys-firmware/edk2') diff --git a/sys-firmware/edk2/Manifest b/sys-firmware/edk2/Manifest index be34d090bfca..77bec5ac4fca 100644 --- a/sys-firmware/edk2/Manifest +++ b/sys-firmware/edk2/Manifest @@ -5,6 +5,7 @@ AUX descriptors/40-edk2-aarch64-qcow2-sb.json 728 BLAKE2B be4c06aa2ad5be54bd0cf3 AUX descriptors/40-edk2-ovmf-4m-qcow2-x64-sb.json 763 BLAKE2B 21fdf8998e9d7da60039e6c525051d3eb28f6b6f9791bd0489b6aae49a3bf178a54509bd25cab4c22bc96a058768f88260e9df4061f9f92ac29ac34608f6b08f SHA512 5276eabee164f64e6ad0b873fc3cd420da2c8a684018e546b988b863eb4c0385781cd9c2071f8e75248ff7f78a212948449a069de67d48405cffd9b6df442d1a AUX descriptors/41-edk2-ovmf-2m-raw-x64-sb.json 747 BLAKE2B 7872e2d81d8e6584bc73e8c53316df2a70e9e083f0d56a557d3eda6faad0aa76478be768df760d1eb898f41f8091b4f2c1a98164a25f5d09f2b9f3cac739a655 SHA512 0cf7f2124781d3874e2f94039cf06661c94b2a5d7000a0b2785f67dbd56677541cf425c5321f1e3630fe5ad6868682e4254038d126cf30e85411b84921224962 AUX descriptors/50-edk2-aarch64-qcow2-nosb.json 682 BLAKE2B 9cd6742f66ee7dd7f13d910adb59ce746ffe35d0324a757f9eeb94d86c2d6ee62b59ef5df3a007561c51e6c2309a917ec579539dd2d89fb8add606973e4146e5 SHA512 c95ce6e5e4f086a649f92baa928409cb023489c0df74c5a7fedb7e6f6e832b3cb321c8245f4a0885d7f1deba0c46ebde202326ed465fd10dc6d2041a4943b827 +AUX descriptors/50-edk2-loongarch64-qcow2-nosb.json 672 BLAKE2B b86405988e6120a821f8d48d2596fcb0dc1ff6f93721833cc837052c43b18f7918ecec216cfb6d82e2821e01c557652f39c28777f25e8314ef910fa345ddf02d SHA512 722f5cfa3fe65de52aa7d919243d2dfa16ee0fdd22be4d553883d81cbebf0942e42af1f42957bfd5911be6e4e7df848872f765e7e6c96218c763b6026a7ec352 AUX descriptors/50-edk2-ovmf-4m-qcow2-x64-nosb.json 783 BLAKE2B ac38aa9b1f7c0d039ebb28dcaaec737db95f7a1de147c6617c1544a30a6d2b3772af9c0e14a6d967bc77c5923ee337c910a2a3cf81b4ca6f1b45d34ad022faef SHA512 371514d13eee58acab6330aaa213558849b7437c34b2fc21d4d7b1fb4e9b7c650f9b99ec2f416be19c4875358c58b5097c2681dc18416b019454c5d0520e48bc AUX descriptors/50-edk2-riscv64-qcow2-nosb.json 680 BLAKE2B e62e9df12dabaf8abed33f67ec8c1ea6b0d7abd581f7c954db6da5565f6d44a92264a781c606667b473cae7e64d161d1b0f7b9773c97912e60677bfa23072bca SHA512 f4340d80df1f36a217872604762356425c7284fcc0e9ae65697fa3be7d8bce8e706c2387b6eae2c1b992af5b185aaec11eae1bdac802642c33a116f559a9fad5 AUX descriptors/51-edk2-ovmf-2m-raw-x64-nosb.json 767 BLAKE2B b2604ec54c60f05ccc33cd9a10956f394d4da428abba2fb39209d38d8efc06840c6dc57922e28143e61bc01298f9281362d5cba342cfe49dfb4993f012dd554b SHA512 df4e03dc266c3e1806b495b4f7d0e4718c4881fc7a3c6edd83aaab66fbd329b5dfa52c8dc3698064a23369ec39864b7f50878b38ae5de8a8bf02447144638d10 @@ -13,6 +14,8 @@ AUX edk2-202202-binutils-2.41-textrels.patch 2600 BLAKE2B e3ddfcf36190762cf2589f AUX edk2-202202-lld-textrels.patch 2555 BLAKE2B 63b31c92b2fdd043a9569538f448f9b1d5c6d5ec00e981344b07c41fa370acfd69863939475e9d3565c5a52429af61268e72f9531734f8faad87cd6fca9d84cd SHA512 2cbdc3c40267f82ac6a958b6569c5056e8700466732155aaebc041e176c228cf6036632d04225fa86e1de953cb4717a2b6d5e76efda15aa26a50a5ddb8233e05 AUX edk2-202408-binutils-2.41-textrels.patch 1308 BLAKE2B eefd07cd2c118a09accd10e27704ff21ed590e44c190431b5e06600149dbaa062db84ef923c6a0a460ac3dc6610c1ea918307510f0e9d7637a23aeaf78dc2d85 SHA512 bbc19b6403e1814440ff8b3a8b326a001997a791ee85d0b70270b72af8ced3cd63b9e2347f95d491dd53975cb149b1ce4d8bde5d4e5b5b0b9fe6ba545e9de100 AUX edk2-202408-werror.patch 4581 BLAKE2B f0c0ad36fa85edf968f79e759a7c619c47ecd1b341b573d9389997b5229b0349ab7f0efe27118bf8f6d5eb70c89ed068245f7ad1dc7902ab3438a233cc6fb13d SHA512 1109cd1e40dae4310c2132a03a24ab1a371950de154799a5d9d8a0c4b364e578520cbdfb1ec272fad26fd4eddd1fbdd809e917bf25d39df60cb2e29c02edccaf +AUX edk2-202411-gcc15.patch 1269 BLAKE2B ca9624b2d752fd7c02b567936d14add29346aaf1d89fa99347a4bfcf9f035db5335af4667f9c6be44070a1863809e76162d27ad586d6bbb220bdab23b0485ec3 SHA512 a55516c3b16c97f48fc6585a0cf347d8cf6cd548292d9a59fc3b252a25fc350bd4f8f6b2474898ad7584caac3706b0d7f7d8dd8894fb69975b82af5d4272eb64 +AUX edk2-202411-loong.patch 1557 BLAKE2B eca5b0b3a316c135e3d20c9d923fef07e7bf1f33dd3694451c0316d0e691a18f1568d5784a42007b4d98b5068b1ea37fb2050eb802ec2ea79ee5b2ab8f04d034 SHA512 ec89ecc46a60eea9131e2f70f19b047092adc7b27704f7c6e5ef122a46cb6208e973b2b6367e88e78a2c9965194cfc7a3ad42f8e25a6f63f51357d7536f07ba0 AUX edk2-202411-werror.patch 4735 BLAKE2B cc8e42322cfed0d05bbdc928a46359033cb3bcb485f0afa0d891469bce83854b1c31bb1998c5cef22435600ebbf4b9e9365d71c42778d2d4407b122f7316db09 SHA512 7a49581bbaf8ecb1650d665f9222837e279efad766894b16af6b1ef966bde66f317cc515f18c15568bc654c387ab639a836dffc0a9c012c9aff5fedb96cc462f DIST arm64_DBXUpdate_05092023.bin 4610 BLAKE2B 4c6628e5c297a26ca5a1235e377a794fdc18f8201dc7bcb134eb5dd164cc16497ff8d7e598509a61dadf3aa6e8525c9c9e4ca597af62a1c93f97945594517303 SHA512 5a2816e3ff73fef1d258c1418a09b264291408493147399da6b71b6a20bd6b347c00153e22589b2635172cdc57de404ff423be41a6c382a9b25ee9a76922f397 DIST brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz 512229 BLAKE2B cd86cc2cc7eefad24f87cda8006409bf764922b5f23ccfb951e7a41214b12004ce532b11f94f5fb858b3bf71f9abf8ef17ba219fa96bd5be23b51873afad0fd5 SHA512 7f48e794e738b31c2005e7cef6d8c0cc0d543f1cd8c137ae8ba14602cac2873de6299a3f32ad52be869f513e7548341353ed049609daef1063975694d9a9b80b @@ -30,5 +33,5 @@ DIST pylibfdt-cfff805481bdea27f900c32698171286542b8d3c.tar.gz 49659 BLAKE2B 05e9 DIST x64_DBXUpdate_05092023.bin 21170 BLAKE2B 9b74945ef441e65c50116122bc24578c22c8f5f7af94e46322a96bd15035b79c0af4c1fd5366017b347b9aaf3f5791b9d6ea84ef141500700ccf69f708f91389 SHA512 71fb6e8cd6918126b3acd78b95651913336df372e13fdfdfdd20d5d23f0e509050c6c88c8a2c43f8ac44f987df86bd45174bb3065d5a7a8c7e3b8772fd06d624 EBUILD edk2-202202.ebuild 4795 BLAKE2B 5d11f5d6372536904f81e425e156cd2b3c3f079b177cab26320bbee6a5951457feda66d0292bd9bbe4a55be7ff11483424e084f31389fd6ce0f9b409fe2477e2 SHA512 e35eb3bedbfcab220f93d3ecce9197ee56f31e71a75442c83189d1c2a47b88171b83bbcb2624b83b04e409498d596ccae3f1371a80e4d38c73c282e62b0ed52a EBUILD edk2-202408.ebuild 9260 BLAKE2B 31ce890ce07df7955249dfda32370a1a7db0eee0f6022195face02f23fe930cf6ecf79706e978c46efb61488bdc252a7eba1fe6b3b766e26587122fba5f28fbc SHA512 9f2a94a26db3eaed1b6215712c8164ba2116e0198c3dfccda8145cf7cc3c5499a6ef63df1cbd4723edd9722695dfbd01c88a1a0e71b7372281c2aef2872e779a -EBUILD edk2-202411.ebuild 9663 BLAKE2B 7510092a371403c904d6c8090c331ffa9ee10a648a680c78b8557a69cb7eb8d780f4428eab2a1ac2d2974b5e6e6a74fe256d6a3f3c997b762608ddad72417144 SHA512 f8208073c23298fb6fa1fd0173c7e61312698c4acfcf135712ecc85154a7329b2ff7f87d6455c79b194b89d7862f431db76825e7a697cfdec180d8a7c146923b +EBUILD edk2-202411.ebuild 10293 BLAKE2B 2499eac7f42b672b6025f4263abed257439061410035db73cba2727e15e9e7b6e72539af674471497a7ce6921ab77b5baa338eac9973a3764362bbfb79bb657b SHA512 3be4327e71ce7ec740aa4296b887e7fc9ba18de8a9c3e92a449fe0b78f6df4cbe684e02c03584b2473d94b762edd7322eef12d41ed617aa7aed465797588a61d MISC metadata.xml 401 BLAKE2B c64a51cd2895610b485f6a9922d27f8894cc20ddace93df39719a39160dda48af9202f52b624465785ac64c751bec6b1612ebad19395aaa31d2c112e3c5f6115 SHA512 a07b485f9c92dc368d2fd62783c323ec03620cebce5146762d12df66eccf515b1f0f6a3d266642135668e3109e0d4b3c888629e8e487d5dbf5fb60ddeab28599 diff --git a/sys-firmware/edk2/edk2-202411.ebuild b/sys-firmware/edk2/edk2-202411.ebuild index 0b8cd1c71d87..a998704605eb 100644 --- a/sys-firmware/edk2/edk2-202411.ebuild +++ b/sys-firmware/edk2/edk2-202411.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_REQ_USE="sqlite" PYTHON_COMPAT=( python3_{12..13} ) -inherit edo prefix python-any-r1 readme.gentoo-r1 secureboot toolchain-funcs +inherit edo flag-o-matic prefix python-any-r1 readme.gentoo-r1 secureboot toolchain-funcs DESCRIPTION="TianoCore EDK II UEFI firmware for virtual machines" HOMEPAGE="https://github.com/tianocore/edk2" @@ -48,7 +48,7 @@ SRC_URI=" S="${WORKDIR}/${PN}-${PN}-stable${PV}" LICENSE="BSD-2 MIT" SLOT="0" -KEYWORDS="-* ~amd64 arm64 ~riscv" +KEYWORDS="-* ~amd64 arm64 ~loong ~riscv" BDEPEND=" ${PYTHON_DEPS} @@ -64,6 +64,8 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-202411-werror.patch" + "${FILESDIR}/${PN}-202411-gcc15.patch" + "${FILESDIR}/${PN}-202411-loong.patch" "${FILESDIR}/${PN}-202408-binutils-2.41-textrels.patch" ) @@ -93,6 +95,14 @@ pkg_setup() { UNIT1="QEMU_VARS.qcow2" FMT="qcow2" ;; + loong) + TARGET_ARCH="LOONGARCH64" + QEMU_ARCH="loongarch64" + ARCH_DIRS="${DIR}/LoongArchVirtQemu" + UNIT0="QEMU_EFI.fd" + UNIT1="QEMU_VARS.fd" + FMT="raw" + ;; riscv) TARGET_ARCH="RISCV64" QEMU_ARCH="riscv64" @@ -260,6 +270,14 @@ 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 ;; + loong) + BUILD_ARGS+=( + # fails to seed the OpenSSL RNG during early initialization due + # to improper FPU enabling (maybe too late) + -D NETWORK_TLS_ENABLE=FALSE + ) + mybuild -a LOONGARCH64 -p OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc + ;; riscv) mybuild -a RISCV64 -p OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc raw_to_qcow2 32m Build/RiscVVirtQemu/"${BUILD_DIR}"/FV/RISCV_VIRT_{CODE,VARS}.fd @@ -294,6 +312,10 @@ src_install() { newins Build/ArmVirtQemu-AARCH64${TYPE}/"${BUILD_DIR}"/FV/QEMU_VARS.qcow2 QEMU_VARS${TYPE}.qcow2 done ;; + loong) + insinto ${DIR}/LoongArchVirtQemu + doins Build/LoongArchVirtQemu/"${BUILD_DIR}"/FV/QEMU_{EFI,VARS}.fd + ;; riscv) insinto ${DIR}/RiscVVirtQemu doins Build/RiscVVirtQemu/"${BUILD_DIR}"/FV/RISCV_VIRT_{CODE,VARS}.qcow2 diff --git a/sys-firmware/edk2/files/descriptors/50-edk2-loongarch64-qcow2-nosb.json b/sys-firmware/edk2/files/descriptors/50-edk2-loongarch64-qcow2-nosb.json new file mode 100644 index 000000000000..54c07649b6a1 --- /dev/null +++ b/sys-firmware/edk2/files/descriptors/50-edk2-loongarch64-qcow2-nosb.json @@ -0,0 +1,33 @@ +{ + "description": "UEFI for LoongArch VMs", + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode" : "split", + "executable": { + "filename": "/usr/share/edk2/LoongArchVirtQemu/QEMU_EFI.fd", + "format": "raw" + }, + "nvram-template": { + "filename": "/usr/share/edk2/LoongArchVirtQemu/QEMU_VARS.fd", + "format": "raw" + } + }, + "targets": [ + { + "architecture": "loongarch64", + "machines": [ + "virt", + "virt-*" + ] + } + ], + "features": [ + + ], + "tags": [ + + ] +} diff --git a/sys-firmware/edk2/files/edk2-202411-gcc15.patch b/sys-firmware/edk2/files/edk2-202411-gcc15.patch new file mode 100644 index 000000000000..c2d424240b0a --- /dev/null +++ b/sys-firmware/edk2/files/edk2-202411-gcc15.patch @@ -0,0 +1,32 @@ +https://github.com/tianocore/edk2/commit/e063f8b8a53861043b9872cc35b08a3dc03b0942 +From: Gerd Hoffmann +Date: Mon, 20 Jan 2025 09:40:31 +0100 +Subject: [PATCH] BaseTools/Pccts: set C standard + +The prehistoric code base doesn't build with ISO C23. Set the C +standard to C11 (for both clang and gcc) so it continues to build with +gcc 15 (which uses C23 by default). + +Signed-off-by: Gerd Hoffmann +--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile ++++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile +@@ -169,7 +169,7 @@ ANTLR=${BIN_DIR}/antlr + DLG=${BIN_DIR}/dlg + OBJ_EXT=o + OUT_OBJ = -o +-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 ++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -std=gnu11 + CPPFLAGS= + # + # SGI Users, use this CFLAGS +--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile ++++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile +@@ -123,7 +123,7 @@ endif + COPT=-O + ANTLR=${BIN_DIR}/antlr + DLG=${BIN_DIR}/dlg +-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 ++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -std=gnu11 + CPPFLAGS= + OBJ_EXT=o + OUT_OBJ = -o diff --git a/sys-firmware/edk2/files/edk2-202411-loong.patch b/sys-firmware/edk2/files/edk2-202411-loong.patch new file mode 100644 index 000000000000..f2df0376b730 --- /dev/null +++ b/sys-firmware/edk2/files/edk2-202411-loong.patch @@ -0,0 +1,33 @@ +https://github.com/tianocore/edk2/commit/b8f3199595d23c29433528a5207a6aa9fb368d44 +From: Chao Li +Date: Tue, 17 Dec 2024 18:05:45 +0800 +Subject: [PATCH] OvmfPkg/LoongArch: Enabling some base libraries + +BaseCryptLib, RngLib, IntrinsicLib and OpensslLib are enabled by default +on LoongArch VM, since some APPs or OS require them. + +Cc: Ard Biesheuvel +Cc: Jiewen Yao +Cc: Gerd Hoffmann +Signed-off-by: Chao Li +--- a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc ++++ b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc +@@ -156,6 +156,18 @@ + FileExplorerLib | MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + ImagePropertiesRecordLib | MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf + ++ # ++ # CryptoPkg libraries needed by multiple firmware features ++ # ++ IntrinsicLib | CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf ++!if $(NETWORK_TLS_ENABLE) == TRUE ++ OpensslLib | CryptoPkg/Library/OpensslLib/OpensslLib.inf ++!else ++ OpensslLib | CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf ++!endif ++ BaseCryptLib | CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf ++ RngLib | MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf ++ + !if $(HTTP_BOOT_ENABLE) == TRUE + HttpLib | MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf + !endif -- cgit v1.2.3