Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2021-04-29 01:36:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Thu Apr 29 01:36:22 2021 rev:289 rq:887970 version:4.16.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2021-04-19 21:05:36.599994349
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.12324/rpm.changes 2021-04-29
01:36:26.854412361 +0200
@@ -0,0 +1,6 @@
+Tue Apr 16 07:49:37 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Use --dwz-single-file-mode for packages that use
+ baselibs.conf mechanism.
+- Add add-dwz-single-file-mode-option.patch patch.
+
New:
----
add-dwz-single-file-mode-option.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.kVlSx7/_old 2021-04-29 01:36:27.954413921 +0200
+++ /var/tmp/diff_new_pack.kVlSx7/_new 2021-04-29 01:36:27.958413926 +0200
@@ -128,6 +128,7 @@
Patch129: ndbglue.diff
Patch130: dwarf5.diff
Patch131: posttrans.diff
+Patch132: add-dwz-single-file-mode-option.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -256,6 +257,7 @@
%patch -P 100 -P 102 -P 103
%patch -P 109 -P 117
%patch -P 122 -P 123 -P 129 -P 130 -P 131
+%patch132 -p1
%ifarch aarch64 ppc64le riscv64
%patch6464
++++++ add-dwz-single-file-mode-option.patch ++++++
>From d741374effd75baaa35047c29c7a8adf819138ff Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Mon, 15 Mar 2021 16:58:34 +0100
Subject: [PATCH] Add --dwz-single-file-mode argument for find-debuginfo.sh.
Sometime it's handy to disable multi-file mode and the patch
adds option for that: --dwz-single-file-mode.
It will be used in openSUSE for packages that use baselibs.conf
mechanism.
---
scripts/find-debuginfo.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index e0c36ebb6..2503b0f01 100755
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -10,6 +10,7 @@
# [-S debugsourcefiles.list]
# [--run-dwz] [--dwz-low-mem-die-limit N]
# [--dwz-max-die-limit N]
+# [--dwz-single-file-mode]
# [--build-id-seed SEED]
# [--unique-debug-suffix SUFFIX]
# [--unique-debug-src-base BASE]
@@ -45,6 +46,8 @@
# The --run-dwz flag instructs find-debuginfo.sh to run the dwz utility
# if available, and --dwz-low-mem-die-limit and --dwz-max-die-limit
# provide detailed limits. See dwz(1) -l and -L option for details.
+# Use --dwz-single-file-mode to disable multi-file mode, see -m
+# for more details.
#
# If --build-id-seed SEED is given then debugedit is called to
# update the build-ids it finds adding the SEED as seed to recalculate
@@ -96,6 +99,7 @@ no_recompute_build_id=false
run_dwz=false
dwz_low_mem_die_limit=
dwz_max_die_limit=
+dwz_single_file_mode=false
# build id seed given by the --build-id-seed option
build_id_seed=
@@ -129,6 +133,9 @@ while [ $# -gt 0 ]; do
dwz_max_die_limit=$2
shift
;;
+ --dwz-single-file-mode)
+ dwz_single_file_mode=true
+ ;;
--build-id-seed)
build_id_seed=$2
shift
@@ -523,7 +530,7 @@ if $run_dwz \
done
dwz_multifile_name="${dwz_multifile_name}${dwz_multifile_suffix}"
dwz_opts="-h -q -r"
- [ ${#dwz_files[@]} -gt 1 ] \
+ [ ${#dwz_files[@]} -gt 1 ] && [ "$dwz_single_file_mode" = "false" ] \
&& dwz_opts="${dwz_opts} -m .dwz/${dwz_multifile_name}"
mkdir -p "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz"
[ -n "${dwz_low_mem_die_limit}" ] \
++++++ macrosin.diff ++++++
--- /var/tmp/diff_new_pack.kVlSx7/_old 2021-04-29 01:36:28.118414153 +0200
+++ /var/tmp/diff_new_pack.kVlSx7/_new 2021-04-29 01:36:28.118414153 +0200
@@ -1,11 +1,10 @@
--- ./macros.in.orig 2020-09-30 12:42:09.146057387 +0000
+++ ./macros.in 2020-09-30 12:45:30.517611707 +0000
-@@ -177,7 +177,7 @@
- %{?_unique_build_ids:--build-id-seed "%{VERSION}-%{RELEASE}"} \\\
+@@ -168,6 +168,7 @@
%{?_unique_debug_names:--unique-debug-suffix
"-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
%{?_unique_debug_srcs:--unique-debug-src-base
"%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
-- %{?_find_debuginfo_dwz_opts} \\\
-+ %{lua:if not posix.access(rpm.expand("%_sourcedir/baselibs.conf"), "r")
then print(rpm.expand("%{?_find_debuginfo_dwz_opts}")) end} \\\
+ %{?_find_debuginfo_dwz_opts} \\\
++ %{lua:if posix.access(rpm.expand("%_sourcedir/baselibs.conf"), "r") then
print("--dwz-single-file-mode") end} \\\
%{?_find_debuginfo_opts} \\\
%{?_debugsource_packages:-S debugsourcefiles.list} \\\
"%{_builddir}/%{?buildsubdir}"\
