moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

hooks/post-install/99-pkglint: make the shlibs checks work correctly with vpkgs.

Browse source
This commit is contained in:
Juan RP 2014-03-27 13:57:17 +01:00
parent 1ed11393e7
commit f32e0b76d7
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
common/hooks/post-install/99-pkglint.sh
View file

@ -4,6 +4,8 @@ hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile= local error=0 filename= rev= libname= conflictPkg= conflictFile=
conflictRev= found= mapshlibs=$XBPS_COMMONDIR/shlibs conflictRev= found= mapshlibs=$XBPS_COMMONDIR/shlibs
set +E
for f in bin sbin lib lib32; do for f in bin sbin lib lib32; do
if [ -d ${PKGDESTDIR}/${f} ]; then if [ -d ${PKGDESTDIR}/${f} ]; then
msg_red "${pkgver}: /${f} directory is not allowed, use /usr/${f}.\n" msg_red "${pkgver}: /${f} directory is not allowed, use /usr/${f}.\n"
@ -28,7 +30,9 @@ hook() {
for filename in `cat ${PKGDESTDIR}/shlib-provides`; do for filename in `cat ${PKGDESTDIR}/shlib-provides`; do
rev=${filename#*.so.} rev=${filename#*.so.}
libname=${filename%.so*} libname=${filename%.so*}
grep -E "^${libname}\.so[\.0-9.]*[[:blank:]]+${pkgname}-[^-]+_[0-9]+$" $mapshlibs | { \ _libname=$(echo "$libname"|sed -E 's|\+|\\+|g')
_pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
grep -E "^${_libname}\.so[\.0-9.]*[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" $mapshlibs | { \
while read conflictFile conflictPkg; do while read conflictFile conflictPkg; do
found=1 found=1
conflictRev=${conflictFile#*.so.} conflictRev=${conflictFile#*.so.}
@ -45,6 +49,19 @@ hook() {
done done
msg_error "${pkgver}: cannot continue with installation!\n" msg_error "${pkgver}: cannot continue with installation!\n"
done done
# Try to match provided shlibs in virtual packages.
for f in ${provides}; do
_vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
_spkgname="$(grep "^${filename}" $mapshlibs | awk '{print $2}')"
_libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
continue
fi
if [ "${_vpkgname}" = "${_libpkgname}" ]; then
found=1
break
fi
done;
if [ -z "$found" ]; then if [ -z "$found" ]; then
msg_error "${pkgver}: ${libname}.so.${rev} not found in common/shlibs. Please add it.\n" msg_error "${pkgver}: ${libname}.so.${rev} not found in common/shlibs. Please add it.\n"
fi; fi;