Merge pull request #1 from trickv/errorhandling

Enable handling of errors within .ONESHELL targets
This commit is contained in:
Daniil Baturin 2016-02-18 14:12:59 +05:00
commit f432d96722

View File

@ -7,6 +7,7 @@ all:
.PHONY: prepare .PHONY: prepare
prepare: prepare:
@set -e
@echo "Starting VyOS ISO image build" @echo "Starting VyOS ISO image build"
@scripts/check-build-env @scripts/check-build-env
@ -23,6 +24,7 @@ prepare:
.PHONY: iso .PHONY: iso
.ONESHELL: .ONESHELL:
iso: prepare iso: prepare
@set -e
@echo "It's not like I'm building this specially for you or anything!" @echo "It's not like I'm building this specially for you or anything!"
cd $(build_dir) cd $(build_dir)
lb build 2>&1 | tee build.log lb build 2>&1 | tee build.log
@ -30,12 +32,14 @@ iso: prepare
.PHONY: prepare-package-env .PHONY: prepare-package-env
.ONESHELL: .ONESHELL:
prepare-package-env: prepare-package-env:
@set -e
@scripts/pbuilder-config @scripts/pbuilder-config
@scripts/pbuilder-setup @scripts/pbuilder-setup
.PHONY: clean .PHONY: clean
.ONESHELL: .ONESHELL:
clean: clean:
@set -e
cd $(build_dir) cd $(build_dir)
lb clean lb clean