* [PATCH for-4.8] tools: Handle existing link to acpi directory
@ 2016-10-23 23:09 Boris Ostrovsky
2016-10-24 9:24 ` Wei Liu
0 siblings, 1 reply; 2+ messages in thread
From: Boris Ostrovsky @ 2016-10-23 23:09 UTC (permalink / raw)
To: xen-devel; +Cc: ian.jackson, Boris Ostrovsky, wei.liu2
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@oracle.com>
---
.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
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH for-4.8] tools: Handle existing link to acpi directory
2016-10-23 23:09 [PATCH for-4.8] tools: Handle existing link to acpi directory Boris Ostrovsky
@ 2016-10-24 9:24 ` Wei Liu
0 siblings, 0 replies; 2+ messages in thread
From: Wei Liu @ 2016-10-24 9:24 UTC (permalink / raw)
To: Boris Ostrovsky; +Cc: ian.jackson, wei.liu2, xen-devel
On Sun, Oct 23, 2016 at 07:09:19PM -0400, Boris Ostrovsky wrote:
> 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@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-24 9:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-23 23:09 [PATCH for-4.8] tools: Handle existing link to acpi directory Boris Ostrovsky
2016-10-24 9:24 ` Wei Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).