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

xbps-src: multiple improvements related to chroot code.

Browse source
This commit is contained in:
Juan RP 2011-07-06 14:20:27 +02:00
parent 4bc9959d3e
commit ef21557313
3 changed files with 50 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xbps-src/xbps-src.sh.in
View file

@ -266,9 +266,7 @@ fi
. @@XBPS_INSTALL_SHAREDIR@@/shutils/init_funcs.sh
set_defvars
for f in $(echo @@XBPS_INSTALL_SHAREDIR@@/shutils/*.sh); do
if [ -r "$f" -a "$(basename $f)" != "chroot.sh" ]; then
. $f
fi
[ -r "$f" ] && . $f
done
# Disable XBPS_PREFER_BINPKG_DEPS if requested.
@ -343,7 +341,6 @@ build|configure)
fi
if [ -z "$bootstrap" -a -z "$IN_CHROOT" ]; then
. $XBPS_SHUTILSDIR/chroot.sh
xbps_chroot_handler $target ${_pkgname}
else
_ORIGINPKG="${_pkgname}"
@ -395,7 +392,6 @@ checkvers)
check_installed_packages
;;
chroot)
. $XBPS_SHUTILSDIR/chroot.sh
xbps_chroot_handler chroot dummy
;;
clean)
@ -427,7 +423,6 @@ install)
setup_tmpl ${_pkgname}
_ORIGINPKG="${_pkgname}"
if [ -z "$IN_CHROOT" -a -z "$bootstrap" ]; then
. $XBPS_SHUTILSDIR/chroot.sh
xbps_chroot_handler $target ${_ORIGINPKG}
else
setup_tmpl ${_ORIGINPKG}
@ -459,7 +454,6 @@ remove)
fi
setup_tmpl ${_pkgname}
if [ -z "$IN_CHROOT" -a -z "$bootstrap" ]; then
. $XBPS_SHUTILSDIR/chroot.sh
xbps_chroot_handler $target ${_pkgname}
else
remove_pkg