Michael Schröder
cebe6dd1a8
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From: Jan Blunck <jblunck@suse.de>
|
|
Subject: 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 <jblunck@suse.de>
|
|
|
|
--- ./scripts/find-debuginfo.sh.orig 2011-05-11 15:36:05.000000000 +0000
|
|
+++ ./scripts/find-debuginfo.sh 2011-05-11 15:58:17.000000000 +0000
|
|
@@ -124,7 +124,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
|
|
@@ -158,8 +168,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"
|