diff options
| author |   Tomáš Mózes <hydrapolic@gmail.com> | 2023-04-18 15:07:03 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-04-19 07:06:47 +0100 |
| commit | 3ac65c3cafe4259c50ec0c05a7ce755af950dc1d (patch) | |
| tree | 1c9fec6a0743abe373df576a5b015769e16fe70d /app-emulation/xen-tools | |
| parent | dev-util/maturin: drop 0.14.16 (diff) | |
| download | gentoo-3ac65c3cafe4259c50ec0c05a7ce755af950dc1d.tar.gz gentoo-3ac65c3cafe4259c50ec0c05a7ce755af950dc1d.tar.bz2 gentoo-3ac65c3cafe4259c50ec0c05a7ce755af950dc1d.zip | |
app-emulation/xen-tools: use latest ovmf snapshot
Closes: https://github.com/gentoo/gentoo/pull/30642
Closes: https://bugs.gentoo.org/892872
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/xen-tools')
| -rw-r--r-- | app-emulation/xen-tools/Manifest | 3 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild | 25 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild | 15 |
3 files changed, 14 insertions, 29 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index ba263e641129..b39785c51919 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,7 +1,10 @@ DIST OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e +DIST OpenSSL_1_1_1t.tar.gz 10061233 BLAKE2B aef89c338644230305bcc75dbc13d6799a04ed8c712b6aed07a782703031e977c3e300924f26e5854d0b89ecf39d2d516a50838167754e8f63322fba51de9478 SHA512 f28a323fd78be0b16ae6db9a8f163e64c74410e12ddd1a9836dfdda34c264112184f4e22583c84b6fa56716e5aaac9cb860cb183bd3d0cb064091eea1e21815e DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812 +DIST brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz 512229 BLAKE2B cd86cc2cc7eefad24f87cda8006409bf764922b5f23ccfb951e7a41214b12004ce532b11f94f5fb858b3bf71f9abf8ef17ba219fa96bd5be23b51873afad0fd5 SHA512 7f48e794e738b31c2005e7cef6d8c0cc0d543f1cd8c137ae8ba14602cac2873de6299a3f32ad52be869f513e7548341353ed049609daef1063975694d9a9b80b DIST edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz 13998677 BLAKE2B 3614ceb69e295a6afb37c7905d0aec3534d8daf3d9f22137c1b722da6dc764a3669d99af03f96155d45feb5058a6f725acf37d1048186fecff4232d64f96e97c SHA512 a1933d815b947fd4f13c96970a6dc36c3048e3ddf27c897684104b0129cf58331e46d3147062ae1fb8973f08cd373c319788dd850ac5e45da385eed8368571a4 +DIST edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz 15245558 BLAKE2B 33876c08040fa876b4e3741fe859d113654013c948fa8a8b391955226e6215bbbe26fc484e56ba5b399d2c4e4d198900f2de42eccfbac6901e01cd73a80e803b SHA512 7d71ec3d98c652b86194607dbcab767160c708991f49f69eda1f5d844ced0c4842e849d19bf99ea09b1db523b91ced1e5552a4ddcea32b94b9db6b8f6f5c5931 DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8084abaf93a4ab06ba170427a66dab08e68ba1288f42ea744e2cbc66d6bd2294bee82f6d0994260d2cd60daf6a6068e40eb74fdeba2bccaa432d090d81fd9db SHA512 4ac1d07ce879a3a8c6c260380258c37f5e4ecddc880b27fb59afc38fbf3718e81b04a4dda2b58fe7a438a23175e00b6179fc067acbc4a75e33d93c4b85ff5d68 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146 DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f diff --git a/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild index 00ad2555a8f4..2d77d2480d06 100644 --- a/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild @@ -17,10 +17,10 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~x86" SEABIOS_VER="1.16.0" - EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5" - EDK2_OPENSSL_VERSION="1_1_1j" + EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b" + EDK2_OPENSSL_VERSION="1_1_1t" EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" + EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea" IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb" XEN_GENTOO_PATCHSET_NUM=2 @@ -268,15 +268,6 @@ src_prepare() { cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - - # Bug #816987 - pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null - eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch" - popd > /dev/null - - pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null - eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch" - popd > /dev/null fi # ipxe @@ -385,11 +376,11 @@ src_prepare() { # Remove -Werror find . -type f \( -name Makefile -o -name "*.mk" \) \ - -exec sed -i \ - -e 's/-Werror //g' \ - -e '/^CFLAGS *+= -Werror$/d' \ - -e 's/, "-Werror"//' \ - {} + || die + -exec sed -i \ + -e 's/-Werror //g' \ + -e '/^CFLAGS *+= -Werror$/d' \ + -e 's/, "-Werror"//' \ + {} + || die default } diff --git a/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild index 0ad9e03de6f4..2c7afcb524d9 100644 --- a/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild @@ -17,10 +17,10 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~x86" SEABIOS_VER="1.16.0" - EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5" - EDK2_OPENSSL_VERSION="1_1_1j" + EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b" + EDK2_OPENSSL_VERSION="1_1_1t" EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" + EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea" IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb" XEN_GENTOO_PATCHSET_NUM=0 @@ -268,15 +268,6 @@ src_prepare() { cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - - # Bug #816987 - pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null - eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch" - popd > /dev/null - - pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null - eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch" - popd > /dev/null fi # ipxe |