From 0c6b263f56725ad5b32d2506e9bf83a8df0f317c Mon Sep 17 00:00:00 2001
From: James Fuller <jim@webcomposite.com>
Date: Tue, 28 Nov 2023 21:36:37 +0100
Subject: [PATCH 1/2] add back linux/arm/v7

---
 create_multi.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/create_multi.sh b/create_multi.sh
index e69b488..6a051f9 100755
--- a/create_multi.sh
+++ b/create_multi.sh
@@ -24,8 +24,7 @@ buildah manifest create curl-base-multi:${release_tag}
 buildah manifest create curl-multi:${release_tag}
 
 # loop through supported arches
-# TODO: need to add back "linux/arm/v7"
-for IMGTAG in "linux/amd64" "linux/arm64" "linux/ppc64le" "linux/s390x" "linux/386" ; do
+for IMGTAG in "linux/amd64" "linux/arm64" "linux/ppc64le" "linux/s390x" "linux/386" "linux/arm/v7" ; do
   pathname="${IMGTAG////-}"
   echo "building $IMGTAG : $pathname"
  	./create_dev_image.sh "$IMGTAG" ${base} ${compiler} "$dev_deps" "$build_opts" ${branch_or_ref} curl-dev-${pathname}:${release_tag} 0

From 70a0c5ac330ee864ce72fad3b3488ec0bff860a5 Mon Sep 17 00:00:00 2001
From: James Fuller <jim@webcomposite.com>
Date: Tue, 28 Nov 2023 21:37:24 +0100
Subject: [PATCH 2/2] exp change

---
 create_dev_image.sh | 2 +-
 create_multi.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/create_dev_image.sh b/create_dev_image.sh
index 7baf1d6..ce4f871 100755
--- a/create_dev_image.sh
+++ b/create_dev_image.sh
@@ -76,7 +76,7 @@ else
 fi
 
 # build curl
-buildah run $bdr autoreconf -vif
+buildah run $bdr autoreconf -fi
 buildah run $bdr ./configure ${build_opts}
 buildah run $bdr make -j$(nproc)
 
diff --git a/create_multi.sh b/create_multi.sh
index 6a051f9..76b7615 100755
--- a/create_multi.sh
+++ b/create_multi.sh
@@ -24,7 +24,7 @@ buildah manifest create curl-base-multi:${release_tag}
 buildah manifest create curl-multi:${release_tag}
 
 # loop through supported arches
-for IMGTAG in "linux/amd64" "linux/arm64" "linux/ppc64le" "linux/s390x" "linux/386" "linux/arm/v7" ; do
+for IMGTAG in "linux/386" "linux/arm/v7" "linux/amd64" "linux/arm64" "linux/ppc64le" ; do
   pathname="${IMGTAG////-}"
   echo "building $IMGTAG : $pathname"
  	./create_dev_image.sh "$IMGTAG" ${base} ${compiler} "$dev_deps" "$build_opts" ${branch_or_ref} curl-dev-${pathname}:${release_tag} 0