From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 13 Feb 2018 17:19:33 +0000 (+0100)
Subject: firmware/shim: correctly handle errors during Xen tree setup
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e139d34a1c4b7775d5855458a325e0e4176bdf7e;p=people%2Froyger%2Fxen.git

firmware/shim: correctly handle errors during Xen tree setup

"set -e" on a separate Makefile line is meaningless. Glue together all
the lines that this is supposed to cover.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 53eb3b6543..04d3c936ea 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -16,18 +16,18 @@ DEP_FILES=$(foreach i, $(LINK_FILES), $(XEN_ROOT)/$(i))
 
 linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
 	mkdir -p $(D)
-	set -e
 	rm -f linkfarm.stamp.tmp
+	set -e; \
 	$(foreach d, $(LINK_DIRS), \
 		 (mkdir -p $(D)/$(d); \
 		  cd $(D)/$(d); \
 		  find $(XEN_ROOT)/$(d)/ -type d |\
-			sed 's,^$(XEN_ROOT)/$(d)/,,g' | xargs mkdir -p);)
+			sed 's,^$(XEN_ROOT)/$(d)/,,g' | xargs mkdir -p);) \
 	$(foreach d, $(LINK_DIRS), \
 		(cd $(XEN_ROOT); \
 		 find $(d) ! -type l -type f \
 		 $(addprefix ! -path , '*.[oda1]' '*.d[12]')) \
-		 >> linkfarm.stamp.tmp ; )
+		 >> linkfarm.stamp.tmp ; ) \
 	$(foreach f, $(LINK_FILES), \
 		echo $(f) >> linkfarm.stamp.tmp ;)
 	cmp -s linkfarm.stamp.tmp linkfarm.stamp && \