mirror of
https://github.com/vyos/vyos-build.git
synced 2025-10-01 20:28:40 +02:00
Account for different architectures in ISO naming.
This commit is contained in:
parent
ea48b7bd74
commit
607dcde9bc
3
Makefile
3
Makefile
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
7
scripts/copy-image
Executable file
7
scripts/copy-image
Executable file
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user