[Xen-changelog] [xen master] tools: Handle existing link to acpi directory

[patchbot@xxxxxxx]

commit 7b9a172af0583a0e8fa98f255325072daa7bb40d
Author:     Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
AuthorDate: Sun Oct 23 19:09:19 2016 -0400
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon Oct 24 11:08:36 2016 +0100

    tools: Handle existing link to acpi directory
    
    The link to acpi include directory is not removed by Makefile's 'clean'
    target. This can lead to make failure when making xen/.dir target if
    we try to create the link again.
    
    We can prevent this failure by (1) removing acpi link when cleaning up
    and (2) adding '-f' option to 'ln' (just like we do for other targets).
    
    We should also add tools/include/acpi link to .gitignore.
    
    Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 .gitignore             | 1 +
 tools/include/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4adeedb..6e5955e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,6 +168,7 @@ tools/hotplug/Linux/xen-hotplug-common.sh
 tools/hotplug/Linux/xendomains
 tools/hotplug/NetBSD/rc.d/xencommons
 tools/hotplug/NetBSD/rc.d/xendriverdomain
+tools/include/acpi
 tools/include/xen/*
 tools/include/xen-xsm/*
 tools/include/xen-foreign/*.(c|h|size)
diff --git a/tools/include/Makefile b/tools/include/Makefile
index d95d837..f1af91c 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -20,7 +20,7 @@ xen/.dir:
        ln -sf ../xen-sys/$(XEN_OS) xen/sys
        ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) 
xen/libelf/
        ln -s ../xen-foreign xen/foreign
-       ln -s $(XEN_ROOT)/xen/include/acpi acpi
+       ln -sf $(XEN_ROOT)/xen/include/acpi acpi
        touch $@
 
 # Not xen/xsm as that clashes with link to
@@ -60,7 +60,7 @@ install: all
 
 .PHONY: clean
 clean:
-       rm -rf xen xen-xsm
+       rm -rf xen xen-xsm acpi
        $(MAKE) -C xen-foreign clean
 
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

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