Search
SailfishOS Open Build Service
>
Projects
>
home:plfiorini
:
maui:devel
:
x86_64
>
rpm
> _service:tar_git:0014-OpenSUSE-finddebuginfo-absolute-links.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File _service:tar_git:0014-OpenSUSE-finddebuginfo-absolute-links.patch of Package rpm
From d9748aa36ecb2a653300ce72fbd6b4b85a325f97 Mon Sep 17 00:00:00 2001 From: David Greaves <david@dgreaves.com> Date: Wed, 17 Apr 2013 20:41:09 +0000 Subject: [PATCH] OpenSUSE-finddebuginfo-absolute-links --- scripts/find-debuginfo.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh index 0625d3c..c2cb46d 100644 --- a/scripts/find-debuginfo.sh +++ b/scripts/find-debuginfo.sh @@ -133,7 +133,17 @@ debug_link() local l="/usr/lib/debug$2" local t="$1" echo >> "$LINKSFILE" "$l $t" - link_relative "$t" "$l" "$RPM_BUILD_ROOT" + + # this should correspond to what brp-symlink is doing + case $t in + /usr*) + link_relative "$t" "$l" "$RPM_BUILD_ROOT" + ;; + *) + mkdir -p "$(dirname "$RPM_BUILD_ROOT$l")" && \ + ln -snf "$t" "$RPM_BUILD_ROOT$l" + ;; + esac } # Compare two binaries but ignore the .note.gnu.build-id section @@ -167,8 +177,8 @@ make_id_link() local other=$(readlink -m "$root_idfile") other=${other#$RPM_BUILD_ROOT} - if cmp -s "$root_idfile" "$RPM_BUILD_ROOT$file" || - elfcmp "$root_idfile" "$RPM_BUILD_ROOT$file" ; then + if cmp -s "$RPM_BUILD_ROOT$other" "$RPM_BUILD_ROOT$file" || + elfcmp "$RPM_BUILD_ROOT$other" "$RPM_BUILD_ROOT$file" ; then # Two copies. Maybe one has to be setuid or something. echo >&2 "*** WARNING: identical binaries are copied, not linked:" echo >&2 " $file" -- 1.8.3-rc3