summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2016-02-18 14:12:59 +0500
committerDaniil Baturin <daniil@baturin.org>2016-02-18 14:12:59 +0500
commitf432d9672202ff7f5e2e2ea2ce071f29db50d7f2 (patch)
treee5a5880a160af67f44c9d68046e24ac86ecf5169
parented63b65af583a3eccda4509e8fc4d51682ba8148 (diff)
parent285f9672490ca3462ebf6e40555e2b7f80bd226b (diff)
downloadvyos-build-f432d9672202ff7f5e2e2ea2ce071f29db50d7f2.tar.gz
vyos-build-f432d9672202ff7f5e2e2ea2ce071f29db50d7f2.zip
Merge pull request #1 from trickv/errorhandling
Enable handling of errors within .ONESHELL targets
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 84839ce3..38448f39 100644
--- a/Makefile
+++ b/Makefile
@@ -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