| 1 |
commit: 4342ef6d64286089e4a4b25dca5b15a5edb53dca |
| 2 |
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 2 10:37:58 2020 +0000 |
| 4 |
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 2 10:37:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4342ef6d |
| 7 |
|
| 8 |
sys-firmware/edk2-ovmf: Bump |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/712288 |
| 11 |
Bug: https://bugs.gentoo.org/744412 |
| 12 |
Bug: https://bugs.gentoo.org/734146 |
| 13 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
| 14 |
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-firmware/edk2-ovmf/Manifest | 5 +++ |
| 17 |
sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 3 ++ |
| 18 |
...-ovmf-201905.ebuild => edk2-ovmf-202008.ebuild} | 39 ++++++++++++++++------ |
| 19 |
3 files changed, 37 insertions(+), 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest |
| 22 |
index fa1a6639d99..771bdb3c5eb 100644 |
| 23 |
--- a/sys-firmware/edk2-ovmf/Manifest |
| 24 |
+++ b/sys-firmware/edk2-ovmf/Manifest |
| 25 |
@@ -1,3 +1,8 @@ |
| 26 |
+DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812 |
| 27 |
DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d |
| 28 |
DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774 |
| 29 |
DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1 |
| 30 |
+DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8 |
| 31 |
+DIST edk2-ovmf-202008-qemu-firmware.tar.xz 688 BLAKE2B c9e62a79ded7c5f0abebf76e89d588209e2d17d5cd903c62296d0e408d31b3426a13ca189272bea021324a90c9b6d023721119fa55110c0bc1c17b00e4e14e12 SHA512 fad16d6e9cb00577761030b943b5bb2009b784fd99b37dcae1f8091efa48cd83bd99bf691b8e4c53d19bf8df1e2701498b3352a8b6f9fe56414fd75370c29c16 |
| 32 |
+DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666 |
| 33 |
+DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371 |
| 34 |
|
| 35 |
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild |
| 36 |
index 4a71ef4068c..91d22497f89 100644 |
| 37 |
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild |
| 38 |
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild |
| 39 |
@@ -96,6 +96,9 @@ pkg_setup() { |
| 40 |
} |
| 41 |
|
| 42 |
src_prepare() { |
| 43 |
+ sed -i -r \ |
| 44 |
+ -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \ |
| 45 |
+ "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed" |
| 46 |
if [[ ${PV} != "999999" ]] && use binary; then |
| 47 |
eapply_user |
| 48 |
return |
| 49 |
|
| 50 |
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild |
| 51 |
similarity index 73% |
| 52 |
copy from sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild |
| 53 |
copy to sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild |
| 54 |
index 4a71ef4068c..4f3c1c5375d 100644 |
| 55 |
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild |
| 56 |
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild |
| 57 |
@@ -4,7 +4,7 @@ |
| 58 |
EAPI=7 |
| 59 |
|
| 60 |
PYTHON_REQ_USE="sqlite" |
| 61 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
| 62 |
+PYTHON_COMPAT=( python{3_6,3_7,3_8} ) |
| 63 |
|
| 64 |
inherit eutils python-any-r1 readme.gentoo-r1 |
| 65 |
|
| 66 |
@@ -26,17 +26,23 @@ if [[ ${PV} == "999999" ]] ; then |
| 67 |
${NON_BINARY_DEPEND} |
| 68 |
" |
| 69 |
else |
| 70 |
+ BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72" |
| 71 |
+ BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" |
| 72 |
# Binary versions taken from fedora: |
| 73 |
- # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/ |
| 74 |
- # edk2-ovmf-20190501stable-2.fc31.noarch.rpm |
| 75 |
+ # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/e/ |
| 76 |
+ # edk2-ovmf-20200801stable-1.fc34.noarch.rpm |
| 77 |
+ |
| 78 |
+ # TODO: talk with tamiko about unbundling |
| 79 |
SRC_URI=" |
| 80 |
!binary? ( |
| 81 |
https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz |
| 82 |
- https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz |
| 83 |
+ https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz |
| 84 |
+ https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz |
| 85 |
+ https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz |
| 86 |
) |
| 87 |
- binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz ) |
| 88 |
- " |
| 89 |
- KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86" |
| 90 |
+ binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz ) |
| 91 |
+ " |
| 92 |
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
| 93 |
IUSE="+binary" |
| 94 |
REQUIRED_USE+=" |
| 95 |
!amd64? ( binary ) |
| 96 |
@@ -96,9 +102,19 @@ pkg_setup() { |
| 97 |
} |
| 98 |
|
| 99 |
src_prepare() { |
| 100 |
- if [[ ${PV} != "999999" ]] && use binary; then |
| 101 |
- eapply_user |
| 102 |
- return |
| 103 |
+ sed -i -r \ |
| 104 |
+ -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \ |
| 105 |
+ "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed" |
| 106 |
+ if [[ ${PV} != "999999" ]]; then |
| 107 |
+ if use binary; then |
| 108 |
+ eapply_user |
| 109 |
+ return |
| 110 |
+ else |
| 111 |
+ # Bundled submodules |
| 112 |
+ cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/" |
| 113 |
+ cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/" |
| 114 |
+ cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/" |
| 115 |
+ fi |
| 116 |
fi |
| 117 |
default |
| 118 |
} |
| 119 |
@@ -157,6 +173,9 @@ src_install() { |
| 120 |
insinto /usr/share/${PN} |
| 121 |
doins ovmf/* |
| 122 |
|
| 123 |
+ insinto /usr/share/qemu/firmware |
| 124 |
+ doins qemu/* |
| 125 |
+ |
| 126 |
readme.gentoo_create_doc |
| 127 |
} |
Archives