wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-16 14:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xbps-src: use XBPS_INSTALL_ARGS to repair bootstrap-update.

Browse source
This commit is contained in:
Juan RP 2015-06-09 09:23:06 +02:00
parent c285aa72bd
commit 21e8243ce5
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
etc/defaults.conf
View file

@ -15,9 +15,8 @@
#
# [OPTIONAL]
# Enable optional arguments to xbps-install. This is useful when you use
# static binaries and when you need to specify arguments.
# NOTE: This is only used with the binary-bootstrap target!
# Enable optional arguments to xbps-install for the host system.
# Currently used in the binary-bootstrap bootstrap-update targets.
XBPS_INSTALL_ARGS="--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current"
# [OPTIONAL]

6
xbps-src
View file

@ -301,7 +301,7 @@ bootstrap_update() {
msg_normal "xbps-src: cleaning up masterdir...\n"
rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
msg_normal "xbps-src: updating $XBPS_MASTERDIR ...\n"
${XBPS_INSTALL_CMD} -yu
${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -Syu
return $?
}
@ -451,8 +451,8 @@ if [ -n "$IN_CHROOT" ]; then
readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
else
readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR"
readonly XBPS_INSTALL_CMD="xbps-install --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
readonly XBPS_QUERY_CMD="xbps-query -i --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 -C /dev/null -c $XBPS_HOSTDIR/repoache -i --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
readonly XBPS_RINDEX_CMD="xbps-rindex"
readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR"
readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR"