[Xen-changelog] [xen stable-4.10] firmware/shim: correctly handle errors during Xen tree setup

[patchbot@xxxxxxx]

commit 21080841ae103fb47f1bdf1e5d024c5ebefddf3e
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Feb 13 18:19:33 2018 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon Mar 5 19:18:35 2018 +0000

    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@xxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit e139d34a1c4b7775d5855458a325e0e4176bdf7e)
---
 tools/firmware/xen-dir/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 && \
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.10

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog