[Xen-devel] [PATCH 1/4] firmware/shim: correctly handle errors during Xen tree setup

["Jan Beulich" <JBeulich@xxxxxxxx>]

"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@xxxxxxxx>

--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -16,18 +16,18 @@ DEP_FILES=$(foreach i, $(LINK_FILES), $(
 
 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 && \




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel