vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T2250: make build_dir a relative path

Browse Source
This commit is contained in:
Jernej Jakob 2020-04-09 05:53:34 +00:00 committed by GitHub
parent 8d71437b8d
commit 967cf9df00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build-config
View File

@ -120,7 +120,7 @@ if args['build_type'] == 'development':
# Populate some defaults that are not configurable,
# but that are handy to have in the options hash
args['distribution'] = build_defaults["debian_distribution"]
args['build_dir'] = os.path.join(os.getcwd(), defaults.BUILD_DIR)
args['build_dir'] = defaults.BUILD_DIR
args['pbuilder_config'] = defaults.PBUILDER_CONFIG
args['vyos_branch'] = build_defaults["vyos_branch"]

14
scripts/build-qemu-image
View File

@ -18,16 +18,16 @@
# 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)
export VERSION=$(cat $BUILD_DIR/version)
BUILD_DIR="$(scripts/query-json build/build-config.json build_dir)"
BUILD_ARCH="$(scripts/query-json build/build-config.json architecture)"
export VERSION="$(cat $BUILD_DIR/version)"
export ISO_IMAGE=./build/live-image-$BUILD_ARCH.hybrid.iso
export ISO_MD5_SUM=$(md5sum ${ISO_IMAGE} | awk '{print $1}')
export ISO_IMAGE="${BUILD_DIR}/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
export PACKER_LOG_PATH="${PACKER_BUILD_DIR}/build.log"
export PACKER_LOG=1
mkdir -p ${PACKER_BUILD_DIR}
mkdir -p "${PACKER_BUILD_DIR}"
packer build -only=qemu-image scripts/packer.json

8
scripts/copy-image
View File

@ -1,9 +1,9 @@
#!/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)
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 -rnsf $BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso $BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso
ln -rnsf "$BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso" "$BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso"