From 8309ca92d7353c956d7ea07a14486ec4043fc384 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 21 Apr 2017 10:04:41 -0700 Subject: [PATCH] build-aci: Add multi arch support Uses GOARCH to build for a targeted arch. Usage: GOARCH=... BINARYDIR=... BUILDDIR=... ./scripts/build-aci version Signed-off-by: Geoff Levand --- scripts/build-aci | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/build-aci b/scripts/build-aci index f13e9a7a5..f30a0af32 100755 --- a/scripts/build-aci +++ b/scripts/build-aci @@ -11,6 +11,13 @@ ACBUILD=${ACBUILD:-acbuild} VERSION=$1 +go2aci() { + case "${1}" in + "arm64") echo "aarch64";; + *) echo "${1}";; + esac +} + if ! command -v $ACBUILD >/dev/null; then echo "acbuild ($ACBUILD) is not executable" exit 1 @@ -63,6 +70,8 @@ acbuild --debug port add peer tcp 2380 acbuild --debug copy "$TMPHOSTS" /etc/hosts +acbuild --debug label add arch $(go2aci ${GOARCH}) + # mkdir default data-dir mkdir -p .acbuild/currentaci/rootfs/var/lib/etcd @@ -70,4 +79,4 @@ mkdir -p .acbuild/currentaci/rootfs/var/lib/etcd ln -s ./usr/local/bin/etcd .acbuild/currentaci/rootfs/etcd ln -s ./usr/local/bin/etcdctl .acbuild/currentaci/rootfs/etcdctl -acbuild --debug write --overwrite $BUILDDIR/etcd-${1}-linux-amd64.aci +acbuild --debug write --overwrite $BUILDDIR/etcd-${1}-linux-${GOARCH}.aci