From: "Vadim Misbakh-Soloviov" <mva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
Date: Fri, 2 Oct 2020 10:38:09 +0000 (UTC) [thread overview]
Message-ID: <1601635078.4342ef6d64286089e4a4b25dca5b15a5edb53dca.mva@gentoo> (raw)
commit: 4342ef6d64286089e4a4b25dca5b15a5edb53dca
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 10:37:58 2020 +0000
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 10:37:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4342ef6d
sys-firmware/edk2-ovmf: Bump
Bug: https://bugs.gentoo.org/712288
Bug: https://bugs.gentoo.org/744412
Bug: https://bugs.gentoo.org/734146
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>
sys-firmware/edk2-ovmf/Manifest | 5 +++
sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 3 ++
...-ovmf-201905.ebuild => edk2-ovmf-202008.ebuild} | 39 ++++++++++++++++------
3 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index fa1a6639d99..771bdb3c5eb 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,3 +1,8 @@
+DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
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 edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
+DIST edk2-ovmf-202008-qemu-firmware.tar.xz 688 BLAKE2B c9e62a79ded7c5f0abebf76e89d588209e2d17d5cd903c62296d0e408d31b3426a13ca189272bea021324a90c9b6d023721119fa55110c0bc1c17b00e4e14e12 SHA512 fad16d6e9cb00577761030b943b5bb2009b784fd99b37dcae1f8091efa48cd83bd99bf691b8e4c53d19bf8df1e2701498b3352a8b6f9fe56414fd75370c29c16
+DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
+DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 4a71ef4068c..91d22497f89 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -96,6 +96,9 @@ pkg_setup() {
}
src_prepare() {
+ sed -i -r \
+ -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+ "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
if [[ ${PV} != "999999" ]] && use binary; then
eapply_user
return
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
similarity index 73%
copy from sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
copy to sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 4a71ef4068c..4f3c1c5375d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
inherit eutils python-any-r1 readme.gentoo-r1
@@ -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
+ https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
)
- 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 )
+ "
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+binary"
REQUIRED_USE+="
!amd64? ( binary )
@@ -96,9 +102,19 @@ pkg_setup() {
}
src_prepare() {
- if [[ ${PV} != "999999" ]] && use binary; then
- eapply_user
- return
+ sed -i -r \
+ -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+ "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+ 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 +173,9 @@ src_install() {
insinto /usr/share/${PN}
doins ovmf/*
+ insinto /usr/share/qemu/firmware
+ doins qemu/*
+
readme.gentoo_create_doc
}
next reply other threads:[~2020-10-02 10:38 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-02 10:38 Vadim Misbakh-Soloviov [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-10 16:33 [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/ James Le Cuirot
2024-10-10 16:33 James Le Cuirot
2024-08-13 12:41 Joonas Niilola
2024-08-04 7:44 Joonas Niilola
2024-07-03 21:08 Matthias Maier
2023-08-28 19:32 Sam James
2023-08-28 19:10 Sam James
2023-08-17 7:49 Andrew Ammerlaan
2022-12-08 22:25 John Helmert III
2022-12-05 19:48 Arthur Zamarin
2022-12-02 19:27 Arthur Zamarin
2022-12-02 18:50 Arthur Zamarin
2022-12-02 18:50 Arthur Zamarin
2022-09-27 3:27 John Helmert III
2022-09-27 3:27 John Helmert III
2022-09-27 3:27 John Helmert III
2022-09-06 22:39 John Helmert III
2022-05-19 12:19 WANG Xuerui
2022-01-23 8:05 Yixun Lan
2022-01-04 0:02 Matthias Maier
2022-01-04 0:02 Matthias Maier
2021-10-08 18:49 Agostino Sarubbo
2021-10-08 1:57 Sam James
2021-10-07 19:44 Sam James
2021-10-07 6:02 Agostino Sarubbo
2021-06-27 7:52 Matthias Maier
2021-06-27 7:52 Matthias Maier
2021-06-26 22:23 Matthias Maier
2021-05-31 20:18 Michał Górny
2021-04-04 23:09 Matthias Maier
2021-04-04 23:07 Matthias Maier
2021-03-11 17:03 Ben Kohler
2020-12-23 1:30 Thomas Deutschmann
2020-12-23 1:28 Thomas Deutschmann
2020-11-07 3:49 Georgy Yakovlev
2020-10-13 10:01 Agostino Sarubbo
2020-10-13 9:26 Agostino Sarubbo
2020-10-11 23:44 Sam James
2020-10-02 13:56 Vadim Misbakh-Soloviov
2020-10-02 11:06 Vadim Misbakh-Soloviov
2020-10-02 10:53 Vadim Misbakh-Soloviov
2020-08-19 22:40 Sam James
2020-02-10 13:26 Michał Górny
2019-08-19 11:37 Agostino Sarubbo
2019-08-18 21:51 Agostino Sarubbo
2019-07-28 23:17 Matthias Maier
2019-07-28 23:17 Matthias Maier
2019-07-28 23:17 Matthias Maier
2019-07-28 23:17 Matthias Maier
2019-07-22 9:28 Michał Górny
2018-03-30 16:51 Aaron Bauman
2018-02-12 0:42 Matthias Maier
2018-02-12 0:42 Matthias Maier
2017-12-12 18:01 Matthias Maier
2017-09-01 1:09 Matthias Maier
2017-08-13 12:36 David Seifert
2017-05-06 6:09 Matthias Maier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1601635078.4342ef6d64286089e4a4b25dca5b15a5edb53dca.mva@gentoo \
--to=mva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox