RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 10-Nov-2011 13:45:05 Branch: HEAD Handle: 2011111012450401 Modified files: rpm CHANGES rpm/scripts find-debuginfo.sh Log: add support for filtering of files to find-debuginfo.sh. Summary: Revision Changes Path 1.3685 +1 -0 rpm/CHANGES 1.18 +12 -2 rpm/scripts/find-debuginfo.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3684 -r1.3685 CHANGES --- rpm/CHANGES 10 Nov 2011 12:04:49 -0000 1.3684 +++ rpm/CHANGES 10 Nov 2011 12:45:05 -0000 1.3685 @@ -1,4 +1,5 @@ HEAD: + - proyvind: add support for filtering of files to find-debuginfo.sh. - proyvind: fix find-debuginfo.sh mime-type matching. - proyvind: fix different epoch being ignored when comparing two packages with same NVRA. @@ . patch -p0 <<'@@ .' Index: rpm/scripts/find-debuginfo.sh ============================================================================ $ cvs diff -u -r1.17 -r1.18 find-debuginfo.sh --- rpm/scripts/find-debuginfo.sh 10 Nov 2011 12:04:48 -0000 1.17 +++ rpm/scripts/find-debuginfo.sh 10 Nov 2011 12:45:04 -0000 1.18 @@ -100,8 +100,8 @@ $strip_g && case "$(file -bi "$2")" in application/x-sharedlib*) g=-g ;; esac - eu-strip --remove-comment $r $g -f "$1" "$2" || exit - chmod 444 "$1" || exit + eu-strip --remove-comment $r $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 @@ -181,6 +181,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 \) \ @@ -188,6 +194,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 [email protected]
