xbps-src: use XBPS_INSTALL_ARGS to repair bootstrap-update.
This commit is contained in:
parent
c285aa72bd
commit
21e8243ce5
2 changed files with 5 additions and 6 deletions
|
@ -15,9 +15,8 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# [OPTIONAL]
|
# [OPTIONAL]
|
||||||
# Enable optional arguments to xbps-install. This is useful when you use
|
# Enable optional arguments to xbps-install for the host system.
|
||||||
# static binaries and when you need to specify arguments.
|
# Currently used in the binary-bootstrap bootstrap-update targets.
|
||||||
# NOTE: This is only used with the binary-bootstrap target!
|
|
||||||
XBPS_INSTALL_ARGS="--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current"
|
XBPS_INSTALL_ARGS="--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current"
|
||||||
|
|
||||||
# [OPTIONAL]
|
# [OPTIONAL]
|
||||||
|
|
6
xbps-src
6
xbps-src
|
@ -301,7 +301,7 @@ bootstrap_update() {
|
||||||
msg_normal "xbps-src: cleaning up masterdir...\n"
|
msg_normal "xbps-src: cleaning up masterdir...\n"
|
||||||
rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
|
rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
|
||||||
msg_normal "xbps-src: updating $XBPS_MASTERDIR ...\n"
|
msg_normal "xbps-src: updating $XBPS_MASTERDIR ...\n"
|
||||||
${XBPS_INSTALL_CMD} -yu
|
${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -Syu
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -451,8 +451,8 @@ if [ -n "$IN_CHROOT" ]; then
|
||||||
readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
|
readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
|
||||||
else
|
else
|
||||||
readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR"
|
readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR"
|
||||||
readonly XBPS_INSTALL_CMD="xbps-install --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
|
readonly XBPS_INSTALL_CMD="xbps-install -C /dev/null -c $XBPS_HOSTDIR/repocache --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
|
||||||
readonly XBPS_QUERY_CMD="xbps-query -i --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
|
readonly XBPS_QUERY_CMD="xbps-query -C /dev/null -c $XBPS_HOSTDIR/repoache -i --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
|
||||||
readonly XBPS_RINDEX_CMD="xbps-rindex"
|
readonly XBPS_RINDEX_CMD="xbps-rindex"
|
||||||
readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR"
|
readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR"
|
||||||
readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR"
|
readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR"
|
||||||
|
|
Loading…
Reference in a new issue