From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: [PATCH 2/6] tools/include: fix (drop) dependencies of when to populate xen/
Date: Thu, 10 Sep 2020 14:12:04 +0200 [thread overview]
Message-ID: <91bba197-83d5-b9eb-3a1c-8bc00571b844@suse.com> (raw)
In-Reply-To: <2a9f86aa-9104-8a45-cd21-72acd693f924@suse.com>
Making the population of xen/ depend on the time stamps of a subset of
the headers put there is error prone. The creation of a few dozen
symlinks doesn't take a meaningful amount of time (compared to the
overall building of tools/), and hence - to be on the safe side - should
simply be done always. Convert the goal to a phony one and drop its
dependencies, effectively taking further what 8d8d7d6b3dc1 ("tools: fix
linking hypervisor includes to tools include directory") had already
attempted.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -4,8 +4,8 @@ include $(XEN_ROOT)/tools/Rules.mk
# Relative to $(XEN_ROOT)/xen/xsm/flask
FLASK_H_DEPEND := policy/initial_sids
-.PHONY: all all-y build
-all build: all-y xen-foreign xen/.dir xen-xsm/.dir
+.PHONY: all all-y build xen-dir
+all build: all-y xen-foreign xen-dir xen-xsm/.dir
all-y:
.PHONY: xen-foreign
@@ -15,7 +15,7 @@ xen-foreign:
XEN_PUBLIC_INCLUDES = $(wildcard $(XEN_ROOT)/xen/include/public/*.h)
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: $(XEN_PUBLIC_INCLUDES) $(XEN_LIB_X86_INCLUDES)
+xen-dir:
@rm -rf xen acpi
mkdir -p xen/libelf acpi
ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen
@@ -33,9 +33,8 @@ ifeq ($(CONFIG_X86),y)
ln -sf $(XEN_ROOT)/xen/include/xen/lib/x86/$$f xen/lib/x86/$$f; \
done
endif
- touch $@
-all-$(CONFIG_X86): xen/.dir
+all-$(CONFIG_X86): xen-dir
$(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT) PYTHON=$(PYTHON)
# Not xen/xsm as that clashes with link to
next prev parent reply other threads:[~2020-09-10 12:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 12:09 [PATCH 0/6] tools/include: adjustments to the population of xen/ Jan Beulich
2020-09-10 12:11 ` [PATCH 1/6] tools/include: adjust population of acpi/ Jan Beulich
2020-09-10 12:12 ` Jan Beulich [this message]
2020-09-10 12:12 ` [PATCH 3/6] tools/include: adjust population of public headers into xen/ Jan Beulich
2020-09-10 12:12 ` [PATCH 4/6] tools/include: properly install Arm public headers Jan Beulich
2020-09-10 12:13 ` [PATCH 5/6] tools/include: adjust x86-specific population of xen/ Jan Beulich
2020-09-10 12:13 ` [PATCH 6/6] tools/include: drop remaining -f from ln invocations Jan Beulich
2020-09-10 13:51 ` [PATCH 0/6] tools/include: adjustments to the population of xen/ Andrew Cooper
2020-09-10 14:00 ` Jürgen Groß
2020-09-10 14:06 ` Jan Beulich
2020-09-28 8:30 ` Ping: " Jan Beulich
2020-10-01 16:03 ` Jan Beulich
2020-10-01 16:29 ` Bertrand Marquis
2020-10-01 16:43 ` Bertrand Marquis
2020-10-02 4:27 ` Jürgen Groß
2020-10-02 9:46 ` Bertrand Marquis
2020-10-02 10:17 ` Bertrand Marquis
2020-10-02 11:52 ` 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=91bba197-83d5-b9eb-3a1c-8bc00571b844@suse.com \
--to=jbeulich@suse.com \
--cc=iwj@xenproject.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.