|
 |
aca4330 |
--- rpm-4.9.0/scripts/find-debuginfo.sh 2011-02-19 07:57:21.000000000 +0100
|
|
|
aca4330 |
+++ rpm-4.9.0/scripts/find-debuginfo.sh.orig 2011-02-19 08:50:23.000000000 +0100
|
|
|
aca4330 |
@@ -127,6 +127,23 @@ debug_link()
|
|
|
aca4330 |
link_relative "$t" "$l" "$RPM_BUILD_ROOT"
|
|
|
aca4330 |
}
|
|
|
aca4330 |
|
|
|
aca4330 |
+# Provide .2, .3, ... symlinks to all filename instances of this build-id.
|
|
|
aca4330 |
+make_id_dup_link()
|
|
|
aca4330 |
+{
|
|
|
aca4330 |
+ local id="$1" file="$2" idfile
|
|
|
aca4330 |
+
|
|
|
aca4330 |
+ local n=1
|
|
|
aca4330 |
+ while true; do
|
|
|
aca4330 |
+ idfile=".build-id/${id:0:2}/${id:2}.$n"
|
|
|
aca4330 |
+ [ $# -eq 3 ] && idfile="${idfile}$3"
|
|
|
aca4330 |
+ if [ ! -L "$RPM_BUILD_ROOT/usr/lib/debug/$idfile" ]; then
|
|
|
aca4330 |
+ break
|
|
|
aca4330 |
+ fi
|
|
|
aca4330 |
+ n=$[$n+1]
|
|
|
aca4330 |
+ done
|
|
|
aca4330 |
+ debug_link "$file" "/$idfile"
|
|
|
aca4330 |
+}
|
|
|
aca4330 |
+
|
|
|
aca4330 |
# Make a build-id symlink for id $1 with suffix $3 to file $2.
|
|
|
aca4330 |
make_id_link()
|
|
|
aca4330 |
{
|
|
|
aca4330 |
@@ -140,6 +157,8 @@ make_id_link()
|
|
|
aca4330 |
return
|
|
|
aca4330 |
fi
|
|
|
aca4330 |
|
|
|
aca4330 |
+ make_id_dup_link "$@"
|
|
|
aca4330 |
+
|
|
|
aca4330 |
[ $# -eq 3 ] && return 0
|
|
|
aca4330 |
|
|
|
aca4330 |
local other=$(readlink -m "$root_idfile")
|
|
|
aca4330 |
@@ -188,6 +207,9 @@ while read nlinks inum f; do
|
|
|
aca4330 |
if [ $nlinks -gt 1 ]; then
|
|
|
aca4330 |
eval linked=\$linked_$inum
|
|
|
aca4330 |
if [ -n "$linked" ]; then
|
|
|
aca4330 |
+ eval id=\$linkedid_$inum
|
|
|
aca4330 |
+ make_id_dup_link "$id" "$dn/$(basename $f)"
|
|
|
aca4330 |
+ make_id_dup_link "$id" "/usr/lib/debug$dn/$bn" .debug
|
|
|
aca4330 |
link=$debugfn
|
|
|
aca4330 |
get_debugfn "$linked"
|
|
|
aca4330 |
echo "hard linked $link to $debugfn"
|
|
|
aca4330 |
@@ -202,6 +224,9 @@ while read nlinks inum f; do
|
|
|
aca4330 |
echo "extracting debug info from $f"
|
|
|
aca4330 |
id=$(/usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug \
|
|
|
aca4330 |
-i -l "$SOURCEFILE" "$f") || exit
|
|
|
aca4330 |
+ if [ $nlinks -gt 1 ]; then
|
|
|
aca4330 |
+ eval linkedid_$inum=\$id
|
|
|
aca4330 |
+ fi
|
|
|
aca4330 |
if [ -z "$id" ]; then
|
|
|
aca4330 |
echo >&2 "*** ${strict_error}: No build ID note found in $f"
|
|
|
aca4330 |
$strict && exit 2
|