From 83cd444a41310580c15e59078c1d1f4be954d48e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 30 Jul 2021 16:18:49 +0800 Subject: [PATCH] rpm: enable dwz this change reverts 9132269421b34ef774c708b2179ec5fd6bd2290d back then, we were using rpm < 4.13, which does not support the feature of "Debugsource and debuginfo sub-packages", but per https://bugzilla.redhat.com/show_bug.cgi?id=185590. rpm >= 4.13 has this feature. see also http://rpm.org/wiki/Releases/4.13.0 in CentOS 8, RPM v4.14.3 is available. and by inspecting the log when building ceph packages on CentOS 8, we have: Wrote: /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-6524-g4e868f9a/rpm/el8/RPMS/x86_64/ceph-debugsource-17.0.0-6524.g4e868f9a.el8.x86_64.rpm Wrote: /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-6524-g4e868f9a/rpm/el8/RPMS/x86_64/ceph-base-debuginfo-17.0.0-6524.g4e868f9a.el8.x86_64.rpm Wrote: /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-6524-g4e868f9a/rpm/el8/RPMS/x86_64/ceph-common-debuginfo-17.0.0-6524.g4e868f9a.el8.x86_64.rpm Wrote: /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-6524-g4e868f9a/rpm/el8/RPMS/x86_64/ceph-mds-debuginfo-17.0.0-6524.g4e868f9a.el8.x86_64.rpm .... build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-6524-g4e868f9a/rpm/el8/RPMS/x86_64/ceph-test-debuginfo-17.0.0-6524.g4e868f9a.el8.x86_64.rpm so, rpmbuild does generate debuginfo package for each binary package. this should make the life of valgrind a lot easier when reading the dwz -- no need to read the debuginfo of all the packages, only the .dwz of the related subpackage is read. this change should help to decrease the size of debuginfo rpm packages a little bit. see https://tracker.ceph.com/issues/19099#note-7 this change was inspired by Yuanming Chai See-also: https://tracker.ceph.com/issues/19099 Signed-off-by: Kefu Chai --- ceph.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 4d4082394d469..84ae73d3dd7a4 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -112,8 +112,6 @@ %{!?python3_version_nodots: %global python3_version_nodots 3} %{!?python3_version: %global python3_version 3} -# disable dwz which compresses the debuginfo -%global _find_debuginfo_dwz_opts %{nil} %if ! 0%{?suse_version} # use multi-threaded xz compression: xz level 7 using ncpus threads %global _source_payload w7T%{_smp_build_ncpus}.xzdio -- 2.39.5