From e3246539e75100721e5d06d5104ace107b981af0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 10 Jun 2014 09:36:58 +0200
Subject: [PATCH] xbps-src: do not copy x86_64 specific repos to the cross
 target root.

---
 common/xbps-src/shutils/chroot.sh | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 25d6ba4ce36..6d49310a303 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -131,20 +131,6 @@ chroot_sync_repos() {
     if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
         rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf
         rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/22-remote-x86_64.conf
-    else
-        # Make sure to sync index for remote repositories.
-        $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install -S
-        if [ -n "$XBPS_CROSS_BUILD" ]; then
-            # Copy host keys to the target rootdir.
-            if [ ! -d $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys ]; then
-                mkdir -p $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys
-            fi
-            cp -a $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
-                $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys
-            env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \
-                $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install \
-                -r /usr/$XBPS_CROSS_TRIPLET -S
-        fi
     fi
 
     # Copy host repos to the cross root.
@@ -153,6 +139,21 @@ chroot_sync_repos() {
         mkdir -p $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps/repo.d
         cp ${XBPS_MASTERDIR}/etc/xbps/repo.d/*.conf \
             $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps/repo.d
+        rm -f $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps/repo.d/*-x86_64.conf
+    fi
+
+    # Make sure to sync index for remote repositories.
+    $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install -S
+    if [ -n "$XBPS_CROSS_BUILD" ]; then
+        # Copy host keys to the target rootdir.
+        if [ ! -d $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys ]; then
+            mkdir -p $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys
+        fi
+        cp -a $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
+            $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys
+        env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \
+            $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install \
+            -r /usr/$XBPS_CROSS_TRIPLET -S
     fi
 
     return 0