From 339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 18 Aug 2020 19:53:55 +0700 Subject: [PATCH] xbps-src: use internal config in foreign environment When xbps-install is called without "-C", xbps-install will pick configuration from the location configured at build time. Should the default location not have a valid repository configuration, we couldn't run binary-bootstrap. On bootstrapping from scratch, without this change, xbps looks into system configuration, which isn't what we want. Run xbps-install with our internal configuration instead. --- xbps-src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbps-src b/xbps-src index 2462ddc0b89..1c83708c8da 100755 --- a/xbps-src +++ b/xbps-src @@ -613,8 +613,8 @@ if [ "$IN_CHROOT" ]; then readonly XBPS_BUILDDIR=/builddir else readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR" - readonly XBPS_INSTALL_CMD="xbps-install -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR" - readonly XBPS_QUERY_CMD="xbps-query -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR" + readonly XBPS_INSTALL_CMD="xbps-install -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR -C etc/xbps.d" + readonly XBPS_QUERY_CMD="xbps-query -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR -C etc/xbps.d" readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR" readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR" readonly XBPS_CHECKVERS_CMD="xbps-checkvers -r $XBPS_MASTERDIR"