[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen stable-4.10] firmware/shim: avoid mkdir error during Xen tree setup



commit 7dc817b7508e96ae7e4330e0871bd4a393b492b6
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Feb 14 08:16:00 2018 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon Mar 5 19:18:45 2018 +0000

    firmware/shim: avoid mkdir error during Xen tree setup
    
    "mkdir -p" reports a missing operand, as config/ has no subdirs. Oddly
    enough this doesn't cause the whole command (and hence the build to
    fail), despite the "set -e" now covering the entire set of commands -
    perhaps a quirk of the relatively old bash I've seen this with (a few
    simple experiments suggest that commands inside () producing a non-
    success status would exit the inner shell, but not the outer one).
    
    Add a dummy . argument to the invocation.
    
    Suggested-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    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 f25dce4a2adf518678280495712d66e627adec1e)
---
 tools/firmware/xen-dir/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 04d3c936ea..7fd36a0e15 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -22,7 +22,7 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
                 (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 \
--
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

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.