From ea1fd6ba3a5539c5efc7f39858446f67dd8e8112 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 11 Oct 2012 15:28:50 -0700 Subject: [PATCH] Do the symbolic links right in the first place Since brp-symlink relinks symbolic links to enforce a certain policy we should do it right in the first place. So this patch changes find-debuginfo.sh scripts behavior to reflect that policy. Signed-off-by: Jan Blunck --- 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 778fd7a..9925626 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 } # Provide .2, .3, ... symlinks to all filename instances of this build-id. @@ -186,8 +196,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" -- 2.7.4