Date: Tuesday, June 7, 2022 @ 10:32:45 Author: dvzrv Revision: 447714
upgpkg: edk2 202205-1: Upgrade to 202205. Upgrade openssl to 1.1.1o. Remove now included patch for adding a missing include. Modified: edk2/trunk/PKGBUILD Deleted: edk2/trunk/edk2-202202-ovmfpkgia32.patch -------------------------------+ PKGBUILD | 23 +++++++++-------------- edk2-202202-ovmfpkgia32.patch | 10 ---------- 2 files changed, 9 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-07 10:23:16 UTC (rev 447713) +++ PKGBUILD 2022-06-07 10:32:45 UTC (rev 447714) @@ -2,11 +2,11 @@ # Contributor: Alexander Epaneshnikov <alex1...@archlinux.org> _brotli_ver=1.0.9 -_openssl_ver=1.1.1n +_openssl_ver=1.1.1o pkgbase=edk2 pkgname=(edk2-armvirt edk2-shell edk2-ovmf) -pkgver=202202 -pkgrel=2 +pkgver=202205 +pkgrel=1 pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications" arch=(any) url="https://github.com/tianocore/edk2" @@ -28,10 +28,9 @@ 81-edk2-ovmf-ia32-on-x86_64.json 82-edk2-ovmf-ia32-on-x86_64-csm.json $pkgbase-202202-brotli.patch - $pkgbase-202202-ovmfpkgia32.patch ) -sha512sums=('200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83' - '1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4' +sha512sums=('0a0d0a8ad7cf23d77d9a6590ccf15e165224c1172e702e61efbf5056b7b62a78ac6dd3bcf2494871c852ee0e69d720db049fdd27e379c21cae64351ec9944428' + '75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23' 'SKIP' 'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5' '603cae145a87bae371bd069d05128beebddb7048e78b93650b19c44b86b2d27cabbcf3bc4c0b2384b862f32383ce7a914a10fc0ad564632bcadd6e4f9389fede' @@ -44,10 +43,9 @@ '8e5eb4e24fad4644a66eb52c95a90a82f01df0af6e57208ad61cb0859dd4425e623e75d93846e8fc3235370a88d93a1d27a512dc4e559bedfe3249404797838b' '7c9f8e7ce7451e7aa852998ffcd3ca95c08083c313dc8dcf0877969ef23d9da6f69c60bb1e652387a223da6e690524fa094bfbaed14d8bdae2853e68530b2f82' '891d3ea36d966114ff1f79c3619675a46b30b68def16ab426f2dee00bd0768f82ca0ee26acd7adedd379f25613e309ec9dfaed4e8a5d3f3e4fa7e8d845f55b18' - 'd074c794796d17d77eed7c34201d93d7ef3f1322fe1ea4a2ddd7137fae884d49f94f465ee39cfd8346b026142668a41f5a8671e521409505dd6d002f71c0eebc' - '5886eb35732c3850071ea903388861b40a50c59a11fc0384ed38413538baf8714d481cb21d23969c997701e9165972a73a7fd80cb49add4b611d5bcf953dff56') -b2sums=('d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354' - 'af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398' + 'd074c794796d17d77eed7c34201d93d7ef3f1322fe1ea4a2ddd7137fae884d49f94f465ee39cfd8346b026142668a41f5a8671e521409505dd6d002f71c0eebc') +b2sums=('27e5d3436ce8c4f9dc406651940211009dff483cece51a939afee26e16ae1c083e0a4e22ffe9b2e67c8a269a9f6f6fe8be898705a1877b4a761b24e7c0ad9d5d' + '5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641' 'SKIP' '8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904' 'fa75566a2ac591fc0c296812f907bfe3fd67f2ee90d3762f0fcae6427df0dfd6260238f5af4fc6b74a76eccfc264db2259db70f8c533871e8b58f37b91a90657' @@ -60,8 +58,7 @@ 'ddacbab89d0fd7831149594487559bb6bac1464b2b5620641043306fabfc37800db8c6d87a833c70ec35c699ea2f35cf09d34028ec7982a94686e8cd97b73300' '99bf35c4042fd5105a3b3b7f71b0aeb18db7811da4ed4481ffec485258619c30d33b08633f9a1c762d383e3bf0191053be9b88b9a4c142350186c6df1261d1f7' 'd45b224c36eda139ca6ad9e4c6c04282724b264dd36a0b3ba904d71476b83e02963c8cadf1f1e1233955071d133dc0defa746740fa08b26398c489fbf6ba89a0' - '644c071dc4fbbccaa64b0b1babcad60395ffce1a7a317a6f5380eff44cbb886be5f29156a8e967ab02b508a33954fcf5602606b43362cc3bb1936a8cfc3a3c07' - '937d507a0ffd9a87a9b008b01f26d4941dc8ee9c3f263fff8d782c8f29c933c8bbd10da9c44ad2ca106befa9db666062d55ed5d7fb793d758c4c8777f5e018c7') + '644c071dc4fbbccaa64b0b1babcad60395ffce1a7a317a6f5380eff44cbb886be5f29156a8e967ab02b508a33954fcf5602606b43362cc3bb1936a8cfc3a3c07') validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <m...@openssl.org> _arch_list=(AARCH64 IA32 X64) _build_type=RELEASE @@ -70,8 +67,6 @@ prepare() { # patch to be able to use brotli 1.0.9 patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-brotli.patch - # reintroduce include accidentally removed in https://github.com/tianocore/edk2/commit/b47575801e1903e8b316d01840572ce2681cf2c6 - patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-ovmfpkgia32.patch cd $pkgbase-$pkgbase-stable$pkgver Deleted: edk2-202202-ovmfpkgia32.patch =================================================================== --- edk2-202202-ovmfpkgia32.patch 2022-06-07 10:23:16 UTC (rev 447713) +++ edk2-202202-ovmfpkgia32.patch 2022-06-07 10:32:45 UTC (rev 447714) @@ -1,10 +0,0 @@ -diff -ruN a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc ---- a/OvmfPkg/OvmfPkgIa32.dsc 2022-02-21 16:19:40.000000000 +0100 -+++ b/OvmfPkg/OvmfPkgIa32.dsc 2022-04-07 14:09:58.762612496 +0200 -@@ -990,3 +990,6 @@ - # - !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc - -+!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE -+ OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf -+!endif