ia64/xen-unstable

changeset 6080:38c7c25b3cb9

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@osdl.org>
author kaf24@firebug.cl.cam.ac.uk
date Tue Aug 09 13:53:15 2005 +0000 (2005-08-09)
parents f40c6650152e
children 5a683386dc58 6a87d79f9ee0
files linux-2.4-xen-sparse/mkbuildtree linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c linux-2.6-xen-sparse/mkbuildtree
line diff
     1.1 --- a/linux-2.4-xen-sparse/mkbuildtree	Tue Aug 09 13:17:37 2005 +0000
     1.2 +++ b/linux-2.4-xen-sparse/mkbuildtree	Tue Aug 09 13:53:15 2005 +0000
     1.3 @@ -103,10 +103,9 @@ relative_lndir ${RS}
     1.4  rm -f mkbuildtree
     1.5  
     1.6  set ${RS}/../linux-2.6-xen-sparse
     1.7 -[ "$1" == "${RS}/../linux-2.6-xen-parse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6-xen-sparse"; exit 1; }
     1.8 +[ "$1" == "${RS}/../linux-2.6-xen-sparse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6-xen-sparse"; exit 1; }
     1.9  LINUX_26="$1"
    1.10  
    1.11 -
    1.12  # Create links to the shared definitions of the Xen interfaces.
    1.13  rm -rf ${AD}/include/asm-xen/xen-public
    1.14  mkdir  ${AD}/include/asm-xen/xen-public
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Tue Aug 09 13:17:37 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Tue Aug 09 13:53:15 2005 +0000
     2.3 @@ -4,7 +4,3 @@ xenbus-objs =
     2.4  xenbus-objs += xenbus_comms.o
     2.5  xenbus-objs += xenbus_xs.o
     2.6  xenbus-objs += xenbus_probe.o 
     2.7 -
     2.8 -XEN_TOOLS_DIR := "../tools"
     2.9 -vpath %.h $(XEN_TOOLS_DIR)
    2.10 -EXTRA_CFLAGS += -I $(XEN_TOOLS_DIR)
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Tue Aug 09 13:17:37 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Tue Aug 09 13:53:15 2005 +0000
     3.3 @@ -30,7 +30,6 @@
     3.4  
     3.5  #include <linux/errno.h>
     3.6  #include <linux/types.h>
     3.7 -#include "xenstore/xenstored.h"
     3.8  #include <linux/uio.h>
     3.9  #include <linux/kernel.h>
    3.10  #include <linux/string.h>
    3.11 @@ -39,6 +38,7 @@
    3.12  #include <linux/fcntl.h>
    3.13  #include <linux/kthread.h>
    3.14  #include <asm-xen/xenbus.h>
    3.15 +#include "xenstored.h"
    3.16  #include "xenbus_comms.h"
    3.17  
    3.18  #define streq(a, b) (strcmp((a), (b)) == 0)
     4.1 --- a/linux-2.6-xen-sparse/mkbuildtree	Tue Aug 09 13:17:37 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/mkbuildtree	Tue Aug 09 13:53:15 2005 +0000
     4.3 @@ -102,10 +102,11 @@ for i in `find . -type l`; do rm -f $i; 
     4.4  relative_lndir ${RS}
     4.5  rm -f mkbuildtree
     4.6  
     4.7 -
     4.8  # Create links to the shared definitions of the Xen interfaces.
     4.9  rm -rf ${AD}/include/asm-xen/xen-public
    4.10  mkdir  ${AD}/include/asm-xen/xen-public
    4.11  cd     ${AD}/include/asm-xen/xen-public
    4.12  relative_lndir ../../../${RS}/../xen/include/public
    4.13  
    4.14 +cd ${AD}/drivers/xen/xenbus
    4.15 +ln -sf ../../../${RS}/../tools/xenstore/xenstored.h