fix armv7 basearch

2 files changed, 7 insertions, 6 deletions

diff --git a/basearch.sh b/basearch.sh
index 6fbaf2a..aa13bbe 100755
--- a/basearch.sh
+++ b/basearch.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 uname -m | sed				\
 	-e 's/i?86/i386/'		\
-	-e 's/armv7l.*/armv7hl/'
+	-e 's/armv7.*/armhfp/'
diff --git a/repos/Make-fedora-repo.sh b/repos/Make-fedora-repo.sh
index 1495e76..4b726d1 100755
--- a/repos/Make-fedora-repo.sh
+++ b/repos/Make-fedora-repo.sh
@@ -20,7 +20,7 @@ function makerepo() {
 
 	case "$basearch" in
 	aarch64)	base="$basesec"; kraxel="$armv8"		;;
-	armv7hl)	base="$basepri"; kraxel="$armv7"		;;
+	armhfp)		base="$basepri"; kraxel="$armv7"		;;
 	i386)		base="$basesec"					;;
 	x86_64)		base="$basepri"					;;
 	*)		echo "unknown basearch: $basearch"; exit 1	;;
@@ -74,12 +74,13 @@ EOF
 
 rels="25 26"
 reldev="26"
-archs="aarch64 armv7hl i386 x86_64"
+archs="aarch64 armhfp i386 x86_64"
 
 for rel in $rels; do
 	if test "$rel" = "$reldev"; then devel=1; else devel=0; fi
-	for arch in aarch64 armv7hl i386 x86_64; do
-		makerepo "$arch" "$rel" "$devel" \
-			| tee "fedora-${rel}-${arch}.repo"
+	for arch in $archs; do
+		repofile="fedora-${rel}-${arch}.repo"
+		echo "# writing $repofile"
+		makerepo "$arch" "$rel" "$devel" > "$repofile"
 	done
 done