From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Subject: [PATCH 4/6] remove hook from external ocaml repository
Date: Mon, 1 Mar 2010 11:59:49 +0000 [thread overview]
Message-ID: <1267444791-4810-5-git-send-email-vincent.hanquez@eu.citrix.com> (raw)
In-Reply-To: <1267444791-4810-1-git-send-email-vincent.hanquez@eu.citrix.com>
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
Signed-off-by: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
---
Config.mk | 6 ------
tools/Makefile | 21 ---------------------
tools/xenstore/Makefile | 5 -----
3 files changed, 0 insertions(+), 32 deletions(-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-remove-hook-from-external-ocaml-repository.patch --]
[-- Type: text/x-patch; name="0004-remove-hook-from-external-ocaml-repository.patch", Size: 2257 bytes --]
diff --git a/Config.mk b/Config.mk
index ad86e1e..45a4580 100644
--- a/Config.mk
+++ b/Config.mk
@@ -154,12 +154,6 @@ QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78
# Thu Feb 18 15:36:29 2010 +0000
# When xen_platform_pci=0 also disable fixed Xen platform ioports
-OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg
-
-# Build OCAML version of xenstored instead of the in-tree C version?
-# This will cause $(OCAML_XENSTORED_REPO) to be cloned.
-CONFIG_OCAML_XENSTORED ?= n
-
# Optional components
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n
diff --git a/tools/Makefile b/tools/Makefile
index 48c9802..c34dc86 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,7 +6,6 @@ SUBDIRS-y += check
SUBDIRS-y += include
SUBDIRS-y += libxc
SUBDIRS-y += flask
-SUBDIRS-$(CONFIG_OCAML_XENSTORED) += ocaml-xenstored
SUBDIRS-y += xenstore
SUBDIRS-y += misc
SUBDIRS-y += examples
@@ -114,23 +113,3 @@ subdir-clean-ioemu-dir:
$(buildmakevars2shellvars); \
$(MAKE) -C ioemu-dir clean; \
fi
-
-ocaml-xenstored:
- set -ex; \
- rm -rf ocaml-xenstored.tmp; \
- hg clone $(OCAML_XENSTORED_REPO) ocaml-xenstored.tmp; \
- if [ "$(OCAML_XENSTORED_TAG)" ]; then \
- hg -R ocaml-xenstored.tmp update -r $(OCAML_XENSTORED_TAG) ;\
- hg -R ocaml-xenstored.tmp branch mybranch ;\
- fi; \
- mv ocaml-xenstored.tmp ocaml-xenstored; \
-
-subdir-all-ocaml-xenstored subdir-install-ocaml-xenstored: ocaml-xenstored
- $(absolutify_xen_root); \
- $(MAKE) -C ocaml-xenstored $(patsubst subdir-%-ocaml-xenstored,%,$@);
-
-subdir-clean-ocaml-xenstored:
- set -e; if test -d ocaml-xenstored; then \
- $(MAKE) -C ocaml-xenstored clean; \
- fi
-
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index f64ba9f..6ef6ff0 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -95,11 +95,6 @@ tarball: clean
.PHONY: install
install: all
-ifneq ($(CONFIG_OCAML_XENSTORED),y)
- $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
-endif
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
next prev parent reply other threads:[~2010-03-01 11:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 11:59 [RFC][PATCH 0/6] merge ocaml xenstored and dependencies Vincent Hanquez
2010-03-01 11:59 ` [PATCH 1/6] add ocaml libs (xc/xb/xs/eventchn) Vincent Hanquez
2010-03-01 11:59 ` [PATCH 2/6] add ocaml xenstored Vincent Hanquez
2010-03-01 11:59 ` [PATCH 3/6] add compilation makefile to ocaml directory Vincent Hanquez
2010-03-01 11:59 ` Vincent Hanquez [this message]
2010-03-01 11:59 ` [PATCH 5/6] add ocaml tools to build if defined. default to n Vincent Hanquez
2010-03-01 11:59 ` [PATCH 6/6] default ocaml tools config variable to y Vincent Hanquez
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=1267444791-4810-5-git-send-email-vincent.hanquez@eu.citrix.com \
--to=vincent.hanquez@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/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).