build: tweak aux set handling a little

build/common.sh

@@ -1040,6 +1040,10 @@ bundle_packages()
 
 	if [ -d ${BASEDIR}${PACKAGESDIR}-aux ]; then
 		sh ./clean.sh aux
+
+		# generate index files (XXX ideally from a chroot)
+		pkg repo ${BASEDIR}${PACKAGESDIR}-aux/ ${SIGNARGS}
+
 		echo -n ">>> Creating aux package set for ${PACKAGEVER}... "
 		tar -C ${BASEDIR}${PACKAGESDIR}-aux -cf ${AUXSET} .
 		echo "done"

build/packages.sh

@@ -51,9 +51,9 @@ for AUX in ${AUXLIST}; do
 			echo ">>> Moving auxiliary package ${AUX}" \
 			    >> ${STAGEDIR}/.pkg-msg
 
-			# XXX switch to packages directory layout
-			mkdir -p ${STAGEDIR}${PACKAGESDIR}-aux
-			mv ${STAGEDIR}/${PKG} ${STAGEDIR}${PACKAGESDIR}-aux
+			mkdir -p ${STAGEDIR}${PACKAGESDIR}-aux/All
+			mv ${STAGEDIR}/${PKG} ${STAGEDIR}${PACKAGESDIR}-aux/All
+
 			break;
 		fi
 	done

build/ports.sh

@@ -72,7 +72,7 @@ setup_distfiles ${STAGEDIR}
 if extract_packages ${STAGEDIR}; then
 	AUXSET=$(find_set aux)
 	if [ -f "${AUXSET}" ]; then
-		tar -C ${STAGEDIR}${PACKAGESDIR}/All -xpf ${AUXSET}
+		tar -C ${STAGEDIR}${PACKAGESDIR} -xpf ${AUXSET} ./All
 	fi
 
 	if [ ${DEPEND} = "yes" ]; then