snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps-src: make 'bootstrap' target more reliable. 

- Ignore additional arguments, i.e './xbps-src bootstrap -j2'.
- Do not sync remote repos.
This commit is contained in:
Juan RP 2015-05-05 11:52:17 +02:00
parent 57365d7b1b
commit 3de7c66fbf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xbps-src
View File

@ -257,6 +257,10 @@ check_build_requirements() {
install_bbootstrap() { install_bbootstrap() {
[ -n "$CHROOT_READY" ] && return [ -n "$CHROOT_READY" ] && return
if [ -n "$1" ]; then
unset XBPS_TARGET_PKG
unset XBPS_INSTALL_ARGS
fi
# binary bootstrap # binary bootstrap
msg_normal "Installing bootstrap from binary package repositories...\n" msg_normal "Installing bootstrap from binary package repositories...\n"
# XBPS_TARGET_PKG == arch # XBPS_TARGET_PKG == arch
@ -461,7 +465,7 @@ readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"
readonly XBPS_TARGET="$1" readonly XBPS_TARGET="$1"
if [ -n "$2" ]; then if [ -n "$2" ]; then
readonly XBPS_TARGET_PKG="${2##*/}" XBPS_TARGET_PKG="${2##*/}"
fi fi
# Check if stdout is a tty; if false disable colors. # Check if stdout is a tty; if false disable colors.
@ -575,7 +579,7 @@ case "$XBPS_TARGET" in
fi fi
$XBPS_LIBEXECDIR/build.sh base-chroot base-chroot $XBPS_TARGET || exit 1 $XBPS_LIBEXECDIR/build.sh base-chroot base-chroot $XBPS_TARGET || exit 1
[ -d $XBPS_MASTERDIR ] && rm -rf $XBPS_MASTERDIR [ -d $XBPS_MASTERDIR ] && rm -rf $XBPS_MASTERDIR
install_bbootstrap install_bbootstrap bootstrap
;; ;;
bootstrap-update) bootstrap-update)
bootstrap_update bootstrap_update