diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest index fa1a6639d9..82d355e9d9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest @@ -1,3 +1,8 @@ -DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d -DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774 -DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1 +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 diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild similarity index 71% rename from sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild rename to sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild index 1abe540a07..c02cae3b5f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python3_{7,8,9} ) -inherit eutils python-any-r1 readme.gentoo-r1 +inherit python-any-r1 readme.gentoo-r1 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines" HOMEPAGE="https://github.com/tianocore/edk2" @@ -26,17 +26,23 @@ if [[ ${PV} == "999999" ]] ; then ${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/s/ - # edk2-ovmf-20190501stable-2.fc31.noarch.rpm + # 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://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz + 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}-bin.tar.xz ) - " - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" + 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 ) @@ -96,9 +102,21 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} != "999999" ]] && use binary; then - eapply_user - return + if ! use binary; then + sed -i -r \ + -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \ + "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed" + 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 } @@ -157,6 +175,9 @@ src_install() { insinto /usr/share/${PN} doins ovmf/* + insinto /usr/share/qemu/firmware + doins qemu/* + readme.gentoo_create_doc } diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild similarity index 62% rename from sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild rename to sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild index e8acffa9d2..c316a3faf1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild @@ -1,49 +1,63 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python3_{8,9,10} ) -inherit eutils python-any-r1 readme.gentoo-r1 +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/${PF}-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 - SRC_URI="" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" - IUSE="+binary" - REQUIRED_USE+=" - !amd64? ( binary ) - " - DEPEND+=" - !binary? ( - amd64? ( - ${NON_BINARY_DEPEND} - ) - )" - PATCHES=( - ) -fi -LICENSE="BSD-2 MIT" -SLOT="0" +DEPEND+=" + !binary? ( + amd64? ( + ${NON_BINARY_DEPEND} + ) + )" +RDEPEND="" + +PATCHES=( + "${FILESDIR}/${PN}-202105-werror.patch" +) + +S="${WORKDIR}/edk2-edk2-stable${PV}" DISABLE_AUTOFORMATTING=true DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86 @@ -72,24 +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 [[ ${PV} != "999999" ]] && use binary; 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/" + + sed -i -r \ + -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \ + "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed" + + default fi - default } src_compile() { @@ -100,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} \ @@ -146,6 +165,9 @@ src_install() { insinto /usr/share/${PN} doins ovmf/* + insinto /usr/share/qemu/firmware + doins qemu/* + readme.gentoo_create_doc } diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch new file mode 100644 index 0000000000..db71faed77 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch @@ -0,0 +1,38 @@ +diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template +index 498696e..8a360f4 100755 +--- a/BaseTools/Conf/tools_def.template ++++ b/BaseTools/Conf/tools_def.template +@@ -1863,7 +1863,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N + *_*_*_DTCPP_PATH = DEF(DTCPP_BIN) + *_*_*_DTC_PATH = DEF(DTC_BIN) + +-DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common ++DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common + DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe + DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe + DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pic -fno-pie +diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile +index 0df728f..49f9706 100644 +--- a/BaseTools/Source/C/Makefiles/header.makefile ++++ b/BaseTools/Source/C/Makefiles/header.makefile +@@ -82,17 +82,17 @@ BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) + + ifeq ($(DARWIN),Darwin) + # assume clang or clang compatible flags on OS X +-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ ++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall \ + -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g + else + ifeq ($(CXX), llvm) + BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ +--fno-delete-null-pointer-checks -Wall -Werror \ ++-fno-delete-null-pointer-checks -Wall \ + -Wno-deprecated-declarations -Wno-self-assign \ + -Wno-unused-result -nostdlib -g + else + BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ +--fno-delete-null-pointer-checks -Wall -Werror \ ++-fno-delete-null-pointer-checks -Wall \ + -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ + -Wno-unused-result -nostdlib -g + endif diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/metadata.xml index 7c5dcd8f83..26afde23af 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/metadata.xml @@ -1,5 +1,5 @@ - + tamiko@gentoo.org