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

libguestfs-find-requires: Be more specific about regexps matching library paths.

Browse Source 
In particular, don't match and convert filenames such as
"/lib64/rtkaio/librt.so.1" but dump those out directly as
dependencies (there is only one such file dependency in Rawhide).
This commit is contained in:
Richard W.M. Jones 2012-08-02 20:18:58 +01:00
parent fde3bcaf2a
commit 82faf4e03a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libguestfs-find-requires.sh
View File

@ -28,10 +28,12 @@ fi
sofiles=`grep 'lib.*\.so\.' $hostfiles | fgrep -v '*'` sofiles=`grep 'lib.*\.so\.' $hostfiles | fgrep -v '*'`
for f in $sofiles; do for f in $sofiles; do
if [ -f "$f" ]; then if [ -f "$f" ]; then
if [[ "$f" =~ /lib64/(.*) ]]; then if [[ "$f" =~ (/usr)?/lib64/([^/]*)$ ]]; then
echo "${BASH_REMATCH[1]}()(64bit)" echo "${BASH_REMATCH[2]}()(64bit)"
elif [[ "$f" =~ /lib/(.*) ]]; then elif [[ "$f" =~ (/usr)?/lib/([^/]*)$ ]]; then
echo "${BASH_REMATCH[1]}" echo "${BASH_REMATCH[2]}"
else
echo "$f"
fi fi
fi fi
done done

4
libguestfs.spec
View File

@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.19.28 Version: 1.19.28
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -997,7 +997,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
%changelog %changelog
* Thu Aug 02 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.28-2 * Thu Aug 02 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.28-3
- New upstream version 1.19.28. - New upstream version 1.19.28.
- Update libguestfs-find-requires to generate ordinary lib dependencies. - Update libguestfs-find-requires to generate ordinary lib dependencies.