pool/rpm
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 512652 from home:rguenther:branches:Base:System

Browse Source 
- Amend finddebuginfo.diff to adjust readelf -Wn pattern matching
  to account for fixed readelf no longer emitting spurious newlines
  with -W.

OBS-URL: https://build.opensuse.org/request/show/512652
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=399
This commit is contained in:
Richard Biener 2017-07-26 12:48:33 +00:00 committed by Git OBS Bridge
parent f269f39efc
commit 22321f4dde
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
finddebuginfo.diff
View File

@ -1,5 +1,7 @@
--- ./scripts/find-debuginfo.sh.orig 2016-11-03 09:10:28.922784796 +0000 Index: scripts/find-debuginfo.sh
+++ ./scripts/find-debuginfo.sh 2017-01-19 12:32:12.596821861 +0000 ===================================================================
--- scripts/find-debuginfo.sh.orig 2017-02-16 10:54:14.779025209 +0100
+++ scripts/find-debuginfo.sh 2017-07-26 14:39:24.338122534 +0200
@@ -224,6 +224,20 @@ make_id_dup_link() @@ -224,6 +224,20 @@ make_id_dup_link()
debug_link "$file" "/$idfile" debug_link "$file" "/$idfile"
} }
@ -100,6 +102,15 @@
# strip -g implies we have full symtab, don't add mini symtab in that case. # strip -g implies we have full symtab, don't add mini symtab in that case.
$strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
@@ -366,7 +402,7 @@ if $run_dwz && type dwz >/dev/null 2>&1
rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null
if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ]; then
id="`readelf -Wn "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" \
- 2>/dev/null | sed -n 's/^ Build ID: \([0-9a-f]\+\)/\1/p'`"
+ 2>/dev/null | sed -n 's/^.* Build ID: \([0-9a-f]\+\)/\1/p'`"
[ -n "$id" ] \
&& make_id_link "$id" "/usr/lib/debug/.dwz/${dwz_multifile_name}" .debug
fi
@@ -399,12 +435,14 @@ if [ -s "$SOURCEFILE" ]; then @@ -399,12 +435,14 @@ if [ -s "$SOURCEFILE" ]; then
# stupid cpio creates new directories in mode 0700, fixup # stupid cpio creates new directories in mode 0700, fixup
find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 | find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 |

7
rpm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 26 12:39:40 UTC 2017 - rguenther@suse.com
- Amend finddebuginfo.diff to adjust readelf -Wn pattern matching
to account for fixed readelf no longer emitting spurious newlines
with -W.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 10 12:03:08 UTC 2017 - dimstar@opensuse.org Mon Jul 10 12:03:08 UTC 2017 - dimstar@opensuse.org