115 lines
5.0 KiB
Diff
115 lines
5.0 KiB
Diff
From 201b856c02aeb3c4fc6b3a8b96ce8817278f4fbf Mon Sep 17 00:00:00 2001
|
|
From: Mark Wielaard <mark@klomp.org>
|
|
Date: Mon, 26 Jun 2017 13:35:48 +0200
|
|
Subject: [PATCH 42/54] Update find-debuginfo.sh options and macros
|
|
documentation.
|
|
|
|
This adds some missing documentation for rpm macros and find-debuginfo.sh
|
|
options that were recently added (or renamed). -j N, --build-id-seed SEED,
|
|
--unique-debug-suffix SUFFIX and --unique-debug-src-base BASE.
|
|
|
|
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
|
(cherry picked from commit 173e5642a97c535f8bdaac5bf88854a103cc125b)
|
|
---
|
|
macros.in | 14 ++++++++------
|
|
scripts/find-debuginfo.sh | 28 ++++++++++++++++++++++------
|
|
2 files changed, 30 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/macros.in b/macros.in
|
|
index 0c055a7fd..2a114ccd7 100644
|
|
--- a/macros.in
|
|
+++ b/macros.in
|
|
@@ -514,8 +514,9 @@ package or when debugging this package.\
|
|
|
|
# Whether build-ids should be made unique between package version/releases
|
|
# when generating debuginfo packages. If set to 1 this will pass
|
|
-# --ver-rel "%{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.
|
|
+# --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
|
|
|
|
# Do not recompute build-ids but keep whatever is in the ELF file already.
|
|
@@ -525,15 +526,16 @@ package or when debugging this package.\
|
|
|
|
# Whether .debug files should be made unique between package version,
|
|
# release and architecture. If set to 1 this will pass
|
|
-# --unique-debug-arch "%{_arch}" to find-debuginfo.sh to create
|
|
-# debuginfo files which end in -<ver>-<rel>.<arch>.debug
|
|
+# --unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch} find-debuginfo.sh
|
|
+# to create debuginfo files which end in -<ver>-<rel>.<arch>.debug
|
|
# Requires _unique_build_ids.
|
|
%_unique_debug_names 1
|
|
|
|
# Whether the /usr/debug/src/<package> directories should be unique between
|
|
# package version, release and architecture. If set to 1 this will pass
|
|
-# --unique-debug-src-base "%{name}" to find-debuginfo.sh to name the
|
|
-# directory under /usr/debug/src as <name>-<ver>-<rel>.<arch>
|
|
+# --unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}" to
|
|
+# find-debuginfo.sh to name the directory under /usr/debug/src as
|
|
+# <name>-<ver>-<rel>.<arch>.
|
|
%_unique_debug_srcs 1
|
|
|
|
# Whether rpm should put debug source files into its own subpackage
|
|
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
|
|
index 3bfc15a79..185d25f96 100644
|
|
--- a/scripts/find-debuginfo.sh
|
|
+++ b/scripts/find-debuginfo.sh
|
|
@@ -3,11 +3,14 @@
|
|
#for inclusion in an rpm spec file.
|
|
#
|
|
# Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r] [-m] [-i] [-n]
|
|
+# [-j N]
|
|
# [-o debugfiles.list]
|
|
# [-S debugsourcefiles.list]
|
|
# [--run-dwz] [--dwz-low-mem-die-limit N]
|
|
# [--dwz-max-die-limit N]
|
|
-# [--build-id-seed VERSION-RELEASE]
|
|
+# [--build-id-seed SEED]
|
|
+# [--unique-debug-suffix SUFFIX]
|
|
+# [--unique-debug-src-base BASE]
|
|
# [[-l filelist]... [-p 'pattern'] -o debuginfo.list]
|
|
# [builddir]
|
|
#
|
|
@@ -19,6 +22,9 @@
|
|
# The -i flag says to include a .gdb_index section in the .debug file.
|
|
# The -n flag says to not recompute the build-id.
|
|
#
|
|
+# The -j N option will spawn N processes to do the debuginfo extraction
|
|
+# in parallel.
|
|
+#
|
|
# A single -o switch before any -l or -p switches simply renames
|
|
# the primary output file from debugfiles.list to something else.
|
|
# A -o switch that follows a -p switch or some -l switches produces
|
|
@@ -31,11 +37,21 @@
|
|
# 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.
|
|
#
|
|
-# If --build-id-seed VERSION-RELEASE is given then debugedit is called to
|
|
-# update the build-ids it finds adding the VERSION-RELEASE string as
|
|
-# seed to recalculate the build-id hash. This makes sure the
|
|
-# build-ids in the ELF files are unique between versions and releases
|
|
-# of the same package.
|
|
+# 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
|
|
+# the build-id hash. This makes sure the build-ids in the ELF files
|
|
+# are unique between versions and releases of the same package.
|
|
+# (Use --build-id-seed "%{VERSION}-%{RELEASE}".)
|
|
+#
|
|
+# If --unique-debug-suffix SUFFIX is given then the debug files created
|
|
+# for <FILE> will be named <FILE>-<SUFFIX>.debug. This makes sure .debug
|
|
+# are unique between package version, release and architecture.
|
|
+# (Use --unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch}".)
|
|
+#
|
|
+# If --unique-debug-src-base BASE is given then the source directory
|
|
+# will be called /usr/debug/src/<BASE>. This makes sure the debug source
|
|
+# directories are unique between package version, release and architecture.
|
|
+# (Use --unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}".)
|
|
#
|
|
# All file names in switches are relative to builddir (. if not given).
|
|
#
|
|
--
|
|
2.13.2
|
|
|