rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- updated find-debuginfo from Roland

Browse Source
This commit is contained in:
Panu Matilainen 2007-08-14 07:44:23 +00:00
parent 6d40e7b38d
commit 15931be6ed
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
find-debuginfo.sh
View File

@ -93,7 +93,7 @@ strip_to_debug()
$strip_g && case "$(file -bi "$2")" in $strip_g && case "$(file -bi "$2")" in
application/x-sharedlib,*) g=-g ;; application/x-sharedlib,*) g=-g ;;
esac esac
eu-strip --remove-comment -f "$1" "$2" || exit eu-strip --remove-comment $g -f "$1" "$2" || exit
} }
# Make a relative symlink to $1 called $3$2 # Make a relative symlink to $1 called $3$2
@ -254,13 +254,10 @@ if [ -s "$SOURCEFILE" ]; then
fi fi
if [ -d ${RPM_BUILD_ROOT}/usr/lib -o -d ${RPM_BUILD_ROOT}/usr/src ]; then if [ -d ${RPM_BUILD_ROOT}/usr/lib -o -d ${RPM_BUILD_ROOT}/usr/src ]; then
gendirs=src ((nout > 0)) ||
((nout > 0)) || gendirs='lib src' test ! -d ${RPM_BUILD_ROOT}/usr/lib ||
for d in $gendirs; do (cd ${RPM_BUILD_ROOT}/usr/lib; find debug -type d) |
test ! -d ${RPM_BUILD_ROOT}/usr/$d || sed 's,^,%dir /usr/lib/,' >> $LISTFILE
(cd ${RPM_BUILD_ROOT}/usr/$d; find debug -type d) |
sed "s,^,%dir /usr/$d/," >> $LISTFILE
done
(cd ${RPM_BUILD_ROOT}/usr (cd ${RPM_BUILD_ROOT}/usr
test ! -d lib/debug || find lib/debug ! -type d test ! -d lib/debug || find lib/debug ! -type d
@ -324,7 +321,7 @@ while ((i < nout)); do
done done
if ((nout > 0)); then if ((nout > 0)); then
# Now add the right %dir lines to each output list. # Now add the right %dir lines to each output list.
(cd ${RPM_BUILD_ROOT}; find usr/{lib,src}/debug -type d) | (cd ${RPM_BUILD_ROOT}; find usr/lib/debug -type d) |
sed 's#^.*$#\\@^/&/@{h;s@^.*$@%dir /&@p;g;}#' | sed 's#^.*$#\\@^/&/@{h;s@^.*$@%dir /&@p;g;}#' |
LC_ALL=C sort -ur > ${LISTFILE}.dirs.sed LC_ALL=C sort -ur > ${LISTFILE}.dirs.sed
i=0 i=0

2
rpm.spec
View File

@ -474,7 +474,7 @@ exit 0
%changelog %changelog
* Mon Aug 13 2007 Panu Matilainen <pmatilai@redhat.com> - 4.4.2.1-7 * Mon Aug 13 2007 Panu Matilainen <pmatilai@redhat.com> - 4.4.2.1-7
- another debugedit fix from Roland McGrath - another debugedit fix and updated find-debuginfo script from Roland McGrath
- make popt provide popt-devel to further ease split-off transition - make popt provide popt-devel to further ease split-off transition
- skip ESTALE and EACCESS on mountpoints from Jeff Johnson (#190496, #220991) - skip ESTALE and EACCESS on mountpoints from Jeff Johnson (#190496, #220991)