From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent Hanquez Subject: [PATCH 4/6] remove hook from external ocaml repository Date: Mon, 1 Mar 2010 11:59:49 +0000 Message-ID: <1267444791-4810-5-git-send-email-vincent.hanquez@eu.citrix.com> References: <1267444791-4810-1-git-send-email-vincent.hanquez@eu.citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.0" Return-path: In-Reply-To: <1267444791-4810-1-git-send-email-vincent.hanquez@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Vincent Hanquez List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------1.7.0 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable Signed-off-by: Vincent Hanquez --- Config.mk | 6 ------ tools/Makefile | 21 --------------------- tools/xenstore/Makefile | 5 ----- 3 files changed, 0 insertions(+), 32 deletions(-) --------------1.7.0 Content-Type: text/x-patch; name="0004-remove-hook-from-external-ocaml-repository.patch" Content-Disposition: attachment; filename="0004-remove-hook-from-external-ocaml-repository.patch" Content-Transfer-Encoding: quoted-printable diff --git a/Config.mk b/Config.mk index ad86e1e..45a4580 100644 --- a/Config.mk +++ b/Config.mk @@ -154,12 +154,6 @@ QEMU_TAG ?=3D e5d14857cd67490bf956d97c8888c0be95ed3f= 78 # Thu Feb 18 15:36:29 2010 +0000 # When xen_platform_pci=3D0 also disable fixed Xen platform ioports =20 -OCAML_XENSTORED_REPO=3Dhttp://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 ?=3D n - # Optional components XENSTAT_XENTOP ?=3D y VTPM_TOOLS ?=3D 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 +=3D check SUBDIRS-y +=3D include SUBDIRS-y +=3D libxc SUBDIRS-y +=3D flask -SUBDIRS-$(CONFIG_OCAML_XENSTORED) +=3D ocaml-xenstored SUBDIRS-y +=3D xenstore SUBDIRS-y +=3D misc SUBDIRS-y +=3D 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-xenstor= ed - $(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 =20 .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) --------------1.7.0 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------1.7.0--