X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-debuginfo.patch;h=949bdf27c44b51579108baa54e4da4e5b1f6ec20;hb=480435db45e1073681cae3b138bc0fb7139e26bb;hp=a08ef0e4eb479185d8cf1a8fb9c49266a9968af7;hpb=d68708d13fa5e28142a4edf58a8fd491cb85b72d;p=packages%2Frpm.git diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch index a08ef0e..949bdf2 100644 --- a/rpm-debuginfo.patch +++ b/rpm-debuginfo.patch @@ -1,25 +1,15 @@ ---- rpm-4.3/macros.in.alreadey_patched 2004-05-31 16:47:32.496632272 +0200 -+++ rpm-4.3/macros.in 2004-05-31 16:46:14.976417136 +0200 -@@ -107,12 +107,16 @@ - # The location of the rpm database file(s) after "rpm --rebuilddb". - %_dbpath_rebuild %{_dbpath} +--- rpm-5.3.1/scripts/find-debuginfo.sh.wiget 2009-09-10 03:52:13.000000000 +0200 ++++ rpm-5.3.1/scripts/find-debuginfo.sh 2010-05-30 16:53:33.275994510 +0200 +@@ -92,8 +92,10 @@ strip_to_debug() + esac + [ -n "$EXCLUDE_FULL_REGEXP" ] && grep -E -q "$EXCLUDE_FULL_REGEXP" <<< "$2" && g=-g --# --# Path to script that creates debug symbols in a /usr/lib/debug --# shadow tree. --%__debug_install_post \ -- @RPMCONFIGDIR@/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\ --%{nil} -+#------------------------------------------------------------------ -+# Path to script that creates debug symbols in a /usr/lib/debug -+# shadow tree. -+#%no_debug_install_post 1 -+%__debug_install_post { \ -+%{!?no_debug_install_post: \ -+ /usr/lib/rpm/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\ -+ %{nil}\ -+} } -+#------------------------------------------------------------------ +- eu-strip --remove-comment $g $([ -n "$DISABLE_DEBUG" ] || echo -f "$1") "$2" || exit +- [ -n "$DISABLE_DEBUG" ] || chmod 444 "$1" || exit ++ [ -n "$DISABLE_DEBUG" ] && return ++ objcopy --only-keep-debug --remove-section .comment "$2" "$1" || exit ++ objcopy --add-gnu-debuglink="$1" "$2" || exit ++ chmod 444 "$1" || exit + } - # Template for debug information sub-package. - %debug_package \ + # Make a relative symlink to $1 called $3$2