[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/scripts/ find-debuginfo.sh
From:       "Per ?yvind Karlsen" <pkarlsen () rpm5 ! org>
Date:       2011-11-10 12:47:50
Message-ID: 20111110124750.086D199834 () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   10-Nov-2011 13:47:49
  Branch: rpm-5_4                          Handle: 2011111012474801

  Modified files:           (Branch: rpm-5_4)
    rpm                     CHANGES
    rpm/scripts             find-debuginfo.sh

  Log:
    add support for filtering of files to find-debuginfo.sh.

  Summary:
    Revision    Changes     Path
    1.3501.2.188+1  -0      rpm/CHANGES
    1.14.2.4    +12 -2      rpm/scripts/find-debuginfo.sh
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.187 -r1.3501.2.188 CHANGES
  --- rpm/CHANGES	10 Nov 2011 12:19:16 -0000	1.3501.2.187
  +++ rpm/CHANGES	10 Nov 2011 12:47:49 -0000	1.3501.2.188
  @@ -1,4 +1,5 @@
   5.4.3 -> 5.4.4:
  +    - proyvind: add support for filtering of files to find-debuginfo.sh.
       - proyvind: fix find-debuginfo.sh mime-type matching.
       - jbj: debuginfo: use current dir instead of $RPM_BUILD_DIR.
       - proyvind: fix different epoch being ignored when comparing two packages
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/find-debuginfo.sh
  ============================================================================
  $ cvs diff -u -r1.14.2.3 -r1.14.2.4 find-debuginfo.sh
  --- rpm/scripts/find-debuginfo.sh	10 Nov 2011 12:19:16 -0000	1.14.2.3
  +++ rpm/scripts/find-debuginfo.sh	10 Nov 2011 12:47:48 -0000	1.14.2.4
  @@ -93,8 +93,8 @@
     $strip_g && case "$(file -bi "$2")" in
     application/x-sharedlib*) g=-g ;;
     esac
  -  eu-strip --remove-comment $g -f "$1" "$2" || exit
  -  chmod 444 "$1" || exit
  +  eu-strip --remove-comment $g $([ -n "$DISABLE_DEBUG" ] || echo -f "$1") "$2" || exit  
  +  [ -n "$DISABLE_DEBUG" ] || chmod 444 "$1" || exit
   }
   
   # Make a relative symlink to $1 called $3$2
  @@ -174,6 +174,12 @@
   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 \) \
  @@ -181,6 +187,10 @@
   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
   
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]