build: more cross-build adventures

build/common.sh

@@ -320,7 +320,9 @@ setup_chroot()
 		# copy the native toolchain for extra speed
 		XTOOLS_SET=$(find ${SETSDIR} -name "xtools-*-${PRODUCT_ARCH}.txz")
 		if [ -n "${XTOOLS_SET}" ]; then
-			tar -C ${1} -xpf ${XTOOLS_SET}
+			tar -C ${1} -xpf ${XTOOLS_SET} \
+			    --exclude="./bin/sh" \
+			    --exclude="./usr/bin/flex"
 		fi
 	fi
 

build/core.sh

@@ -36,6 +36,7 @@ check_packages ${SELF} ${@}
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
 setup_clone ${STAGEDIR} ${PORTSDIR}
+setup_chroot ${STAGEDIR}
 
 extract_packages ${STAGEDIR}
 # register persistent packages to avoid bouncing

build/plugins.sh

@@ -36,6 +36,7 @@ check_packages ${SELF} ${@}
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
 setup_clone ${STAGEDIR} ${PLUGINSDIR}
+setup_chroot ${STAGEDIR}
 
 extract_packages ${STAGEDIR}
 remove_packages ${STAGEDIR} ${@}

build/ports.sh

@@ -62,6 +62,10 @@ unset STAGEDIR
 # clobbers build for pkg(8) at least, since ARCH= is in there:
 unset MAKEFLAGS
 
+# Tell pkg(8) not to peek at /bin/sh
+export ABI_FILE=/usr/lib/crt1.o
+
+# Set up environment for target
 export TARGET_ARCH=${PRODUCT_ARCH}
 export TARGET=${PRODUCT_TARGET}
 export ARCH=${PRODUCT_ARCH}