From 55863abdd28b731523189ad23595567893a0df1b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 12 Jul 2015 08:24:04 +0200 Subject: [PATCH] xbps-src: do not sync xbps repos in chroot mode. If XBPS_CHROOT_CMD == uchroot with overlayfs (-O), the temporary masterdir will be removed completely after synchronizing remote repositories, and later on, when the build starts the repos are unsynchronized. So do the sync on the real masterdir before entering the chroot. --- common/xbps-src/shutils/chroot.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 00944a75e29..577839039d9 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -145,9 +145,7 @@ chroot_sync_repos() { if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then # Make sure to sync index for remote repositories. - $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ - $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" \ - "$XBPS_CHROOT_CMD_ARGS" xbps-install -S + xbps-install -r $XBPS_MASTERDIR -S fi if [ -n "$XBPS_CROSS_BUILD" ]; then @@ -158,9 +156,7 @@ chroot_sync_repos() { # Make sure to sync index for remote repositories. if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \ - $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ - $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ - xbps-install -r $XBPS_CROSS_BASE -S + xbps-install -r $XBPS_MASTERDIR/$XBPS_CROSS_BASE -S fi fi