WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-api

[Xen-API] [PATCH 9 of 9] HACK: Do not install some stuff which conflicts

To: xen-api@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-API] [PATCH 9 of 9] HACK: Do not install some stuff which conflicts with out-off-tree XCP versions of the same
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Tue, 11 Jan 2011 10:55:57 +0000
Cc: gianni.tedesco@xxxxxxxxxx, zheng.li@xxxxxxxxxxxxx
Delivery-date: Tue, 11 Jan 2011 03:46:48 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1294743348@xxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-api-request@lists.xensource.com?subject=help>
List-id: Discussion of API issues surrounding Xen <xen-api.lists.xensource.com>
List-post: <mailto:xen-api@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=unsubscribe>
References: <patchbomb.1294743348@xxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-api-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.5.2
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1294742832 0
# Node ID 947b7aab37c81be1cac7a61bb5e5ae125403b1a2
# Parent  eb4ac8ec9239aa0b6320388caab5d2162f20de4f
HACK: Do not install some stuff which conflicts with out-off-tree XCP versions 
of the same.

blktap issue is resolved by proper XCP packaging of the hypervisor tools rather
than my rather ad-hoc approach.

ocaml namespacing issues need some more thought, as mentioned in the overall
introductory email.

Not-Signed-of-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r eb4ac8ec9239 -r 947b7aab37c8 tools/Makefile
--- a/tools/Makefile    Tue Jan 11 10:47:12 2011 +0000
+++ b/tools/Makefile    Tue Jan 11 10:47:12 2011 +0000
@@ -21,8 +21,8 @@ SUBDIRS-$(VTPM_TOOLS) += vtpm
 SUBDIRS-y += xenstat
 SUBDIRS-$(CONFIG_Linux) += libaio
 SUBDIRS-$(CONFIG_Linux) += memshr 
-SUBDIRS-$(CONFIG_Linux) += blktap
-SUBDIRS-$(CONFIG_Linux) += blktap2
+#SUBDIRS-$(CONFIG_Linux) += blktap
+#SUBDIRS-$(CONFIG_Linux) += blktap2
 SUBDIRS-$(CONFIG_NetBSD) += libaio
 SUBDIRS-$(CONFIG_NetBSD) += blktap2
 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
@@ -46,7 +46,7 @@ SUBDIRS-$(CONFIG_X86) += debugger/kdd
 # These don't cross-compile
 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 SUBDIRS-$(PYTHON_TOOLS) += python
-SUBDIRS-$(PYTHON_TOOLS) += pygrub
+#SUBDIRS-$(PYTHON_TOOLS) += pygrub
 SUBDIRS-$(OCAML_TOOLS) += ocaml
 endif
 
diff -r eb4ac8ec9239 -r 947b7aab37c8 tools/blktap2/vhd/lib/Makefile
--- a/tools/blktap2/vhd/lib/Makefile    Tue Jan 11 10:47:12 2011 +0000
+++ b/tools/blktap2/vhd/lib/Makefile    Tue Jan 11 10:47:12 2011 +0000
@@ -63,9 +63,9 @@ libvhd.a: $(LIB-OBJS)
 
 install: all
        $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
-       $(INSTALL_DATA) $(LIBVHD) $(DESTDIR)$(INST-DIR)
-       ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) 
$(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
-       ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
+       #$(INSTALL_DATA) $(LIBVHD) $(DESTDIR)$(INST-DIR)
+       #ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) 
$(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
+       #ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
 
 clean:
        rm -rf *.a *.so* *.o *~ $(DEPS) $(LIBVHD)
diff -r eb4ac8ec9239 -r 947b7aab37c8 tools/ocaml/libs/log/Makefile
--- a/tools/ocaml/libs/log/Makefile     Tue Jan 11 10:47:12 2011 +0000
+++ b/tools/ocaml/libs/log/Makefile     Tue Jan 11 10:47:12 2011 +0000
@@ -32,9 +32,10 @@ syslog.mli : syslog.ml
 
 .PHONY: install
 install: $(LIBS) META
-       mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) log
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore log META 
$(INTF) $(LIBS) *.a *.so *.cmx
+### XXX need resyncing with xen-api-libs
+#      mkdir -p $(OCAMLDESTDIR)
+#      ocamlfind remove -destdir $(OCAMLDESTDIR) log
+#      ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore log META 
$(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api

<Prev in Thread] Current Thread [Next in Thread>