From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH RFC v1 10/14] Makefile: require QEMU_ROOT to be defined
Date: Thu, 10 Mar 2016 16:52:31 +0000 [thread overview]
Message-ID: <1457628755-20267-11-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1457628755-20267-1-git-send-email-wei.liu2@citrix.com>
Don't tread into xen.git and clone one there.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Makefile | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
index 19b80a0..ff15d16 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,10 @@ ifeq (,$(MINIOS_ROOT))
$(error Please define MINIOS_ROOT environment variable)
endif
+ifeq (,$(QEMU_ROOT))
+ $(error Please define QEMU_ROOT environment variable)
+endif
+
export MINI_OS=$(MINIOS_ROOT)
export STUBDOM_ROOT=$(CURDIR)
export XEN_ROOT
@@ -272,36 +276,15 @@ $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp
.PHONY: $(CROSS_ROOT)
$(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
-QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi)
+export QEMU_ROOT
ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),)
IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp
endif
-ifeq ($(QEMU_ROOT),.)
-$(XEN_ROOT)/tools/qemu-xen-traditional-dir:
- $(MAKE) DESTDIR= -C $(XEN_ROOT)/tools qemu-xen-traditional-dir-find
-
-ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/qemu-xen-traditional-dir
- mkdir -p ioemu
- set -e; \
- $(buildmakevars2shellvars); \
- cd ioemu; \
- src="$$XEN_ROOT/tools/qemu-xen-traditional-dir"; export src; \
- (cd $$src && find * -type d -print) | xargs mkdir -p; \
- (cd $$src && find * ! -type l -type f $(addprefix ! -name , \
- '*.[oda1]' 'config-*' config.mak qemu-dm qemu-img-xen \
- '*.html' '*.pod' \
- )) | \
- while read f; do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done
- touch ioemu/linkfarm.stamp
-else
-export QEMU_ROOT
-
ioemu/linkfarm.stamp:
mkdir -p ioemu
touch ioemu/linkfarm.stamp
-endif
mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET)
$(MAKE) -C $(XEN_ROOT)/tools/include
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-10 16:58 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-10 16:46 [RFC PATCH v1] Splitting off stubdom to a different tree Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 0/6] xen: split stubdom from xen.git Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 1/6] config: don't hard-code mini-os path Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 2/6] tools: use "?=" to set XEN_ROOT in Makefile Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 3/6] libxc: use $XEN_ROOT to reference libelf in xen Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 4/6] libxl: generate and install stubdompath.sh Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 5/6] Unhook stubdom from build system Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 6/6] Remove stubdom directory Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 00/14] stubdom: split stubdom from xen.git Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 01/14] Import more files " Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 02/14] Makefile: introduce dist target Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 03/14] Add a gitignore Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 04/14] Makefile: require XEN_ROOT and MINI_OS to be defined Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 05/14] Makefile: replace MINI_OS with MINIOS_ROOT Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 06/14] pciutils: don't use hard-coded XEN_ROOT Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 07/14] grub: " Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 08/14] Makefile: export STUBDOM_ROOT Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target Wei Liu
2016-03-31 10:21 ` Xu, Quan
2016-03-31 13:49 ` Wei Liu
2016-04-01 1:41 ` Xu, Quan
2016-04-01 10:03 ` Wei Liu
2016-04-06 9:09 ` Xu, Quan
2016-04-06 9:39 ` Wei Liu
2016-04-25 14:27 ` Wei Liu
2016-07-05 13:53 ` Xu, Quan
2016-07-05 13:57 ` Wei Liu
2016-03-10 16:52 ` Wei Liu [this message]
2016-03-10 16:52 ` [PATCH RFC v1 11/14] Makefile: always include Config.mk from xen source tree Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 12/14] Makefile: delete ioemu directory in clean target Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 13/14] Makefile: fix removing *.mk Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 14/14] Add README file Wei Liu
2016-03-10 18:33 ` Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 0/2] mini-os: split stubdom from xen.git Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 1/2] Config.mk: use MINI_OS if specified Wei Liu
2016-03-10 16:52 ` [PATCH RFC v1 2/2] Makefile: introduce STUBDOM_ROOT Wei Liu
2016-03-15 0:20 ` [RFC PATCH v1] Splitting off stubdom to a different tree Samuel Thibault
2016-03-15 12:30 ` Wei Liu
2016-03-15 14:22 ` Wei Liu
2016-03-15 18:26 ` 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=1457628755-20267-11-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--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 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).