Use system provided debugedit

Debugedit is split into a separate package, use it.

References:
  https://sourceware.org/bugzilla/show_bug.cgi?id=27351
  http://lists.rpm.org/pipermail/rpm-ecosystem/2021-February/000734.html
  https://sourceware.org/debugedit/
This commit is contained in:
Виталий Чикунов 2021-04-29 21:50:16 +03:00
parent 4ceb43a3b9
commit 89e3f8b764
3 changed files with 4 additions and 3 deletions

View File

@ -92,6 +92,7 @@ BuildPreReq: rpm >= 3.0.6-ipl24mdk, %_bindir/subst
# For debugedit.
BuildPreReq: elfutils-devel
BuildRequires: librpm-devel
BuildRequires: debugedit
# Automatically added by buildreq on Thu Apr 23 2009 and edited manually.
BuildRequires: libdb4.7-devel libelf-devel liblzma-devel libpopt-devel zlib-devel

View File

@ -65,7 +65,7 @@ while read -r f; do
# Save canonical file name for later symlinks filtering.
readlink -ve "$debugf" >> .tmp/files-can
id=$(@RPMCONFIGDIR@/debugedit -n -i "$debugf")
id=$(debugedit -n -i "$debugf")
[ -n "$id" ] || continue
link=./usr/lib/debug/.build-id/${id:0:2}/${id:2}

View File

@ -62,7 +62,7 @@ for pat in ${RPM_BRP_STRIP_NONE-}; do
done
timestamp=$(date --iso-8601=ns --reference="$f")
@RPMCONFIGDIR@/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l .tmp/src.$$ "$f"
debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l .tmp/src.$$ "$f"
if [ ! -s .tmp/src.$$ ] && [ -x /usr/bin/eu-elfcompress ]; then
# debugedit has failed to extract sources list, possibly
# due to ELF compression - uncompress and try again.
@ -78,7 +78,7 @@ if [ ! -s .tmp/src.$$ ] && [ -x /usr/bin/eu-elfcompress ]; then
rm .tmp/sections.$$
if [ -n "$zmode" ]; then
LD_ORIGIN_PATH=/usr/bin eu-elfcompress --type=none "$f"
@RPMCONFIGDIR@/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l .tmp/src.$$ "$f"
debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l .tmp/src.$$ "$f"
LD_ORIGIN_PATH=/usr/bin eu-elfcompress --type=$zmode "$f"
fi
fi