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-devel] [PATCH 5 of 5] HACK: Do not install some stuff which conflic

To: xen-devel@xxxxxxxxxxxxxxxxxxx, xen-api@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 5 of 5] 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, 07 Dec 2010 14:32:56 +0000
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Delivery-date: Tue, 07 Dec 2010 06:46:15 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1291732371@xxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <patchbomb.1291732371@xxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.5.2
# HG changeset patch
# User root@xxxxxxxxxxxxxxxxxxxxx
# Date 1291307719 18000
# Node ID 4030d0d9eb3cdf1f75965190805cf97e1a477602
# Parent  5aca7dd0284714d086b62b3504a39b67e23b65e2
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 5aca7dd02847 -r 4030d0d9eb3c tools/Makefile
--- a/tools/Makefile    Thu Dec 02 11:35:19 2010 -0500
+++ b/tools/Makefile    Thu Dec 02 11:35:19 2010 -0500
@@ -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 5aca7dd02847 -r 4030d0d9eb3c tools/blktap2/vhd/lib/Makefile
--- a/tools/blktap2/vhd/lib/Makefile    Thu Dec 02 11:35:19 2010 -0500
+++ b/tools/blktap2/vhd/lib/Makefile    Thu Dec 02 11:35:19 2010 -0500
@@ -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 5aca7dd02847 -r 4030d0d9eb3c tools/ocaml/libs/log/Makefile
--- a/tools/ocaml/libs/log/Makefile     Thu Dec 02 11:35:19 2010 -0500
+++ b/tools/ocaml/libs/log/Makefile     Thu Dec 02 11:35:19 2010 -0500
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

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