From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xen.org
Cc: ian.jackson@eu.citrix.com,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
wei.liu2@citrix.com
Subject: [PATCH for-4.8] tools: Handle existing link to acpi directory
Date: Sun, 23 Oct 2016 19:09:19 -0400 [thread overview]
Message-ID: <1477264159-15019-1-git-send-email-boris.ostrovsky@oracle.com> (raw)
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
next reply other threads:[~2016-10-23 23:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-23 23:09 Boris Ostrovsky [this message]
2016-10-24 9:24 ` [PATCH for-4.8] tools: Handle existing link to acpi directory Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477264159-15019-1-git-send-email-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).