diff options
| author | Daniil Baturin <daniil@baturin.org> | 2017-01-26 21:27:12 -0500 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2017-01-26 21:27:12 -0500 |
| commit | 607dcde9bce70b17fbd24df7d441e6a1924983e9 (patch) | |
| tree | 364b0478124bbd7cefef4f1874f08d11b78fd459 | |
| parent | ea48b7bd747df4ae5c8ee64c72cdc67e31ddcd5a (diff) | |
| download | vyos-build-607dcde9bce70b17fbd24df7d441e6a1924983e9.tar.gz vyos-build-607dcde9bce70b17fbd24df7d441e6a1924983e9.zip | |
Account for different architectures in ISO naming.
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | scripts/build-qemu-image | 5 | ||||
| -rwxr-xr-x | scripts/copy-image | 7 |
3 files changed, 13 insertions, 2 deletions
@@ -29,7 +29,8 @@ iso: clean prepare @echo "It's not like I'm building this specially for you or anything!" cd $(build_dir) lb build 2>&1 | tee build.log - ln -nsf live-image-amd64.hybrid.iso vyos-`cat version`-`dpkg --print-architecture`.iso + cd .. + @scripts/copy-image .PHONY: prepare-package-env .ONESHELL: 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 diff --git a/scripts/copy-image b/scripts/copy-image new file mode 100755 index 00000000..01af511d --- /dev/null +++ b/scripts/copy-image @@ -0,0 +1,7 @@ +#!/bin/sh + +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) + +ln -nsf $BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso $BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso |