gentoo resync : 04.01.2022

2 files changed, 54 insertions, 66 deletions

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index b84917f66537..c01fad8d8004 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,12 +1,9 @@
 AUX edk2-ovmf-202105-werror.patch 2355 BLAKE2B 6ce16c0181da1922130209141cde93d1d0407c62f31927270dfe684ebe58cdda94269566231f5b5d0dbb8c1fbde55bd62be881925547d0b1d38b90563e3f480c SHA512 bca368756bab75345e4010b3c0eaa0d3e6a34e172aa662e09a4c89f90d4b4bc6a20a28b7bce5b0fdd678f7f9113193d09a89e49b5d1d6b8a362c445b4098189f
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
-DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
-DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
-DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
 DIST edk2-ovmf-202105-qemu-firmware.tar.xz 672 BLAKE2B e87845a84c83f65db836fd054c81a4f3062d5e0fcc51aa0ecf9c2d23c8741f218d38ef737d140f5935ce8d9c34508e5f3b9f54bf9c547a391fa63cdc2ecf1233 SHA512 6100502f26db26e407dacce57c96b1abfd372bcb31767a068332afa09ac435a092fd2a73db27670d27c6e927c26e88315346bbac70578571108434b9683bd00c
 DIST edk2-ovmf-202105-r1-bin.tar.xz 2633188 BLAKE2B 93b4bd1c75da69406b5d27ac32d8b7c63dc8248bcd5d54832e520a4b009be4b7f215eb7d489ecb7cb16d31e02452dfa06b8fa709f37c44e59b4ff70a550076c7 SHA512 356c2110abce43da9c0654324e222cbbab7085e3aa23d1ba4c98011e4d4992a37d61fa45394305b748d119dba12f65d7c7d630b9f8038065ba4672d758c702be
 DIST edk2-ovmf-202105.tar.gz 13702868 BLAKE2B 3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d SHA512 c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371
-EBUILD edk2-ovmf-202008.ebuild 5432 BLAKE2B 50240def951163fa1962b99a1467efbb4abc6fc503a447c5b18fa88785ef227850cf63cb361d41e4e523bbf5eb035e55353829a8c9b0cbd434b4ef8ec7c6d75b SHA512 f77b164efff09364e018778798c41e06cfd8c8a1b209d13625ee24bae46b27600cb0a926412c1f207625e106e8b5ef6cd52dc056815020c037035ecff27a5fd4
 EBUILD edk2-ovmf-202105-r1.ebuild 4974 BLAKE2B 34c7b4ec472917c3ab586ef6dbbd9a0814dc7d284311b94846c981dfd02e50de8d4f7612a3cb3ffc68bd74fb1194a97cf03634d70736010429cce3b6cea3f597 SHA512 b867679dc71db66f6aec9f54551c7feaf2cd2e9084f7f27b623b62d40aba52c5fc96c4db24b9609bc0d131158de3382768ac2efef408df9b23be015cf7d962a9
+EBUILD edk2-ovmf-202105-r2.ebuild 5065 BLAKE2B 35b3077030539b00da52e8adc2bf2c31f3edd5d055694748ab456f3d5e0ea04e48dea40ac7a17cda2a605e7e0cad0445e7fcbc7d5d7391f6955efc827b5edfa6 SHA512 6ea2f7a2cd855c272f5c250d3636c7bb41e0a4f6d63ba07084015f6fe45c65abf20a9633879c15177f82221c45ee33c590e518551ccc52e957664e57583441f0
 MISC metadata.xml 436 BLAKE2B 091a94f2295817e420f919cc87c89b2ac5aab07f7d1b3279fa153bd89395ed9278d429aa75aa0aa3820ad9ee9400e80c1d4f56a3940eb8b37e39f767438f508a SHA512 d5854375acb0fcdf482458d80f0f916389cba9709a9cdc61ff9dc6ffc8bf5a145445fdf252fe543ea7d25ccd0491089b56aff32c7a30d7470be63acc30ad81d7
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
index c02cae3b5fcf..238999b462bb 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -1,64 +1,61 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
+BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+
+# TODO: talk with tamiko about unbundling (mva)
+
+# TODO: the binary 202105 package currently lacks the preseeded
+#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
+
+SRC_URI="
+	!binary? (
+		https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+		https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+	)
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-r1-bin.tar.xz )
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-qemu-firmware.tar.xz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+
+IUSE="+binary"
+REQUIRED_USE+="
+	!amd64? ( binary )
+"
+
 NON_BINARY_DEPEND="
 	app-emulation/qemu
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729
 	${PYTHON_DEPS}
 "
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
-	BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/e/
-	#   edk2-ovmf-20200801stable-1.fc34.noarch.rpm
-
-	# TODO: talk with tamiko about unbundling
-	SRC_URI="
-		!binary? (
-			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-			https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
-			https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+
+DEPEND+="
+	!binary? (
+		amd64? (
+			${NON_BINARY_DEPEND}
 		)
-		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
-		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
-	"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-	)
-fi
+	)"
+RDEPEND=""
 
-LICENSE="BSD-2 MIT"
-SLOT="0"
+PATCHES=(
+	"${FILESDIR}/${PN}-202105-werror.patch"
+)
 
 S="${WORKDIR}/edk2-edk2-stable${PV}"
 
@@ -89,36 +86,27 @@ In order to use the firmware you can run qemu the following way
 
 	$ qemu-system-x86_64 \
 		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
+		..."
 
 pkg_setup() {
 	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	if ! use binary; then
+	if use binary; then
+		eapply_user
+	else
+		# Bundled submodules
+		cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+
 		sed -i -r \
 			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
 			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+
+		default
 	fi
-	if  [[ ${PV} != "999999" ]]; then
-		if use binary; then
-			eapply_user
-			return
-		else
-			# Bundled submodules
-			cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
-			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
-			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
-		fi
-	fi
-	default
 }
 
 src_compile() {
@@ -129,6 +117,8 @@ src_compile() {
 	BUILD_FLAGS="-D TLS_ENABLE \
 		-D HTTP_BOOT_ENABLE \
 		-D NETWORK_IP6_ENABLE \
+		-D TPM_ENABLE \
+		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
 		-D FD_SIZE_2MB"
 
 	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
@@ -177,6 +167,7 @@ src_install() {
 
 	insinto /usr/share/qemu/firmware
 	doins qemu/*
+	rm "${ED}"/usr/share/qemu/firmware/40-edk2-ovmf-x64-sb-enrolled.json || die "rm failed"
 
 	readme.gentoo_create_doc
 }