diff --git a/dwz-compression.patch b/dwz-compression.patch index 9b02e10..6929b5a 100644 --- a/dwz-compression.patch +++ b/dwz-compression.patch @@ -1,25 +1,12 @@ -From 6169f437f24b2bfe85756c433c6e075c1ea3f3c2 Mon Sep 17 00:00:00 2001 -From: marxin -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 +index 73275a11c..3dc438ce5 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) ++ size_before=$(du -sb ${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 @@ -27,11 +14,8 @@ index 73275a11c..51cea8666 100755 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) ++ size_after=$(du -sb ${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 - diff --git a/python-rpm.spec b/python-rpm.spec index 6ca0189..9d4aea2 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # diff --git a/rpm.changes b/rpm.changes index 3c6b196..94e98f6 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 1 12:08:32 UTC 2018 - Martin Liška + +- Update dwz-compression.patch to latest git trunk + (62d901a22b7eb6c86c15290032a41e11427ddf87). + ------------------------------------------------------------------- Mon Sep 17 11:04:48 UTC 2018 - Martin Liška diff --git a/rpm.spec b/rpm.spec index 127bd65..e5ffb02 100644 --- a/rpm.spec +++ b/rpm.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ #