Simplify configure/build target for chroot templates.
--HG-- extra : convert_revision : 528f8e0dbb3af0c120ecea434cdd5c73c6c16314
This commit is contained in:
parent
c2362703e2
commit
d2b65a9b0d
30
xbps.sh
30
xbps.sh
|
@ -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
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in a new issue