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

- fix new find-debuginfo.sh on noarch packages by Roland McGrath

Browse Source
This commit is contained in:
Panu Matilainen 2007-08-09 07:08:36 +00:00
parent edc6f9546b
commit 3c2319fe6e
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
find-debuginfo.sh
View File

@ -178,7 +178,7 @@ find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \
\( -perm -0100 -or -perm -0010 -or -perm -0001 \) \ \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
-print | -print |
file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' | file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' |
xargs stat -c '%h %D_%i %n' | xargs --no-run-if-empty stat -c '%h %D_%i %n' |
while read nlinks inum f; do while read nlinks inum f; do
get_debugfn "$f" get_debugfn "$f"
[ -f "${debugfn}" ] && continue [ -f "${debugfn}" ] && continue
@ -244,23 +244,29 @@ do
fi fi
done done
mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug if [ -s "$SOURCEFILE" ]; then
LC_ALL=C sort -z -u $SOURCEFILE | egrep -v -z '(<internal>|<built-in>)$' | mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug
(cd $RPM_BUILD_DIR; cpio -pd0mL ${RPM_BUILD_ROOT}/usr/src/debug) LC_ALL=C sort -z -u $SOURCEFILE | egrep -v -z '(<internal>|<built-in>)$' |
# stupid cpio creates new directories in mode 0700, fixup (cd $RPM_BUILD_DIR; cpio -pd0mL ${RPM_BUILD_ROOT}/usr/src/debug)
find ${RPM_BUILD_ROOT}/usr/src/debug -type d -print0 | xargs -0 chmod a+rx # 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
gendirs=src if [ -d ${RPM_BUILD_ROOT}/usr/lib -o -d ${RPM_BUILD_ROOT}/usr/src ]; then
((nout > 0)) || gendirs='lib src' gendirs=src
for d in $gendirs; do ((nout > 0)) || gendirs='lib src'
(cd ${RPM_BUILD_ROOT}/usr/$d; find debug -type d) | for d in $gendirs; do
sed "s,^,%dir /usr/$d/," >> $LISTFILE test ! -d ${RPM_BUILD_ROOT}/usr/$d ||
done (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
find lib/debug ! -type d test ! -d lib/debug || find lib/debug ! -type d
find src/debug -mindepth 1 -maxdepth 1 test ! -d src/debug || find src/debug -mindepth 1 -maxdepth 1
) | sed 's,^,/usr/,' >> $LISTFILE ) | sed 's,^,/usr/,' >> $LISTFILE
fi
# Append to $1 only the lines from stdin not already in the file. # Append to $1 only the lines from stdin not already in the file.
append_uniq() append_uniq()

5
rpm.spec
View File

@ -14,7 +14,7 @@ Summary: The RPM package management system
Name: rpm Name: rpm
Version: 4.4.2.1 Version: 4.4.2.1
%{expand: %%define rpm_version %{version}} %{expand: %%define rpm_version %{version}}
Release: 3%{?dist} Release: 4%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source: rpm-%{rpm_version}.tar.gz Source: rpm-%{rpm_version}.tar.gz
@ -460,6 +460,9 @@ exit 0
%{__includedir}/popt.h %{__includedir}/popt.h
%changelog %changelog
* Thu Aug 9 2007 Panu Matilainen <pmatilai@redhat.com> - 4.4.2.1-4
- fix new find-debuginfo.sh on noarch packages by Roland McGrath
* Wed Aug 8 2007 Panu Matilainen <pmatilai@redhat.com> - 4.4.2.1-3 * Wed Aug 8 2007 Panu Matilainen <pmatilai@redhat.com> - 4.4.2.1-3
- make peace with new glibc checks on open() wrt internal bdb and rpm itself - make peace with new glibc checks on open() wrt internal bdb and rpm itself