Accepting request 636381 from Base:System

->

OBS-URL: https://build.opensuse.org/request/show/636381
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=265

dwz-compression.patch

@@ -0,0 +1,37 @@
+From 6169f437f24b2bfe85756c433c6e075c1ea3f3c2 Mon Sep 17 00:00:00 2001
+From: marxin <mliska@suse.cz>
+Date: Tue, 28 Aug 2018 11:31:17 +0200
+Subject: [PATCH] Info how beneficial is dwz compression.
+
+Example output:
+...
+original debug info size: 120600, size after compression: 77604
+...
+---
+ scripts/find-debuginfo.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
+index 73275a11c..51cea8666 100755
+--- scripts/find-debuginfo.sh
++++ scripts/find-debuginfo.sh
+@@ -486,6 +486,7 @@ if $run_dwz \
+    && [ -d "${RPM_BUILD_ROOT}/usr/lib/debug" ]; then
+   readarray dwz_files < <(cd "${RPM_BUILD_ROOT}/usr/lib/debug"; find -type f -name \*.debug | LC_ALL=C sort)
+   if [ ${#dwz_files[@]} -gt 0 ]; then
++    size_before=$(du -s ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
+     dwz_multifile_name="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}.${RPM_ARCH}"
+     dwz_multifile_suffix=
+     dwz_multifile_idx=0
+@@ -508,6 +509,8 @@ if $run_dwz \
+       echo >&2 "*** ERROR: DWARF compression requested, but no dwz installed"
+       exit 2
+     fi
++    size_after=$(du -s ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
++    echo "original debug info size: ${size_before}, size after compression: ${size_after}"
+     # Remove .dwz directory if empty
+     rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null
+     if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ]; then
+-- 
+2.18.0
+

rpm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 17 11:04:48 UTC 2018 - Martin Liška <mliska@suse.cz>
+
+- Add upstream patch that prints dwz compression rate
+  new patch: dwz-compression.patch
+
 -------------------------------------------------------------------
 Wed Aug  8 05:12:24 UTC 2018 - bwiedemann@suse.com
 

rpm.spec

@@ -134,6 +134,7 @@ Patch114:       source_date_epoch_buildtime.diff
 Patch115:       safesymlinks.diff
 Patch116:       verifynodup.diff
 Patch117:       findsupplements.diff
+Patch118:       dwz-compression.patch
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 Patch6465:      auto-config-update-riscv64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -231,7 +232,7 @@ rm -f rpmdb/db.h
 %patch                               -P 85
 %patch                   -P 93 -P 94                         -P 99
 %patch -P 100 -P 101 -P 102 -P 103                             -P 108
-%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116 -P 117
+%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116 -P 117 -P 118
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464