diff options
| -rw-r--r-- | packaging/eu-strip.patch | 61 | ||||
| -rw-r--r-- | packaging/rpm.changes | 4 | ||||
| -rw-r--r-- | packaging/rpm.spec | 2 |
3 files changed, 67 insertions, 0 deletions
diff --git a/packaging/eu-strip.patch b/packaging/eu-strip.patch new file mode 100644 index 0000000..7b535a1 --- /dev/null +++ b/packaging/eu-strip.patch @@ -0,0 +1,61 @@ +Index: rpm-4.9.1/scripts/find-debuginfo.sh +=================================================================== +--- rpm-4.9.1.orig/scripts/find-debuginfo.sh 2012-08-02 14:00:14.103432963 -0700 ++++ rpm-4.9.1/scripts/find-debuginfo.sh 2012-08-02 14:38:44.723358399 -0700 +@@ -95,13 +95,9 @@ + + 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 +- eu-strip --remove-comment $r $g -f "$1" "$2" || exit ++ eu-strip --remove-comment $r -g -f "$1" "$2" || exit + chmod 444 "$1" || exit + } + +@@ -229,8 +225,6 @@ + fi + + echo "extracting debug info from $f" +- mode=$(stat -c %a "$f") +- chmod +w "$f" + id=$($(DEBUGEDIT=$(which debugedit 2>/dev/null); \ + echo ${DEBUGEDIT:-/usr/lib/rpm/debugedit}) -b "$RPM_BUILD_DIR" \ + -d /usr/src/debug -i -l "$SOURCEFILE" "$f") || exit +@@ -250,25 +244,13 @@ + esac + + mkdir -p "${debugdn}" +- objcopy --only-keep-debug $f $debugfn || : +- ( +- shopt -s extglob +- strip_option="--strip-all" +- case "$f" in +- *.ko) +- strip_option="--strip-debug" ;; +- *$STRIP_KEEP_SYMTAB*) +- if test -n "$STRIP_KEEP_SYMTAB"; then +- strip_option="--strip-debug" +- fi +- ;; +- esac +- if test "$NO_DEBUGINFO_STRIP_DEBUG" = true ; then +- strip_option= +- fi +- objcopy --add-gnu-debuglink=$debugfn -R .comment -R .GCC.command.line $strip_option $f +- chmod $mode $f +- ) || : ++ 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 + + if [ -n "$id" ]; then + make_id_link "$id" "$dn/$(basename $f)" diff --git a/packaging/rpm.changes b/packaging/rpm.changes index 0409509..7b8f142 100644 --- a/packaging/rpm.changes +++ b/packaging/rpm.changes @@ -1,3 +1,7 @@ +* Mon Aug 06 2012 William Douglas <william.douglas@intel.com> build/2012-07-30.142546@9c7636b +[ William Douglas ] +- Keep function symbols for backtraces. + * Mon Aug 06 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0 - Changes to the security plugin - Fix the smack directory creation when subdir is present diff --git a/packaging/rpm.spec b/packaging/rpm.spec index b973314..cebe019 100644 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -46,6 +46,7 @@ Patch85: rpmio_base64_4.9.1_fix.patch Patch86: rpmlib_format_value_4.9.1_fix.patch Patch87: security_4.9.1.patch Patch90: disableperl.patch +Patch100: eu-strip.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -180,6 +181,7 @@ rm -f rpmdb/db.h %patch86 -p1 %patch87 -p1 -b .msm %patch90 -p1 +%patch100 -p1 rm -f m4/libtool.m4 |