| @@ -3,7 +3,7 @@
Common subdirectories: a/plugins and b/plugins
diff -u a/rpmrebuild.sh b/rpmrebuild.sh
--- a/rpmrebuild.sh 2021-01-17 15:03:59.000000000 +0100
-+++ b/rpmrebuild.sh 2022-09-01 12:12:23.754787574 +0200
++++ b/rpmrebuild.sh 2022-09-01 12:35:36.636984806 +0200
@@ -163,7 +163,12 @@
{
Debug '(CheckArch)'
@@ -18,3 +18,24 @@
# pac_arch is got from RpmArch
RpmArch
+@@ -174,8 +179,19 @@
+ change_arch="";;
+ '(none)')
+ change_arch="";;
++ # work around setarch not knowing about armv7hl
+ *)
+- change_arch="setarch $pac_arch";;
++ change_arch="setarch $pac_arch"
++ if ! setarch "$pac_arch" -R true 2>/dev/null; then
++ Debug " architecture '$pac_arch' not supported by setarch"
++ if [ "$pac_arch" = "aarch64" ]; then
++ change_arch=linux64
++ else
++ change_arch=linux32
++ fi
++ Debug "using '$change_arch' instead."
++ fi
++ ;;
+ esac
+ Debug " change_arch=$change_arch"
+ return
|
