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

T361: check the build environment setup in ./configure before it can even get to make.

Browse Source
This commit is contained in:
Daniil Baturin 2017-08-21 18:49:34 -04:00
parent f4518abe2e
commit ac391c82d1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -5,14 +5,15 @@ all:
@echo "Make what specifically?"
@echo "The most common target is 'iso'"
.PHONY: check_build_config
check_build_config:
@scripts/check-config
.PHONY: prepare
prepare:
@set -e
@echo "Starting VyOS ISO image build"
@scripts/check-build-env
@scripts/check-config
rm -rf build/config/*
@scripts/live-build-config
cp -r data/live-build-config/* build/config/
@ -24,7 +25,7 @@ prepare:
.PHONY: iso
.ONESHELL:
iso: clean prepare
iso: check_build_config clean prepare
@set -e
@echo "It's not like I'm building this specially for you or anything!"
cd $(build_dir)

5
scripts/build-config
View File

@ -97,6 +97,11 @@ args['distribution'] = defaults.DEBIAN_DISTRIBUTION
args['build_dir'] = os.path.join(os.getcwd(), defaults.BUILD_DIR)
args['pbuilder_config'] = defaults.PBUILDER_CONFIG
# Check the build environment and dependencies
env_check_retval = os.system("scripts/check-build-env")
if env_check_retval > 0:
print("Build environment check failed, fix the issues and retry")
# Save to file
distutils.dir_util.mkpath(defaults.BUILD_DIR)