diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-07-31 15:59:37 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-07-31 15:59:37 +0000 |
commit | 95f4a65377873884359993157ed076a0ced741cf (patch) | |
tree | 22bbcc436f5a65eab123b1efa49f7d1854f00819 | |
parent | 69a10925ff12a71f90c6fb304a6d70573634d561 (diff) | |
download | rpm-setup-95f4a65377873884359993157ed076a0ced741cf.tar rpm-setup-95f4a65377873884359993157ed076a0ced741cf.tar.gz rpm-setup-95f4a65377873884359993157ed076a0ced741cf.tar.bz2 rpm-setup-95f4a65377873884359993157ed076a0ced741cf.tar.xz rpm-setup-95f4a65377873884359993157ed076a0ced741cf.zip |
use upstream find-debuginfo.sh as we merged our changes back into rpm package
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | UPSTREAM | 7 | ||||
-rw-r--r-- | build.macros.in | 2 | ||||
-rwxr-xr-x | find-debuginfo.sh | 473 |
5 files changed, 3 insertions, 482 deletions
diff --git a/Makefile.am b/Makefile.am index eba404a..56e39cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,6 @@ pkg_scripts = \ drop-ld-no-undefined-for-shared-lib-modules-in-libtool \ filter.sh \ find-lang.pl \ - find-debuginfo.sh \ fix-dlsearch-path-in-libtool-for-multilib \ fix-libtool-from-moving-options-after-libs \ fix-libtool-ltmain-from-overlinking \ @@ -1,3 +1,5 @@ +- use upstream find-debuginfo.sh as we merged our changes back into rpm package + Version 1.153 - 31 Jul 2012, by Thierry Vignaud - shrunk debug packages through using dwz (https://fedoraproject.org/wiki/Features/DwarfCompressor) @@ -5,13 +5,6 @@ Those that could be replaced by patches: - brp-compress: + we default to bzip2 instead of gzip -- find-debuginfo.sh: (only Mageia pluses) - + EXCLUDE_FROM_FULL_STRIP environment variable so that we can exclude files - from being completely stripped, but for their debugging symbols. - + allow for for only stripping files without creating debug package contents - by setting DISABLE_DEBUG environment variable - + check real debug directory - ~ minidebug (merged soon) Other divergences: diff --git a/build.macros.in b/build.macros.in index 1992ba1..fc10155 100644 --- a/build.macros.in +++ b/build.macros.in @@ -308,7 +308,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o %{nil} %__debug_install_post \ - @RPMVENDORDIR@/find-debuginfo.sh %{?_find_debuginfo_dwz_opts} %{?_include_minidebuginfo:-m} "%{_builddir}/%{?buildsubdir}"\ + @RPMLIBDIR@/find-debuginfo.sh %{?_find_debuginfo_dwz_opts} %{?_include_minidebuginfo:-m} "%{_builddir}/%{?buildsubdir}"\ %{nil} diff --git a/find-debuginfo.sh b/find-debuginfo.sh deleted file mode 100755 index 0feb1c0..0000000 --- a/find-debuginfo.sh +++ /dev/null @@ -1,473 +0,0 @@ -#!/bin/bash -#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] [-m] -# [-o debugfiles.list] -# [--run-dwz] [--dwz-low-mem-die-limit N] -# [--dwz-max-die-limit N] -# [[-l filelist]... [-p 'pattern'] -o debuginfo.list] -# [builddir] -# -# The -g flag says to use strip -g instead of full strip on DSOs. -# The --strict-build-id flag says to exit with failure status if -# any ELF binary processed fails to contain a build-id note. -# The -r flag says to use eu-strip --reloc-debug-sections. -# -# A single -o switch before any -l or -p switches simply renames -# the primary output file from debugfiles.list to something else. -# A -o switch that follows a -p switch or some -l switches produces -# an additional output file with the debuginfo for the files in -# the -l filelist file, or whose names match the -p pattern. -# The -p argument is an grep -E -style regexp matching the a file name, -# and must not use anchors (^ or $). -# -# The --run-dwz flag instructs find-debuginfo.sh to run the dwz utility -# if available, and --dwz-low-mem-die-limit and --dwz-max-die-limit -# provide detailed limits. See dwz(1) -l and -L option for details. -# -# All file names in switches are relative to builddir (. if not given). -# - -# With -g arg, pass it to strip on libraries. -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 - -# DWZ parameters. -run_dwz=false -dwz_low_mem_die_limit= -dwz_max_die_limit= - -BUILDDIR=. -out=debugfiles.list -nout=0 -while [ $# -gt 0 ]; do - case "$1" in - --strict-build-id) - strict=true - ;; - --run-dwz) - run_dwz=true - ;; - --dwz-low-mem-die-limit) - dwz_low_mem_die_limit=$2 - shift - ;; - --dwz-max-die-limit) - dwz_max_die_limit=$2 - shift - ;; - -g) - strip_g=true - ;; - -m) - include_minidebug=true - ;; - -o) - if [ -z "${lists[$nout]}" -a -z "${ptns[$nout]}" ]; then - out=$2 - else - outs[$nout]=$2 - ((nout++)) - fi - shift - ;; - -l) - lists[$nout]="${lists[$nout]} $2" - shift - ;; - -p) - ptns[$nout]=$2 - shift - ;; - -r) - strip_r=true - ;; - *) - BUILDDIR=$1 - shift - break - ;; - esac - shift -done - -i=0 -while ((i < nout)); do - outs[$i]="$BUILDDIR/${outs[$i]}" - l='' - for f in ${lists[$i]}; do - l="$l $BUILDDIR/$f" - done - lists[$i]=$l - ((++i)) -done - -LISTFILE="$BUILDDIR/$out" -SOURCEFILE="$BUILDDIR/debugsources.list" -LINKSFILE="$BUILDDIR/debuglinks.list" - -> "$SOURCEFILE" -> "$LISTFILE" -> "$LINKSFILE" - -debugdir="${RPM_BUILD_ROOT}/usr/lib/debug" - -strip_to_debug() -{ - local g= - local r= - $strip_r && r=--reloc-debug-sections - $strip_g && case "$(file -bi "$2")" in - application/x-sharedlib*) g=-g ;; - esac - [ -n "$EXCLUDE_FULL_REGEXP" ] && grep -E -q "$EXCLUDE_FULL_REGEXP" <<< "$2" && g=-g - eu-strip --remove-comment $r $g $([ -n "$DISABLE_DEBUG" ] || echo -f "$1") "$2" || exit - [ -n "$DISABLE_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() -{ - local t="$1" f="$2" pfx="$3" - local fn="${f#/}" tn="${t#/}" - local fd td d - - while fd="${fn%%/*}"; td="${tn%%/*}"; [ "$fd" = "$td" ]; do - fn="${fn#*/}" - tn="${tn#*/}" - done - - d="${fn%/*}" - if [ "$d" != "$fn" ]; then - d="${d//+([!\/])/..}" - tn="${d}/${tn}" - fi - - mkdir -p "$(dirname "$pfx$f")" && ln -snf "$tn" "$pfx$f" -} - -# Make a symlink in /usr/lib/debug/$2 to $1 -debug_link() -{ - local l="/usr/lib/debug$2" - local t="$1" - echo >> "$LINKSFILE" "$l $t" - link_relative "$t" "$l" "$RPM_BUILD_ROOT" -} - -# Provide .2, .3, ... symlinks to all filename instances of this build-id. -make_id_dup_link() -{ - local id="$1" file="$2" idfile - - local n=1 - while true; do - idfile=".build-id/${id:0:2}/${id:2}.$n" - [ $# -eq 3 ] && idfile="${idfile}$3" - if [ ! -L "$RPM_BUILD_ROOT/usr/lib/debug/$idfile" ]; then - break - fi - n=$[$n+1] - done - debug_link "$file" "/$idfile" -} - -# Make a build-id symlink for id $1 with suffix $3 to file $2. -make_id_link() -{ - local id="$1" file="$2" - local idfile=".build-id/${id:0:2}/${id:2}" - [ $# -eq 3 ] && idfile="${idfile}$3" - local root_idfile="$RPM_BUILD_ROOT/usr/lib/debug/$idfile" - - if [ ! -L "$root_idfile" ]; then - debug_link "$file" "/$idfile" - return - fi - - make_id_dup_link "$@" - - [ $# -eq 3 ] && return 0 - - local other=$(readlink -m "$root_idfile") - other=${other#$RPM_BUILD_ROOT} - if cmp -s "$root_idfile" "$RPM_BUILD_ROOT$file" || - eu-elfcmp -q "$root_idfile" "$RPM_BUILD_ROOT$file" 2> /dev/null; then - # Two copies. Maybe one has to be setuid or something. - echo >&2 "*** WARNING: identical binaries are copied, not linked:" - echo >&2 " $file" - echo >&2 " and $other" - else - # This is pathological, break the build. - echo >&2 "*** ERROR: same build ID in nonidentical files!" - echo >&2 " $file" - echo >&2 " and $other" - exit 2 - fi -} - -get_debugfn() -{ - dn=$(dirname "${1#$RPM_BUILD_ROOT}") - bn=$(basename "$1" .debug).debug - - debugdn=${debugdir}${dn} - debugfn=${debugdn}/${bn} -} - -set -o pipefail - -strict_error=ERROR -$strict || strict_error=WARNING - -[[ -n "$EXCLUDE_FROM_STRIP" ]] && \ -EXCLUDE_REGEXP=`perl -e 'print "(", join("|", @ARGV), ")"' $EXCLUDE_FROM_STRIP` -[[ -n "$EXCLUDE_FROM_FULL_STRIP" ]] && \ -EXCLUDE_FULL_REGEXP=`perl -e 'print "(", join("|", @ARGV), ")"' $EXCLUDE_FROM_FULL_STRIP` - -echo $EXCLUDE_REGEXP -# Strip ELF binaries -find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \ - \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \ - -print | -file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' | -xargs --no-run-if-empty stat -c '%h %D_%i %n' | -while read nlinks inum f; do - [[ -n "$EXCLUDE_REGEXP" ]] && grep -E -q "$EXCLUDE_REGEXP" <<< "$f" && \ - continue - [ -n "$DISABLE_DEBUG" ] && strip_to_debug "" "$f" && continue - - get_debugfn "$f" - [ -f "${debugfn}" ] && continue - - # If this file has multiple links, keep track and make - # the corresponding .debug files all links to one file too. - if [ $nlinks -gt 1 ]; then - eval linked=\$linked_$inum - if [ -n "$linked" ]; then - eval id=\$linkedid_$inum - make_id_dup_link "$id" "$dn/$(basename $f)" - make_id_dup_link "$id" "/usr/lib/debug$dn/$bn" .debug - link=$debugfn - get_debugfn "$linked" - echo "hard linked $link to $debugfn" - mkdir -p "$(dirname "$link")" && ln -nf "$debugfn" "$link" - continue - else - eval linked_$inum=\$f - echo "file $f has $[$nlinks - 1] other hard links" - fi - fi - - echo "extracting debug info from $f" - - id=$(/usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug \ - -i -l "$SOURCEFILE" "$f") || exit - if [ $nlinks -gt 1 ]; then - eval linkedid_$inum=\$id - fi - if [ -z "$id" ]; then - echo >&2 "*** ${strict_error}: No build ID note found in $f" - $strict && exit 2 - fi - - [ -x /usr/bin/gdb-add-index ] && /usr/bin/gdb-add-index "$f" > /dev/null 2>&1 - - # A binary already copied into /usr/lib/debug doesn't get stripped, - # just has its file names collected and adjusted. - case "$dn" in - /usr/lib/debug/*) - [ -z "$id" ] || make_id_link "$id" "$dn/$(basename $f)" - continue ;; - esac - - mkdir -p "${debugdn}" - if test -w "$f"; then - strip_to_debug "${debugfn}" "$f" - else - chmod u+w "$f" - strip_to_debug "${debugfn}" "$f" - 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 - fi -done || exit - -# Invoke the DWARF Compressor utility. -if $run_dwz && type dwz >/dev/null 2>&1 \ - && [ -d "${RPM_BUILD_ROOT}/usr/lib/debug" ]; then - dwz_files="`cd "${RPM_BUILD_ROOT}/usr/lib/debug"; find -type f -name \*.debug`" - if [ -n "${dwz_files}" ]; then - dwz_multifile_name="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}.${RPM_ARCH}" - dwz_multifile_suffix= - dwz_multifile_idx=0 - while [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}${dwz_multifile_suffix}" ]; do - let ++dwz_multifile_idx - dwz_multifile_suffix=".${dwz_multifile_idx}" - done - dwz_multfile_name="${dwz_multifile_name}${dwz_multifile_suffix}" - dwz_opts="-h -q -r -m .dwz/${dwz_multifile_name}" - mkdir -p "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" - [ -n "${dwz_low_mem_die_limit}" ] \ - && dwz_opts="${dwz_opts} -l ${dwz_low_mem_die_limit}" - [ -n "${dwz_max_die_limit}" ] \ - && dwz_opts="${dwz_opts} -L ${dwz_max_die_limit}" - ( cd "${RPM_BUILD_ROOT}/usr/lib/debug" && dwz $dwz_opts $dwz_files ) - # Remove .dwz directory if empty - rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null - if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ]; then - id="`readelf -Wn "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" \ - 2>/dev/null | sed -n 's/^ Build ID: \([0-9a-f]\+\)/\1/p'`" - [ -n "$id" ] \ - && make_id_link "$id" "/usr/lib/debug/.dwz/${dwz_multifile_name}" .debug - fi - fi -fi - -# For each symlink whose target has a .debug file, -# make a .debug symlink to that file. -find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print | -while read f -do - t=$(readlink -m "$f").debug - f=${f#$RPM_BUILD_ROOT} - t=${t#$RPM_BUILD_ROOT} - if [ -f "$debugdir$t" ]; then - echo "symlinked /usr/lib/debug$t to /usr/lib/debug${f}.debug" - debug_link "/usr/lib/debug$t" "${f}.debug" - fi -done - -if [ -s "$SOURCEFILE" ]; then - mkdir -p "${RPM_BUILD_ROOT}/usr/src/debug" - LC_ALL=C sort -z -u "$SOURCEFILE" | grep -E -v -z '(<internal>|<built-in>)$' | - (cd "$RPM_BUILD_DIR"; cpio -pd0mL "${RPM_BUILD_ROOT}/usr/src/debug") - # stupid cpio creates new directories in mode 0700, fixup - find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 | - xargs --no-run-if-empty -0 chmod a+rx -fi - -if [ -d "${RPM_BUILD_ROOT}/usr/lib" -o -d "${RPM_BUILD_ROOT}/usr/src" ]; then - ((nout > 0)) || - test ! -d "${RPM_BUILD_ROOT}/usr/lib/debug" || - (cd "${RPM_BUILD_ROOT}/usr/lib"; find debug -type d) | - sed 's,^,%dir /usr/lib/,' >> "$LISTFILE" - - (cd "${RPM_BUILD_ROOT}/usr" - test ! -d lib/debug || find lib/debug ! -type d - test ! -d src/debug || find src/debug -mindepth 1 -maxdepth 1 - ) | sed 's,^,/usr/,' >> "$LISTFILE" -fi - -# Append to $1 only the lines from stdin not already in the file. -append_uniq() -{ - grep -F -f "$1" -x -v >> "$1" -} - -# Helper to generate list of corresponding .debug files from a file list. -filelist_debugfiles() -{ - local extra="$1" - shift - sed 's/^%[a-z0-9_][a-z0-9_]*([^)]*) *// -s/^%[a-z0-9_][a-z0-9_]* *// -/^$/d -'"$extra" "$@" -} - -# Write an output debuginfo file list based on given input file lists. -filtered_list() -{ - local out="$1" - shift - test $# -gt 0 || return - grep -F -f <(filelist_debugfiles 's,^.*$,/usr/lib/debug&.debug,' "$@") \ - -x $LISTFILE >> $out - sed -n -f <(filelist_debugfiles 's/[\\.*+#]/\\&/g -h -s,^.*$,s# &$##p,p -g -s,^.*$,s# /usr/lib/debug&.debug$##p,p -' "$@") "$LINKSFILE" | append_uniq "$out" -} - -# Write an output debuginfo file list based on an grep -E -style regexp. -pattern_list() -{ - local out="$1" ptn="$2" - test -n "$ptn" || return - grep -E -x -e "$ptn" "$LISTFILE" >> "$out" - sed -n -r "\#^$ptn #s/ .*\$//p" "$LINKSFILE" | append_uniq "$out" -} - -# -# When given multiple -o switches, split up the output as directed. -# -i=0 -while ((i < nout)); do - > ${outs[$i]} - filtered_list ${outs[$i]} ${lists[$i]} - pattern_list ${outs[$i]} "${ptns[$i]}" - grep -Fvx -f ${outs[$i]} "$LISTFILE" > "${LISTFILE}.new" - mv "${LISTFILE}.new" "$LISTFILE" - ((++i)) -done -if ((nout > 0)); then - # Now add the right %dir lines to each output list. - (cd "${RPM_BUILD_ROOT}"; find usr/lib/debug -type d) | - sed 's#^.*$#\\@^/&/@{h;s@^.*$@%dir /&@p;g;}#' | - LC_ALL=C sort -ur > "${LISTFILE}.dirs.sed" - i=0 - while ((i < nout)); do - sed -n -f "${LISTFILE}.dirs.sed" "${outs[$i]}" | sort -u > "${outs[$i]}.new" - cat "${outs[$i]}" >> "${outs[$i]}.new" - mv -f "${outs[$i]}.new" "${outs[$i]}" - ((++i)) - done - sed -n -f "${LISTFILE}.dirs.sed" "${LISTFILE}" | sort -u > "${LISTFILE}.new" - cat "$LISTFILE" >> "${LISTFILE}.new" - mv "${LISTFILE}.new" "$LISTFILE" -fi |