diff options
| author | Patrick van Staveren <trick@vanstaveren.us> | 2016-02-01 07:32:26 +0900 |
|---|---|---|
| committer | Patrick van Staveren <trick@vanstaveren.us> | 2016-02-18 00:03:24 +0000 |
| commit | 775c50d622863b791f8c7dacc3e9020532291fe8 (patch) | |
| tree | 36ef80c6a9d89249fca82443d6b404023304dbfe | |
| parent | ed63b65af583a3eccda4509e8fc4d51682ba8148 (diff) | |
| download | vyos-build-775c50d622863b791f8c7dacc3e9020532291fe8.tar.gz vyos-build-775c50d622863b791f8c7dacc3e9020532291fe8.zip | |
Handle errors from subscripts.
Makefile .ONESHELL mode means that individual line exit codes
aren't evaluated, only the final return code from the shell,
which will always be zero.
This makes it break earlier when a subscript returns non-zero.
Maybe we shouldn't be using make? ;)
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -7,6 +7,7 @@ all: .PHONY: prepare prepare: + set -e @echo "Starting VyOS ISO image build" @scripts/check-build-env @@ -23,6 +24,7 @@ prepare: .PHONY: iso .ONESHELL: iso: prepare + set -e @echo "It's not like I'm building this specially for you or anything!" cd $(build_dir) lb build 2>&1 | tee build.log @@ -30,12 +32,14 @@ iso: prepare .PHONY: prepare-package-env .ONESHELL: prepare-package-env: + set -e @scripts/pbuilder-config @scripts/pbuilder-setup .PHONY: clean .ONESHELL: clean: + set -e cd $(build_dir) lb clean |