wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplify configure/build target for chroot templates.

Browse source 
--HG--
extra : convert_revision : 528f8e0dbb3af0c120ecea434cdd5c73c6c16314
This commit is contained in:
Juan RP 2008-10-27 11:19:37 +01:00
parent c2362703e2
commit d2b65a9b0d
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
xbps.sh
View file

@ -1224,7 +1224,7 @@ install_pkg()
pkg="$curpkgn-$version" pkg="$curpkgn-$version"
if [ -z "$base_chroot" -a -z "$in_chroot" ]; then if [ -z "$base_chroot" -a -z "$in_chroot" ]; then
. $XBPS_TMPLHELPDIR/chroot.sh run_file $XBPS_TMPLHELPDIR/chroot.sh
install_chroot_pkg $curpkgn install_chroot_pkg $curpkgn
return $? return $?
fi fi
@ -1501,24 +1501,18 @@ set_defvars
case "$target" in case "$target" in
build) build)
setup_tmpl $2 setup_tmpl $2
fetch_distfiles $2
if [ ! -f "$XBPS_EXTRACT_DONE" ]; then
extract_distfiles $2
fi
if [ ! -f "$XBPS_CONFIGURE_DONE" ]; then
if [ -z "$base_chroot" -a -z "$in_chroot" ]; then
run_file $XBPS_TMPLHELPDIR/chroot.sh
configure_chroot_pkg $2
else
configure_src_phase $2
fi
fi
if [ -z "$base_chroot" -a -z "$in_chroot" ]; then if [ -z "$base_chroot" -a -z "$in_chroot" ]; then
run_file $XBPS_TMPLHELPDIR/chroot.sh run_file $XBPS_TMPLHELPDIR/chroot.sh
build_chroot_pkg $2 build_chroot_pkg $2
umount_chroot_fs umount_chroot_fs
else else
fetch_distfiles $2
if [ ! -f "$XBPS_EXTRACT_DONE" ]; then
extract_distfiles $2
fi
if [ ! -f "$XBPS_CONFIGURE_DONE" ]; then
configure_src_phase $2
fi
build_src_phase $2 build_src_phase $2
fi fi
;; ;;
@ -1528,15 +1522,15 @@ chroot)
;; ;;
configure) configure)
setup_tmpl $2 setup_tmpl $2
fetch_distfiles $2
if [ ! -f "$XBPS_EXTRACT_DONE" ]; then
extract_distfiles $2
fi
if [ -z "$base_chroot" -a -z "$in_chroot" ]; then if [ -z "$base_chroot" -a -z "$in_chroot" ]; then
run_file $XBPS_TMPLHELPDIR/chroot.sh run_file $XBPS_TMPLHELPDIR/chroot.sh
configure_chroot_pkg $2 configure_chroot_pkg $2
umount_chroot_fs umount_chroot_fs
else else
fetch_distfiles $2
if [ ! -f "$XBPS_EXTRACT_DONE" ]; then
extract_distfiles $2
fi
configure_src_phase $2 configure_src_phase $2
fi fi
;; ;;