Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ovmf for openSUSE:Factory checked in at 2021-04-08 21:02:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ovmf (Old) and /work/SRC/openSUSE:Factory/.ovmf.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovmf" Thu Apr 8 21:02:56 2021 rev:60 rq:883171 version:202102 Changes: -------- --- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes 2021-04-01 14:16:23.315903793 +0200 +++ /work/SRC/openSUSE:Factory/.ovmf.new.2401/ovmf.changes 2021-04-08 21:03:04.249959305 +0200 @@ -1,0 +2,9 @@ +Tue Apr 6 07:04:42 UTC 2021 - Gary Ching-Pang Lin <[email protected]> + +- Add ovmf-disable-brotli.patch to remove brotli since there is no + real user and it requires extra effort to maintain the brotli + submodule tarball + + Drop ovmf-bsc1183713-fix-gcc10-brotli-errors.patch and + brotli-v1.0.7-17-g666c328-c.tar.xz + +------------------------------------------------------------------- Old: ---- brotli-v1.0.7-17-g666c328-c.tar.xz ovmf-bsc1183713-fix-gcc10-brotli-errors.patch New: ---- ovmf-disable-brotli.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ovmf.spec ++++++ --- /var/tmp/diff_new_pack.F1OJaP/_old 2021-04-08 21:03:05.049960169 +0200 +++ /var/tmp/diff_new_pack.F1OJaP/_new 2021-04-08 21:03:05.053960174 +0200 @@ -39,10 +39,8 @@ # berkeley-softfloat-3: https://github.com/ucb-bar/berkeley-softfloat-3 Source6: berkeley-softfloat-3-%{softfloat_version}.tar.xz Source7: descriptors.tar.xz -# brotli: https://github.com/google/brotli, "c" directory only -Source8: brotli-v1.0.7-17-g666c328-c.tar.xz # oniguruma: https://github.com/kkos/oniguruma, "src" directory only -Source9: oniguruma-v6.9.4_mark1-src.tar.xz +Source8: oniguruma-v6.9.4_mark1-src.tar.xz Source100: %{name}-rpmlintrc Source101: gdb_uefi.py.in Source102: gen-key-enrollment-iso.sh @@ -52,7 +50,7 @@ Patch3: %{name}-pie.patch Patch4: %{name}-disable-ia32-firmware-piepic.patch Patch5: %{name}-set-fixed-enroll-time.patch -Patch6: %{name}-bsc1183713-fix-gcc10-brotli-errors.patch +Patch6: %{name}-disable-brotli.patch BuildRequires: bc BuildRequires: cross-arm-binutils BuildRequires: cross-arm-gcc%{gcc_version} @@ -169,6 +167,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # add openssl pushd CryptoPkg/Library/OpensslLib/openssl @@ -183,23 +182,9 @@ # prepare the firmware descriptors for qemu tar -xf %{SOURCE7} -# add brotli -pushd BaseTools/Source/C/BrotliCompress/brotli -tar -xf %{SOURCE8} --strip 1 -# remove the executable bit from files -find . -type f -exec chmod 0644 {} \; -%patch6 -p1 -popd -pushd MdeModulePkg/Library/BrotliCustomDecompressLib/brotli -tar -xf %{SOURCE8} --strip 1 -# remove the executable bit from files -find . -type f -exec chmod 0644 {} \; -%patch6 -p1 -popd - # add oniguruma pushd MdeModulePkg/Universal/RegularExpressionDxe/oniguruma -tar -xf %{SOURCE9} --strip 1 +tar -xf %{SOURCE8} --strip 1 popd chmod +x %{SOURCE102} ++++++ ovmf-disable-brotli.patch ++++++ >From 278d7e48deeaf8fcf2ac347a452c4e7ca0389007 Mon Sep 17 00:00:00 2001 From: Gary Lin <[email protected]> Date: Thu, 1 Apr 2021 17:25:59 +0800 Subject: [PATCH 1/1] Disable brotli The brotli compression/decompression function was never used and it requires additional source tarball for packaging. Remove brotli from building for good. Signed-off-by: Gary Lin <[email protected]> --- BaseTools/Source/C/GNUmakefile | 1 - MdeModulePkg/MdeModulePkg.dec | 3 --- MdeModulePkg/MdeModulePkg.dsc | 1 - 3 files changed, 5 deletions(-) diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile index 8c191e0c3817..3eae824a1c31 100644 --- a/BaseTools/Source/C/GNUmakefile +++ b/BaseTools/Source/C/GNUmakefile @@ -48,7 +48,6 @@ all: makerootdir subdirs LIBRARIES = Common VFRAUTOGEN = VfrCompile/VfrLexer.h APPLICATIONS = \ - BrotliCompress \ VfrCompile \ EfiRom \ GenFfs \ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 148395511034..07952103e6e2 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -24,9 +24,6 @@ [Defines] [Includes] Include -[Includes.Common.Private] - Library/BrotliCustomDecompressLib/brotli/c/include - [LibraryClasses] ## @libraryclass Defines a set of methods to reset whole system. ResetSystemLib|Include/Library/ResetSystemLib.h diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 132fb36d954c..1c9313227b37 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -445,7 +445,6 @@ [Components.IA32, Components.X64, Components.AARCH64] MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf [Components.IA32, Components.X64, Components.ARM, Components.AARCH64] - MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf MdeModulePkg/Core/Dxe/DxeMain.inf { -- 2.29.2
