jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps: misc changes to perform better in chroot target.

Browse source 
- Use masterdir path before system path, this is needed in chroot!
- Use system grep because before starting the chroot LD_LIBRARY_PATH
  has been configured and might fail.

--HG--
extra : convert_revision : 767a9fb94819ee85eab44096a0741b536e59763f
This commit is contained in:
Juan RP 2008-10-24 03:34:50 +02:00
parent 4cf232d417
commit b0f9cd1ef7
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xbps.sh
View file

@ -40,6 +40,8 @@
: ${progname:=$(basename $0)}
: ${fetch_cmd:=wget}
: ${xbps_machine:=$(uname -m)}
: ${grep_cmd:=/bin/grep}
usage()
{
@ -193,7 +195,7 @@ check_config_vars()
mkdir "$val"
if [ "$?" -ne 0 ]; then
echo -n "*** ERROR: couldn't create '$f'"
echo "directory, aborting ***"
echo " directory, aborting ***"
exit 1
fi
fi
@ -281,8 +283,8 @@ prepare_tmpl()
XBPS_INSTALL_DONE="$wrksrc/.xbps_install_done"
export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin"
export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin"
export PATH="$PATH:$XBPS_MASTERDIR/usr/bin:$XBPS_MASTERDIR/usr/sbin"
export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin"
}
#
@ -603,13 +605,13 @@ apply_tmpl_patches()
cp -f $patch $wrksrc
# Try to guess if its a compressed patch.
if $(echo $patch|grep -q .gz); then
if $(echo $patch|$grep_cmd -q .gz); then
gunzip $wrksrc/$i
patch=${i%%.gz}
elif $(echo $patch|grep -q .bz2); then
elif $(echo $patch|$grep_cmd -q .bz2); then
bunzip2 $wrksrc/$i
patch=${i%%.bz2}
elif $(echo $patch|grep -q .diff); then
elif $(echo $patch|$grep_cmd -q .diff); then
patch=$i
else
echo "*** WARNING: unknown patch type: $i ***"
@ -686,6 +688,8 @@ configure_src_phase()
if [ "$build_style" = "gnu_configure" ]; then
cd $wrksrc || exit 1
${configure_script} \
--host=${xbps_machine}-linux-gnu \
--build=${xbps_machine}-linux-gnu \
--prefix=${_prefix} --sysconfdir=/etc \
--infodir=$XBPS_DESTDIR/$pkgname-$version/usr/share/info \
--mandir=$XBPS_DESTDIR/$pkgname-$version/usr/share/man \
@ -1031,7 +1035,7 @@ install_dependencies_pkg()
echo "==> Required dependencies for $(basename $pkg):"
for i in ${installed_deps_list}; do
fpkg="$($XBPS_PKGDB_CMD list|grep ${i%-[0-9]*.*})"
fpkg="$($XBPS_PKGDB_CMD list|$grep_cmd ${i%-[0-9]*.*})"
echo " $i: found $fpkg."
done