From 6a0f18a2b74e70701dbc516921a7f9c025db34a5 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Sat, 10 Dec 2016 10:14:23 -0800 Subject: [PATCH] build: stop tarball builds on error The snapshot/tarball builds use some shell constructs that end up causing failures at various stages to be ignored. This commit addresses that. Signed-off-by: Steve Beattie Acked-by: John Johansen --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 37f1d8220..d4d6f632a 100644 --- a/Makefile +++ b/Makefile @@ -39,18 +39,18 @@ TAR_EXCLUSIONS= .PHONY: tarball tarball: clean - REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \ - make export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} ; \ - make setup __SETUP_DIR=${RELEASE_DIR} ; \ + REPO_VERSION=`$(value REPO_VERSION_CMD)` && \ + make export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} && \ + make setup __SETUP_DIR=${RELEASE_DIR} && \ tar ${TAR_EXCLUSIONS} -cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR} .PHONY: snapshot snapshot: clean $(eval REPO_VERSION:=$(shell $(value REPO_VERSION_CMD))) $(eval SNAPSHOT_NAME=apparmor-$(VERSION)~$(REPO_VERSION)) - make export_dir __EXPORT_DIR=${SNAPSHOT_NAME} __REPO_VERSION=${REPO_VERSION} ; \ - make setup __SETUP_DIR=${SNAPSHOT_NAME} ; \ - tar ${TAR_EXCLUSIONS} -cvzf ${SNAPSHOT_NAME}.tar.gz ${SNAPSHOT_NAME} ; + make export_dir __EXPORT_DIR=${SNAPSHOT_NAME} __REPO_VERSION=${REPO_VERSION} && \ + make setup __SETUP_DIR=${SNAPSHOT_NAME} && \ + tar ${TAR_EXCLUSIONS} -cvzf ${SNAPSHOT_NAME}.tar.gz ${SNAPSHOT_NAME} .PHONY: coverity coverity: snapshot