bin/pack-debug | 6 +++---
solenv/bin/modules/installer/epmfile.pm | 2 +-
sysui/desktop/freedesktop/freedesktop-menus.spec | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 74a04d020dc1215b2008afd84d57a91115b9a90a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jan 23 12:17:50 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jan 23 12:20:42 2022 +0100
[cp] set w1T.xzdio rpm compression in bin/pack-debug, too
Change-Id: I6d808c9ba9b5353dd74e41fced2f134f1ad70501
diff --git a/bin/pack-debug b/bin/pack-debug
index 9a6f384035e3..3e9b3fd2a6c0 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -105,7 +105,7 @@ cat $DEBUGSRC | awk '
# debug build source package
- rpmbuild -bb --define "_unpackaged_files_terminate_build 0"
${DEBUGSRC}-debugsource --target $build_cpu --buildroot=$buildroot
+ rpmbuild -bb --define "_unpackaged_files_terminate_build 0" --define
"_binary_payload w1T.xzdio" ${DEBUGSRC}-debugsource --target $build_cpu
--buildroot=$buildroot
###################################################################
echo create rpm debug info packages by processing logged spec files
@@ -155,7 +155,7 @@ do
# stripped package
- rpmbuild -bb --define "_unpackaged_files_terminate_build 0" $i
--target $build_cpu --buildroot=$buildroot
+ rpmbuild -bb --define "_unpackaged_files_terminate_build 0" --define
"_binary_payload w1T.xzdio" $i --target $build_cpu --buildroot=$buildroot
rm -rf $buildroot
mv $buildroot.copy $buildroot
mkdir -p $topdir/RPMS/BUILD $topdir/RPMS/RPMS
@@ -173,7 +173,7 @@ do
# create debug info package
- rpmbuild -bb --define "_unpackaged_files_terminate_build 0"
${i}-debuginfo --target $build_cpu --buildroot=$buildroot
+ rpmbuild -bb --define "_unpackaged_files_terminate_build 0" --define
"_binary_payload w1T.xzdio" ${i}-debuginfo --target $build_cpu
--buildroot=$buildroot
fi
done
commit 5621a75f5ce1fe9f6b7712a7acdf8873d08d6592
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Jan 22 22:00:56 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jan 23 12:20:42 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
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index d699e46e03ed..7b5a5da77198 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 3afa0600de08..2452a44b99dc 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -33,7 +33,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
