xbps-src: make binary-bootstrap skip remote repos with -N.
This commit is contained in:
parent
b892b62e96
commit
c7bf669b74
4
xbps-src
4
xbps-src
|
@ -257,7 +257,7 @@ check_build_requirements() {
|
||||||
|
|
||||||
install_bbootstrap() {
|
install_bbootstrap() {
|
||||||
[ -n "$CHROOT_READY" ] && return
|
[ -n "$CHROOT_READY" ] && return
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" -o -n "$XBPS_SKIP_REMOTEREPOS" ]; then
|
||||||
unset XBPS_TARGET_PKG
|
unset XBPS_TARGET_PKG
|
||||||
unset XBPS_INSTALL_ARGS
|
unset XBPS_INSTALL_ARGS
|
||||||
fi
|
fi
|
||||||
|
@ -273,7 +273,7 @@ install_bbootstrap() {
|
||||||
mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys
|
mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys
|
||||||
cd $XBPS_MASTERDIR
|
cd $XBPS_MASTERDIR
|
||||||
cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys
|
cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys
|
||||||
${_bootstrap_arch} xbps-install -S ${XBPS_INSTALL_ARGS} \
|
${_bootstrap_arch} xbps-install ${XBPS_INSTALL_ARGS:+-S $XBPS_INSTALL_ARGS} \
|
||||||
--repository=$XBPS_REPOSITORY -c ${XBPS_HOSTDIR}/repocache \
|
--repository=$XBPS_REPOSITORY -c ${XBPS_HOSTDIR}/repocache \
|
||||||
-r $XBPS_MASTERDIR -y base-chroot${_subarch}
|
-r $XBPS_MASTERDIR -y base-chroot${_subarch}
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
|
|
Loading…
Reference in New Issue
Block a user