buildpackages: do not hardcode x86_64 in build scripts

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit c5182f257c86321e6cb6ba2f1d50432c0b81e6f6)

diff --git a/tasks/buildpackages/Makefile b/tasks/buildpackages/Makefile
index 4315ed98d01369fe67b38e01369f57632bb9b5dc..137c63bdb1f122c701d37c199d6ac75c5522163e 100644 (file)
--- a/tasks/buildpackages/Makefile
+++ b/tasks/buildpackages/Makefile
@@ -58,7 +58,7 @@ ceph-${CEPH_PKG_TYPE}-${CEPH_DIST}-${CEPH_ARCH}-${CEPH_FLAVOR}-${CEPH_SHA1}: ${P
        for delay in 1 2 4 8 8 8 8 8 8 8 8 8 16 16 16 16 16 32 32 32 64 128 256 512 ; do if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else sleep $$delay ; fi ; done ; \
        scp make-${CEPH_PKG_TYPE}.sh common.sh ubuntu@$$ip: ; \
        packages_repository=$(call get_ip,${<F}) ; \
-       ssh -tt -A ubuntu@$$ip bash ./make-${CEPH_PKG_TYPE}.sh $$packages_repository ${CEPH_DIST} ${CEPH_GIT_URL} ${CEPH_SHA1} ${CEPH_FLAVOR}
+       ssh -tt -A ubuntu@$$ip bash ./make-${CEPH_PKG_TYPE}.sh $$packages_repository ${CEPH_DIST} ${CEPH_GIT_URL} ${CEPH_SHA1} ${CEPH_FLAVOR} ${CEPH_ARCH}
        mkdir -p ${D}/${@D} ; touch ${D}/$@
 
 clobber:

diff --git a/tasks/buildpackages/make-deb.sh b/tasks/buildpackages/make-deb.sh
index e024948393fdfbc9e62514295e0dd14f1c011961..ffbd3f9c00aad8792f1381431e1eae1b7e63e35d 100755 (executable)
--- a/tasks/buildpackages/make-deb.sh
+++ b/tasks/buildpackages/make-deb.sh
@@ -27,6 +27,7 @@ codename=$2
 git_ceph_url=$3
 sha1=$4
 flavor=$5
+arch=$6
 
 sudo apt-get update
 sudo apt-get install -y git
@@ -117,7 +118,6 @@ function build_repo() {
     # Create a repository in a directory with a name structured
     # as
     #
-    arch=x86_64
     base=ceph-deb-$codename-$arch-$flavor
     sha1_dir=$codename/$base/sha1/$sha1
     mkdir -p $sha1_dir/conf

diff --git a/tasks/buildpackages/make-rpm.sh b/tasks/buildpackages/make-rpm.sh
index d7db141992c9b88dc02cb12147a172e606bba063..d8eed09e7220b44388b080dbd523a319ade73aec 100755 (executable)
--- a/tasks/buildpackages/make-rpm.sh
+++ b/tasks/buildpackages/make-rpm.sh
@@ -28,6 +28,7 @@ codename=$2
 git_ceph_url=$3
 sha1=$4
 flavor=$5
+arch=$6
 
 sudo yum install -y git
 
@@ -53,7 +54,6 @@ ceph_dir=$(pwd)
 # Create a repository in a directory with a name structured
 # as
 #
-arch=x86_64
 base=ceph-rpm-$codename-$arch-$flavor
 
 function setup_rpmmacros() {