Attachment 594198 Details for Bug 834073 – Updated patch against current rpm fedora package

[patch] Updated patch against current rpm fedora package

0001-Support-minidebuginfo.patch (text/plain), 5.04 KB, created by Alexander Larsson on 2012-06-25 14:30:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Larsson

Created: 2012-06-25 14:30:26 UTC

Size: 5.04 KB

patch

obsolete

>From 917d15e20db7fae7043d3d63813741b93f431ae8 Mon Sep 17 00:00:00 2001
>From: Alexander Larsson <alexl@redhat.com>
>Date: Mon, 25 Jun 2012 16:28:13 +0200
>Subject: [PATCH] Support minidebuginfo
>
>---
> rpm-4.10.0-minidebuginfo.patch |   99 ++++++++++++++++++++++++++++++++++++++++
> rpm.spec                       |    3 ++
> 2 files changed, 102 insertions(+)
> create mode 100644 rpm-4.10.0-minidebuginfo.patch
>
>diff --git a/rpm-4.10.0-minidebuginfo.patch b/rpm-4.10.0-minidebuginfo.patch
>new file mode 100644
>index 0000000..6beb4da
>--- /dev/null
>+++ b/rpm-4.10.0-minidebuginfo.patch
>@@ -0,0 +1,99 @@
>+diff -up rpm-4.10.0/macros.in.minidebuginfo rpm-4.10.0/macros.in
>+--- rpm-4.10.0/macros.in.minidebuginfo	2012-06-25 16:03:09.690041063 +0200
>++++ rpm-4.10.0/macros.in	2012-06-25 16:04:47.645512891 +0200
>+@@ -176,7 +176,7 @@
>+ #	the script.  See the script for details.
>+ #
>+ %__debug_install_post   \
>+-   %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
>++   %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_dwz_opts} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
>+ %{nil}
>+ 
>+ #	Template for debug information sub-package.
>+@@ -425,6 +425,12 @@ package or when debugging this package.\
>+ #%_missing_build_ids_terminate_build	1
>+ 
>+ #
>++# Include minimal debug information in build binaries.
>++# Requires _enable_debug_packages.
>++#
>++#%_include_minidebuginfo	1
>++
>++#
>+ # Use internal dependency generator rather than external helpers?
>+ %_use_internal_dependency_generator	1
>+ 
>+diff -up rpm-4.10.0/scripts/find-debuginfo.sh.minidebuginfo rpm-4.10.0/scripts/find-debuginfo.sh
>+--- rpm-4.10.0/scripts/find-debuginfo.sh.minidebuginfo	2012-06-25 16:03:09.690041063 +0200
>++++ rpm-4.10.0/scripts/find-debuginfo.sh	2012-06-25 16:06:08.331254605 +0200
>+@@ -2,7 +2,7 @@
>+ #find-debuginfo.sh - automagically generate debug info and file list
>+ #for inclusion in an rpm spec file.
>+ #
>+-# Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r]
>++# Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r] [-m]
>+ #	 		   [-o debugfiles.list]
>+ #			   [--run-dwz] [--dwz-low-mem-die-limit N]
>+ #			   [--dwz-max-die-limit N]
>+@@ -35,6 +35,9 @@ strip_g=false
>+ # with -r arg, pass --reloc-debug-sections to eu-strip.
>+ strip_r=false
>+ 
>++# with -m arg, add minimal debuginfo to binary.
>++include_minidebug=false
>++
>+ # Barf on missing build IDs.
>+ strict=false
>+ 
>+@@ -65,6 +68,9 @@ while [ $# -gt 0 ]; do
>+   -g)
>+     strip_g=true
>+     ;;
>++  -m)
>++    include_minidebug=true
>++    ;;
>+   -o)
>+     if [ -z "${lists[$nout]}" -a -z "${ptns[$nout]}" ]; then
>+       out=$2
>+@@ -127,6 +133,32 @@ strip_to_debug()
>+   chmod 444 "$1" || exit
>+ }
>+ 
>++add_minidebug()
>++{
>++  local debuginfo="$1"
>++  local binary="$2"
>++
>++  local dynsyms=`mktemp`
>++  local funcsyms=`mktemp`
>++  local keep_symbols=`mktemp`
>++  local mini_debuginfo=`mktemp`
>++
>++  # Extract the dynamic symbols from the main binary, there is no need to also have these
>++  # in the normal symbol table
>++  nm -D "$binary" --format=posix --defined-only | awk '{ print $1 }' | sort > "$dynsyms"
>++  # Extract all the text (i.e. function) symbols from the debuginfo 
>++  nm "$debuginfo" --format=posix --defined-only | awk '{ if ($2 == "T" || $2 == "t") print $1 }' | sort > "$funcsyms"
>++  # Keep all the function symbols not already in the dynamic symbol table
>++  comm -13 "$dynsyms" "$funcsyms" > "$keep_symbols"
>++  # Copy the full debuginfo, keeping only a minumal set of symbols and removing some unnecessary sections
>++  objcopy -S --remove-section .gdb_index --remove-section .comment --keep-symbols="$keep_symbols" "$debuginfo" "$mini_debuginfo" &> /dev/null
>++  #Inject the compressed data into the .gnu_debugdata section of the original binary
>++  xz "$mini_debuginfo"
>++  mini_debuginfo="${mini_debuginfo}.xz"
>++  objcopy --add-section .gnu_debugdata="$mini_debuginfo" "$binary"
>++  rm -f "$dynsyms" "$funcsyms" "$keep_symbols" "$mini_debuginfo"
>++}
>++
>+ # Make a relative symlink to $1 called $3$2
>+ shopt -s extglob
>+ link_relative()
>+@@ -282,6 +314,8 @@ while read nlinks inum f; do
>+     chmod u-w "$f"
>+   fi
>+ 
>++  $include_minidebug && add_minidebug "${debugfn}" "$f"
>++
>+   if [ -n "$id" ]; then
>+     make_id_link "$id" "$dn/$(basename $f)"
>+     make_id_link "$id" "/usr/lib/debug$dn/$bn" .debug
>diff --git a/rpm.spec b/rpm.spec
>index 45632d4..8530e8d 100644
>--- a/rpm.spec
>+++ b/rpm.spec
>@@ -53,6 +53,8 @@ Patch302: rpm-4.7.1-geode-i686.patch
> Patch304: rpm-4.9.1.1-ld-flags.patch
> # Compressed debuginfo support (#833311)
> Patch305: rpm-4.10.0-dwz-debuginfo.patch
>+# Minidebuginfo support
>+Patch306: rpm-4.10.0-minidebuginfo.patch
> # Temporary Patch to provide support for updates
> Patch400: rpm-4.9.1.2-rpmlib-filesystem-check.patch
> 
>@@ -220,6 +222,7 @@ packages on a system.
> %patch302 -p1 -b .geode
> %patch304 -p1 -b .ldflags
> %patch305 -p1 -b .dwz-debuginfo
>+%patch306 -p1 -b .minidebuginfo
> 
> %patch400 -p1 -b .rpmlib-filesystem-check
> 
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 834073: 593296 | 593297 | 594198