[xen staging] tools/include: adjust x86-specific population of xen/

[patchbot@xxxxxxx]

commit c02fd5b1a4011c87bc7580fa338ffe9ce84cdc5f
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Oct 14 14:02:20 2020 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Oct 14 14:02:20 2020 +0200

    tools/include: adjust x86-specific population of xen/
    
    There's no need to use a shell loop construct here - ln's destination
    can be specified as just the intended directory, as we don't mean to
    change the names of any of the files. Also drop XEN_LIB_X86_INCLUDES for
    having a single use only, and don't pass -f to ln, to allow noticing
    name collisions right away.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Tested-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
    Acked-by: Wei Liu <wl@xxxxxxx>
---
 tools/include/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/include/Makefile b/tools/include/Makefile
index e7b4efcbfd..4db2d93887 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -12,8 +12,6 @@ all-y:
 xen-foreign:
        $(MAKE) -C xen-foreign
 
-XEN_LIB_X86_INCLUDES = $(filter-out %autogen.h, 
$(XEN_ROOT)/xen/include/xen/lib/x86/Makefile $(wildcard 
$(XEN_ROOT)/xen/include/xen/lib/x86/*.h))
-
 xen-dir:
        @rm -rf xen acpi
        mkdir -p xen/libelf acpi
@@ -26,11 +24,10 @@ xen-dir:
        ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/
        ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/
 ifeq ($(CONFIG_X86),y)
-       ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm
+       ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm
        mkdir -p xen/lib/x86
-       for f in $(patsubst 
$(XEN_ROOT)/xen/include/xen/lib/x86/%,%,$(XEN_LIB_X86_INCLUDES)); do \
-               ln -sf $(XEN_ROOT)/xen/include/xen/lib/x86/$$f xen/lib/x86/$$f; 
\
-       done
+       ln -s $(filter-out %autogen.h,$(wildcard 
$(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/
+       ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/
 endif
 
 all-$(CONFIG_X86): xen-dir
--
generated by git-patchbot for /home/xen/git/xen.git#staging