buildrepo: fixes for new $repo/$arch layout

buildrepo.in

@@ -5,6 +5,11 @@ program=${0##*/}
 aportsdir=${APORTSDIR:-$HOME/aports}
 repodir=${REPODIR:-$HOME/packages}
 
+machine=$(uname -m)
+case $machine in
+	i[3-9]86) arch=x86;;
+	*) arch=$machine;;
+esac
 
 usage() {
 	echo "usage: $program [-a APORTSDIR] [-d REPODIR] [-hp] [-l LOGPREFIX ]"
@@ -56,8 +61,8 @@ build() {
 		pkgs=$(abuild listpkg)
 		if all_exist $pkgs; then
 			echo ">>> Copying " $pkgs
-			cp -p -l $pkgs "$repodir/$repo"/ 2>/dev/null \
-				|| cp -p $pkgs "$repodir/$repo"/ \
+			cp -p -l $pkgs "$repodir/$repo/$CARCH"/ 2>/dev/null \
+				|| cp -p $pkgs "$repodir/$repo/$CARCH"/ \
 				|| needbuild="$needbuild $i"
 		else
 			needbuild="$needbuild $i"
@@ -88,7 +93,7 @@ build() {
 
 	# generate the repository index
 	echo ">>> Generating Index for $repo..."
-	cd "$repodir/$repo"
+	cd "$repodir/$repo/$arch"
 	local deps
 	for i in $deprepo; do
 		deps="--repo $repodir/$i"
@@ -98,7 +103,7 @@ build() {
 		oldindex="--index APKINDEX.tar.gz"
 	fi
 	tmpindex=$(mktemp).tar.gz
-	apk index $oldindex -o $tmpindex \
+	apk index --rewrite-arch $arch $oldindex -o $tmpindex \
 		--description "$repo $(cd $aportsdir && git describe)" \
 		*.apk
 	abuild-sign $tmpindex && mv $tmpindex APKINDEX.tar.gz