From f91976ad2a93a6bd859938566ed8ec610103b91f29311ebda030b2b555c97cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Mon, 17 Oct 2022 11:14:44 +0000 Subject: [PATCH] Accepting request 1005609 from home:coolo:branches:home:coolo:alp - Update the macros file to simplify the debuginfo installation We don't support parallel installation of the same debuginfo - and so don't patch the binaries to create unique build ids (easing pressure on reproducable builds when compiling twice) Patching this in rpm-config-SUSE is technically not possible (as you can't reliable undefine things defined in upstream macro). We tried in https://github.com/openSUSE/rpm-config-SUSE/pull/59 and /60: OBS-URL: https://build.opensuse.org/request/show/1005609 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=620 --- build.specials.obscpio | 3 +++ macrosin.diff | 53 +++++++++++++++++++++++++++++++----------- rpm.changes | 13 +++++++++++ 3 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 build.specials.obscpio diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..5d7d8cf --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1f8cf9360a17af0ecb689d96397b3f9cc6e72ccac987119daa4aae3b1a897f6 +size 1196 diff --git a/macrosin.diff b/macrosin.diff index bd97fd4..0e5dcc1 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -1,6 +1,8 @@ ---- macros.in.orig 2021-09-23 19:13:54.532045005 +0000 -+++ macros.in 2021-09-23 19:13:59.592034687 +0000 -@@ -170,6 +170,7 @@ +Index: macros.in +=================================================================== +--- macros.in.orig ++++ macros.in +@@ -148,6 +148,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} \\\ @@ -8,7 +10,7 @@ %{?_find_debuginfo_opts} \\\ %{?_debugsource_packages:-S debugsourcefiles.list} \\\ "%{_builddir}/%{?buildsubdir}"\ -@@ -209,7 +210,8 @@ package or when debugging this package.\ +@@ -187,7 +188,8 @@ package or when debugging this package.\ %endif\ %{nil} @@ -18,7 +20,7 @@ %_defaultlicensedir %{_datadir}/licenses # Following macros for filtering auto deps must not be used in spec files. -@@ -269,7 +271,8 @@ package or when debugging this package.\ +@@ -247,7 +249,8 @@ package or when debugging this package.\ %_tmppath %{_var}/tmp # Path to top of build area. @@ -28,7 +30,7 @@ #============================================================================== # ---- Optional rpmrc macros. -@@ -371,7 +374,7 @@ package or when debugging this package.\ +@@ -349,7 +352,7 @@ package or when debugging this package.\ # "w.ufdio" uncompressed # #%_source_payload w9.gzdio @@ -37,7 +39,7 @@ # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. -@@ -481,6 +484,19 @@ package or when debugging this package.\ +@@ -459,6 +462,19 @@ package or when debugging this package.\ # #%_include_minidebuginfo 1 @@ -57,7 +59,7 @@ # # Include a .gdb_index section in the .debug files. # Requires _enable_debug_packages and gdb-add-index installed. -@@ -513,7 +529,7 @@ package or when debugging this package.\ +@@ -491,39 +507,39 @@ package or when debugging this package.\ # Same as for "separate" but if the __debug_package global is set then # the -debuginfo package will have a compatibility link for the main # ELF /usr/lib/debug/.build-id/xx/yyy -> /usr/lib/.build-id/xx/yyy @@ -66,8 +68,33 @@ # Whether build-ids should be made unique between package version/releases # when generating debuginfo packages. If set to 1 this will pass -@@ -542,10 +558,10 @@ package or when debugging this package.\ - %_unique_debug_srcs 1 + # --build-id-seed "%{VERSION}-%{RELEASE}" to find-debuginfo.sh which will + # pass it onto debugedit --build-id-seed to be used to prime the build-id + # note hash. +-%_unique_build_ids 1 ++#%_unique_build_ids 1 + + # Do not recompute build-ids but keep whatever is in the ELF file already. + # Cannot be used together with _unique_build_ids (which forces recomputation). + # Defaults to undefined (unset). +-#%_no_recompute_build_ids 1 ++%_no_recompute_build_ids 1 + + # Whether .debug files should be made unique between package version, + # release and architecture. If set to 1 this will pass + # --unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch} find-debuginfo.sh + # to create debuginfo files which end in --..debug + # Requires _unique_build_ids. +-%_unique_debug_names 1 ++#%_unique_debug_names 1 + + # Whether the /usr/debug/src/ directories should be unique between + # package version, release and architecture. If set to 1 this will pass + # --unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}" to + # find-debuginfo.sh to name the directory under /usr/debug/src as + # --.. +-%_unique_debug_srcs 1 ++#%_unique_debug_srcs 1 # Whether rpm should put debug source files into its own subpackage -#%_debugsource_packages 1 @@ -79,7 +106,7 @@ # # Use internal dependency generator rather than external helpers? -@@ -564,6 +584,7 @@ package or when debugging this package.\ +@@ -542,6 +558,7 @@ package or when debugging this package.\ %__find_requires %{_rpmconfigdir}/find-requires #%__find_conflicts ??? #%__find_obsoletes ??? @@ -87,7 +114,7 @@ # # Path to file attribute classifications for automatic dependency -@@ -948,7 +969,7 @@ package or when debugging this package.\ +@@ -926,7 +943,7 @@ package or when debugging this package.\ %_build_vendor %{_host_vendor} %_build_os %{_host_os} %_host @host@ @@ -96,7 +123,7 @@ %_host_cpu @host_cpu@ %_host_vendor @host_vendor@ %_host_os @host_os@ -@@ -1067,11 +1088,13 @@ package or when debugging this package.\ +@@ -1045,11 +1062,13 @@ package or when debugging this package.\ #------------------------------------------------------------------------------ # arch macro for all supported 32-bit ARM processors diff --git a/rpm.changes b/rpm.changes index 8c24f07..946cae0 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Sep 23 11:06:06 UTC 2022 - Stephan Kulow + +- Update the macros file to simplify the debuginfo installation + + We don't support parallel installation of the same debuginfo - and so + don't patch the binaries to create unique build ids (easing pressure + on reproducable builds when compiling twice) + + Patching this in rpm-config-SUSE is technically not possible (as you + can't reliable undefine things defined in upstream macro). We tried in + https://github.com/openSUSE/rpm-config-SUSE/pull/59 and /60: + ------------------------------------------------------------------- Mon Sep 12 08:15:22 UTC 2022 - Dirk Müller