solenv/bin/modules/installer/epmfile.pm | 2 +-
sysui/desktop/freedesktop/freedesktop-menus.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a244beeed618fc4507a65934932a1a6607c62804
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Jan 22 22:00:56 2022 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Jan 23 15:13:03 2022 +0100
change rpm compression algorithm to multi threaded xz
Our baseline is CentOS 7, it's safe to switch to xz that is supported there.
Here is my measurement on rpm package build time and package size on a
48 core machine, however 48 cores were never used (8-10 max). Compared to
reference w9.gzdio which was used before the patch.
Compression Build Package
method time % size %
w9.gzdio 100% 100%
w7T.xzdio 69% 66%
w6T.xzdio 62% 67%
w5T.xzdio 55% 67%
w4T.xzdio 41% 70%
w3T.xzdio 31% 73%
w2T.xzdio 26% 75%
w1T.xzdio 24% 77%
Conclusion: we'd like to optimize rather for the build time, therefore
w1T.xzdio was picked. The package size was still smaller than the reference
size, and the build time was 4x faster (in this measurement 18m16 -> 4m26).
That makes a difference.
Change-Id: Iabb532628d38a2d5091fa41fd08bfee69007d0ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128800
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index ecddeb395712..495366823604 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1193,7 +1193,7 @@ sub set_autoprovreq_in_specfile
close (FINDREQUIRES);
}
- $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define
_binary_payload w9.gzdio\n";
+ $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define
_binary_payload w1T.xzdio\n";
for ( my $i = 0; $i <= $#{$changefile}; $i++ )
{
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index d4858842b8e9..fe79397b3d2d 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -32,7 +32,7 @@ Conflicts: %pkgprefix-mandriva-menus
BuildArch: noarch
AutoReqProv: no
%define _binary_filedigest_algorithm 1
-%define _binary_payload w9.gzdio
+%define _binary_payload w1T.xzdio
%define gnome_dir /usr
