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-changelog

[Xen-changelog] Directly including ../tools breaks building in separate

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Directly including ../tools breaks building in separate object tree,
From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 09 Aug 2005 09:52:10 -0400
Delivery-date: Tue, 09 Aug 2005 13:52:42 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 38c7c25b3cb9e1adf756497d37c02d462d8f41f6
# Parent  f40c6650152e15aeed0481880fb6e3ff7736dbeb
Directly including ../tools breaks building in separate object tree,
as well as building from mkpatch patch (I believe Rik hit that one).
This puts xenstore headers in linux-public.

Signed-off-by: Chris Wright <chrisw@xxxxxxxx>

diff -r f40c6650152e -r 38c7c25b3cb9 linux-2.4-xen-sparse/mkbuildtree
--- a/linux-2.4-xen-sparse/mkbuildtree  Tue Aug  9 13:17:37 2005
+++ b/linux-2.4-xen-sparse/mkbuildtree  Tue Aug  9 13:53:15 2005
@@ -103,9 +103,8 @@
 rm -f mkbuildtree
 
 set ${RS}/../linux-2.6-xen-sparse
-[ "$1" == "${RS}/../linux-2.6-xen-parse" ] && { echo "no Linux 2.6 sparse tree 
at ${RS}/../linux-2.6-xen-sparse"; exit 1; }
+[ "$1" == "${RS}/../linux-2.6-xen-sparse" ] && { echo "no Linux 2.6 sparse 
tree at ${RS}/../linux-2.6-xen-sparse"; exit 1; }
 LINUX_26="$1"
-
 
 # Create links to the shared definitions of the Xen interfaces.
 rm -rf ${AD}/include/asm-xen/xen-public
diff -r f40c6650152e -r 38c7c25b3cb9 
linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile  Tue Aug  9 13:17:37 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile  Tue Aug  9 13:53:15 2005
@@ -4,7 +4,3 @@
 xenbus-objs += xenbus_comms.o
 xenbus-objs += xenbus_xs.o
 xenbus-objs += xenbus_probe.o 
-
-XEN_TOOLS_DIR := "../tools"
-vpath %.h $(XEN_TOOLS_DIR)
-EXTRA_CFLAGS += -I $(XEN_TOOLS_DIR)
diff -r f40c6650152e -r 38c7c25b3cb9 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Tue Aug  9 
13:17:37 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Tue Aug  9 
13:53:15 2005
@@ -30,7 +30,6 @@
 
 #include <linux/errno.h>
 #include <linux/types.h>
-#include "xenstore/xenstored.h"
 #include <linux/uio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -39,6 +38,7 @@
 #include <linux/fcntl.h>
 #include <linux/kthread.h>
 #include <asm-xen/xenbus.h>
+#include "xenstored.h"
 #include "xenbus_comms.h"
 
 #define streq(a, b) (strcmp((a), (b)) == 0)
diff -r f40c6650152e -r 38c7c25b3cb9 linux-2.6-xen-sparse/mkbuildtree
--- a/linux-2.6-xen-sparse/mkbuildtree  Tue Aug  9 13:17:37 2005
+++ b/linux-2.6-xen-sparse/mkbuildtree  Tue Aug  9 13:53:15 2005
@@ -102,10 +102,11 @@
 relative_lndir ${RS}
 rm -f mkbuildtree
 
-
 # Create links to the shared definitions of the Xen interfaces.
 rm -rf ${AD}/include/asm-xen/xen-public
 mkdir  ${AD}/include/asm-xen/xen-public
 cd     ${AD}/include/asm-xen/xen-public
 relative_lndir ../../../${RS}/../xen/include/public
 
+cd ${AD}/drivers/xen/xenbus
+ln -sf ../../../${RS}/../tools/xenstore/xenstored.h

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Directly including ../tools breaks building in separate object tree,, Xen patchbot -unstable <=