Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package edk2 for openSUSE:Factory checked in at 2022-05-20 17:50:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/edk2 (Old) and /work/SRC/openSUSE:Factory/.edk2.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "edk2" Fri May 20 17:50:30 2022 rev:3 rq:978092 version:0.0~20220516T160923~03d1c51272 Changes: -------- --- /work/SRC/openSUSE:Factory/edk2/edk2.changes 2021-06-06 22:40:10.871343995 +0200 +++ /work/SRC/openSUSE:Factory/.edk2.new.1538/edk2.changes 2022-05-20 17:50:57.483238683 +0200 @@ -1,0 +2,15 @@ +Thu May 19 08:05:04 UTC 2022 - Guillaume GARDET <[email protected]> + +- Update to stable202205-rc1 to fix build with GCC12: + * changelog: not available for *-rcX + * changelog from skipped 202108: + https://github.com/tianocore/edk2/releases/tag/edk2-stable202108 + * changelog from skipped 202111: + https://github.com/tianocore/edk2/releases/tag/edk2-stable202111 + * changelog from skipped 202202: + https://github.com/tianocore/edk2/releases/tag/edk2-stable202202 +- Update edk2-platforms to version 0.0~20220516T160923~03d1c51272 +- Update edk2-non-osi to version 0.0~20220407T181805~6996a45 +- Update openssl to 1.1.1n + +------------------------------------------------------------------- Old: ---- edk2-non-osi-0.0~20210520T182705~2e8dd46.tar.xz edk2-platforms-0.0~20210602T151109~1d23831b5f.tar.xz edk2-stable202105.tar.gz openssl-1.1.1j.tar.gz openssl-1.1.1j.tar.gz.asc submodule-BaseTools-Source-C-BrotliCompress-brotli.zip submodule-MdeModulePkg-Library-BrotliCustomDecompressLib-brotli.zip New: ---- brotli-0.0~20220110T130810~f4153a0.tar.xz edk2-non-osi-0.0~20220407T181805~6996a45.tar.xz edk2-platforms-0.0~20220516T160923~03d1c51272.tar.xz edk2-stable202205-rc1.tar.gz openssl-1.1.1n.tar.gz openssl-1.1.1n.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ edk2.spec ++++++ --- /var/tmp/diff_new_pack.Tl4Nfh/_old 2022-05-20 17:50:59.707240707 +0200 +++ /var/tmp/diff_new_pack.Tl4Nfh/_new 2022-05-20 17:50:59.711240711 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,10 @@ %define platform @BUILD_FLAVOR@%{nil} -%define edk2_platforms_version 0.0~20210602T151109~1d23831b5f -%define edk2_non_osi_version 0.0~20210520T182705~2e8dd46 -%global openssl_version 1.1.1j +%define edk2_platforms_version 0.0~20220516T160923~03d1c51272 +%define edk2_non_osi_version 0.0~20220407T181805~6996a45 +%define brotli_version 0.0~20220110T130810~f4153a0 +%global openssl_version 1.1.1n # Build with edk2-non-osi %bcond_without edk2_non_osi @@ -32,22 +33,24 @@ %define build_mode RELEASE %endif +# This differs on RC +%define archive_version 202205-rc1 + %if "%{platform}" != "%{nil}" Name: edk2-%{platform} %else Name: edk2 %endif -Version: 202105 +Version: 0.0~20220516T160923~03d1c51272 Release: 0 Summary: Firmware required to run the %{platform} License: SUSE-Firmware Group: System/Boot URL: https://github.com/tianocore/edk2 -Source0: https://github.com/tianocore/edk2/archive/edk2-stable%{version}.tar.gz +Source0: https://github.com/tianocore/edk2/archive/edk2-stable%{archive_version}.tar.gz Source1: edk2-platforms-%{edk2_platforms_version}.tar.xz Source2: edk2-non-osi-%{edk2_non_osi_version}.tar.xz -Source3: https://github.com/tianocore/edk2/releases/download/edk2-stable%{version}/submodule-BaseTools-Source-C-BrotliCompress-brotli.zip -Source4: https://github.com/tianocore/edk2/releases/download/edk2-stable%{version}/submodule-MdeModulePkg-Library-BrotliCustomDecompressLib-brotli.zip +Source3: brotli-%{brotli_version}.tar.xz Source10: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz Source11: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz.asc Source12: openssl.keyring @@ -77,9 +80,11 @@ Firmware required to run the %{platform} %prep -%setup -q -n edk2-edk2-stable%{version} -a 1 -a 2 -a 3 -a 4 -# PATCH-FIX-UPSTREAM - Fix build with GCC11 - https://bugzilla.tianocore.org/show_bug.cgi?id=3417 -echo "BUILD_CFLAGS += -Wno-error=vla-parameter" >> BaseTools/Source/C/BrotliCompress/GNUmakefile +%setup -q -n edk2-edk2-stable%{archive_version} -a 1 -a 2 -a 3 + +# Fix path of the brotli submodules +cp -R brotli-%{brotli_version}/* BaseTools/Source/C/BrotliCompress/brotli/ +cp -R brotli-%{brotli_version}/* MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/ ln -sf edk2-platforms-%{edk2_platforms_version} edk2-platforms ln -sf edk2-non-osi-%{edk2_non_osi_version} edk2-non-osi @@ -87,8 +92,6 @@ # add openssl pushd CryptoPkg/Library/OpensslLib/openssl tar -xf %{SOURCE10} --strip 1 -# Fix 1.1.1d error: -sed -i 's/return return 0;/return 0;/' crypto/threads_none.c popd %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Tl4Nfh/_old 2022-05-20 17:50:59.779240773 +0200 +++ /var/tmp/diff_new_pack.Tl4Nfh/_new 2022-05-20 17:50:59.783240777 +0200 @@ -6,7 +6,7 @@ <param name="scm">git</param> <param name="filename">edk2-platforms</param> <param name="versionformat">0.0~%ci~%h</param> - <param name="revision">1d23831b5f07a1150a44e1d03fb7e0c394dfe9ab</param> + <param name="revision">03d1c51272c053c0b7ef8d3a16fabd26d7c51d8c</param> </service> <service name="recompress" mode="disabled"> <param name="file">*edk2-platforms*.tar</param> @@ -18,12 +18,24 @@ <param name="scm">git</param> <param name="filename">edk2-non-osi</param> <param name="versionformat">0.0~%ci~%h</param> - <param name="revision">2e8dd46782451e8ae7181417a5c30d1804302b43</param> + <param name="revision">6996a45d7f4014fd4aa0f1eb4cbe97d8a3c5957a</param> </service> <service name="recompress" mode="disabled"> <param name="file">*edk2-non-osi*.tar</param> <param name="compression">xz</param> </service> + + <service name="tar_scm" mode="disabled"> + <param name="url">https://github.com/google/brotli</param> + <param name="scm">git</param> + <param name="filename">brotli</param> + <param name="versionformat">0.0~%ci~%h</param> + <param name="revision">f4153a09f87cbb9c826d8fc12c74642bb2d879ea</param> + </service> + <service name="recompress" mode="disabled"> + <param name="file">*brotli*.tar</param> + <param name="compression">xz</param> + </service> </services> ++++++ edk2-non-osi-0.0~20210520T182705~2e8dd46.tar.xz -> edk2-non-osi-0.0~20220407T181805~6996a45.tar.xz ++++++ /work/SRC/openSUSE:Factory/edk2/edk2-non-osi-0.0~20210520T182705~2e8dd46.tar.xz /work/SRC/openSUSE:Factory/.edk2.new.1538/edk2-non-osi-0.0~20220407T181805~6996a45.tar.xz differ: char 15, line 1 ++++++ edk2-platforms-0.0~20210602T151109~1d23831b5f.tar.xz -> edk2-platforms-0.0~20220516T160923~03d1c51272.tar.xz ++++++ /work/SRC/openSUSE:Factory/edk2/edk2-platforms-0.0~20210602T151109~1d23831b5f.tar.xz /work/SRC/openSUSE:Factory/.edk2.new.1538/edk2-platforms-0.0~20220516T160923~03d1c51272.tar.xz differ: char 15, line 1
