summaryrefslogtreecommitdiff
path: root/scripts/build-qemu-image
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2017-01-26 21:27:12 -0500
committerDaniil Baturin <daniil@baturin.org>2017-01-26 21:27:12 -0500
commit607dcde9bce70b17fbd24df7d441e6a1924983e9 (patch)
tree364b0478124bbd7cefef4f1874f08d11b78fd459 /scripts/build-qemu-image
parentea48b7bd747df4ae5c8ee64c72cdc67e31ddcd5a (diff)
downloadvyos-build-607dcde9bce70b17fbd24df7d441e6a1924983e9.tar.gz
vyos-build-607dcde9bce70b17fbd24df7d441e6a1924983e9.zip
Account for different architectures in ISO naming.
Diffstat (limited to 'scripts/build-qemu-image')
-rwxr-xr-xscripts/build-qemu-image5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build-qemu-image b/scripts/build-qemu-image
index 4a67f0f3..59a42f07 100755
--- a/scripts/build-qemu-image
+++ b/scripts/build-qemu-image
@@ -18,8 +18,11 @@
# Purpose:
# Build VyOS raw image for qemu.
+BUILD_DIR=$(scripts/query-json build/build-config.json build_dir)
+BUILD_ARCH=$(scripts/query-json build/build-config.json architecture)
+VERSION=$(cat $BUILD_DIR/version)
-export ISO_IMAGE=./build/live-image-amd64.hybrid.iso
+export ISO_IMAGE=./build/live-image-$BUILD_ARCH.hybrid.iso
export ISO_MD5_SUM=$(md5sum ${ISO_IMAGE} | awk '{print $1}')
export PACKER_BUILD_DIR=packer_build
export PACKER_LOG_PATH=${PACKER_BUILD_DIR}/build.log