diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-04-09 05:53:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 07:53:34 +0200 |
| commit | 967cf9df004aba4b883a2d35a01e159e10c3489c (patch) | |
| tree | 6418e4c3e42997a2d552b192c7651df8ebc1ce14 /scripts | |
| parent | 8d71437b8d41623fdd485b7d0f659b55860648b5 (diff) | |
| download | vyos-build-967cf9df004aba4b883a2d35a01e159e10c3489c.tar.gz vyos-build-967cf9df004aba4b883a2d35a01e159e10c3489c.zip | |
T2250: make build_dir a relative path
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-config | 2 | ||||
| -rwxr-xr-x | scripts/build-qemu-image | 14 | ||||
| -rwxr-xr-x | scripts/copy-image | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/scripts/build-config b/scripts/build-config index dd74a50e..c613b0e4 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -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"] diff --git a/scripts/build-qemu-image b/scripts/build-qemu-image index 29cb6cf1..7687db36 100755 --- a/scripts/build-qemu-image +++ b/scripts/build-qemu-image @@ -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 diff --git a/scripts/copy-image b/scripts/copy-image index 75e15b37..15e7cd53 100755 --- a/scripts/copy-image +++ b/scripts/copy-image @@ -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" |