direct-io.hg

changeset 15206:267ccb919967

Remove a few stray references to the sparse tree.

The only non-obvious change here is in tools/xenfb/Makefile. This now picks up
the headers it requires via the copy in tools/libxc.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Mon Jun 04 12:47:53 2007 +0100 (2007-06-04)
parents 20ee22a089ea
children c388a2ff1b8e
files tools/Rules.mk tools/blktap/drivers/Makefile tools/guest-headers/Makefile tools/include/Linux/evtchn.h tools/include/Linux/gntdev.h tools/include/Linux/privcmd.h tools/misc/xen-clone tools/xenfb/Makefile
line diff
     1.1 --- a/tools/Rules.mk	Mon Jun 04 11:37:50 2007 +0100
     1.2 +++ b/tools/Rules.mk	Mon Jun 04 12:47:53 2007 +0100
     1.3 @@ -41,11 +41,11 @@ check-$(CONFIG_X86) = $(call cc-ver-chec
     1.4  
     1.5  mk-symlinks-SunOS:
     1.6  
     1.7 -mk-symlinks-Linux: LINUX_ROOT=$(XEN_ROOT)/linux-2.6-xen-sparse
     1.8 +mk-symlinks-Linux: LINUX_ROOT=$(XEN_ROOT)/tools/include/Linux
     1.9  mk-symlinks-Linux:
    1.10  	mkdir -p xen/linux
    1.11  	( cd xen/linux && \
    1.12 -	  ln -sf ../../$(LINUX_ROOT)/include/xen/public/*.h . )
    1.13 +	  ln -sf ../../$(LINUX_ROOT)/*.h . )
    1.14  	( cd xen && rm -f sys && ln -sf linux sys )
    1.15  
    1.16  mk-symlinks-xen:
     2.1 --- a/tools/blktap/drivers/Makefile	Mon Jun 04 11:37:50 2007 +0100
     2.2 +++ b/tools/blktap/drivers/Makefile	Mon Jun 04 12:47:53 2007 +0100
     2.3 @@ -38,9 +38,6 @@ BLK-OBJS  += aes.o
     2.4  
     2.5  all: $(IBIN) qcow-util
     2.6  
     2.7 -LINUX_ROOT := $(wildcard $(XEN_ROOT)/linux-2.6.*-xen-sparse)
     2.8 -
     2.9 -
    2.10  blktapctrl: blktapctrl.c
    2.11  	$(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
    2.12  
     3.1 --- a/tools/guest-headers/Makefile	Mon Jun 04 11:37:50 2007 +0100
     3.2 +++ b/tools/guest-headers/Makefile	Mon Jun 04 12:47:53 2007 +0100
     3.3 @@ -1,8 +1,6 @@
     3.4  XEN_ROOT=../..
     3.5  include $(XEN_ROOT)/tools/Rules.mk
     3.6  
     3.7 -linuxsparsetree = $(XEN_ROOT)/linux-2.6-xen-sparse
     3.8 -
     3.9  .PHONY: all
    3.10  all:
    3.11  
    3.12 @@ -13,7 +11,7 @@ check:
    3.13  
    3.14  install-Linux:
    3.15  	mkdir -p $(DESTDIR)/usr/include/xen/linux
    3.16 -	$(INSTALL_DATA) $(linuxsparsetree)/include/xen/public/*.h $(DESTDIR)/usr/include/xen/linux
    3.17 +	$(INSTALL_DATA) $(XEN_ROOT)/tools/include/Linux/*.h $(DESTDIR)/usr/include/xen/linux
    3.18  
    3.19  install-SunOS:
    3.20  
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/tools/include/Linux/evtchn.h	Mon Jun 04 12:47:53 2007 +0100
     4.3 @@ -0,0 +1,88 @@
     4.4 +/******************************************************************************
     4.5 + * evtchn.h
     4.6 + * 
     4.7 + * Interface to /dev/xen/evtchn.
     4.8 + * 
     4.9 + * Copyright (c) 2003-2005, K A Fraser
    4.10 + * 
    4.11 + * This program is free software; you can redistribute it and/or
    4.12 + * modify it under the terms of the GNU General Public License version 2
    4.13 + * as published by the Free Software Foundation; or, when distributed
    4.14 + * separately from the Linux kernel or incorporated into other
    4.15 + * software packages, subject to the following license:
    4.16 + * 
    4.17 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    4.18 + * of this source file (the "Software"), to deal in the Software without
    4.19 + * restriction, including without limitation the rights to use, copy, modify,
    4.20 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    4.21 + * and to permit persons to whom the Software is furnished to do so, subject to
    4.22 + * the following conditions:
    4.23 + * 
    4.24 + * The above copyright notice and this permission notice shall be included in
    4.25 + * all copies or substantial portions of the Software.
    4.26 + * 
    4.27 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    4.28 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    4.29 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    4.30 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    4.31 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    4.32 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    4.33 + * IN THE SOFTWARE.
    4.34 + */
    4.35 +
    4.36 +#ifndef __LINUX_PUBLIC_EVTCHN_H__
    4.37 +#define __LINUX_PUBLIC_EVTCHN_H__
    4.38 +
    4.39 +/*
    4.40 + * Bind a fresh port to VIRQ @virq.
    4.41 + * Return allocated port.
    4.42 + */
    4.43 +#define IOCTL_EVTCHN_BIND_VIRQ				\
    4.44 +	_IOC(_IOC_NONE, 'E', 0, sizeof(struct ioctl_evtchn_bind_virq))
    4.45 +struct ioctl_evtchn_bind_virq {
    4.46 +	unsigned int virq;
    4.47 +};
    4.48 +
    4.49 +/*
    4.50 + * Bind a fresh port to remote <@remote_domain, @remote_port>.
    4.51 + * Return allocated port.
    4.52 + */
    4.53 +#define IOCTL_EVTCHN_BIND_INTERDOMAIN			\
    4.54 +	_IOC(_IOC_NONE, 'E', 1, sizeof(struct ioctl_evtchn_bind_interdomain))
    4.55 +struct ioctl_evtchn_bind_interdomain {
    4.56 +	unsigned int remote_domain, remote_port;
    4.57 +};
    4.58 +
    4.59 +/*
    4.60 + * Allocate a fresh port for binding to @remote_domain.
    4.61 + * Return allocated port.
    4.62 + */
    4.63 +#define IOCTL_EVTCHN_BIND_UNBOUND_PORT			\
    4.64 +	_IOC(_IOC_NONE, 'E', 2, sizeof(struct ioctl_evtchn_bind_unbound_port))
    4.65 +struct ioctl_evtchn_bind_unbound_port {
    4.66 +	unsigned int remote_domain;
    4.67 +};
    4.68 +
    4.69 +/*
    4.70 + * Unbind previously allocated @port.
    4.71 + */
    4.72 +#define IOCTL_EVTCHN_UNBIND				\
    4.73 +	_IOC(_IOC_NONE, 'E', 3, sizeof(struct ioctl_evtchn_unbind))
    4.74 +struct ioctl_evtchn_unbind {
    4.75 +	unsigned int port;
    4.76 +};
    4.77 +
    4.78 +/*
    4.79 + * Unbind previously allocated @port.
    4.80 + */
    4.81 +#define IOCTL_EVTCHN_NOTIFY				\
    4.82 +	_IOC(_IOC_NONE, 'E', 4, sizeof(struct ioctl_evtchn_notify))
    4.83 +struct ioctl_evtchn_notify {
    4.84 +	unsigned int port;
    4.85 +};
    4.86 +
    4.87 +/* Clear and reinitialise the event buffer. Clear error condition. */
    4.88 +#define IOCTL_EVTCHN_RESET				\
    4.89 +	_IOC(_IOC_NONE, 'E', 5, 0)
    4.90 +
    4.91 +#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/tools/include/Linux/gntdev.h	Mon Jun 04 12:47:53 2007 +0100
     5.3 @@ -0,0 +1,105 @@
     5.4 +/******************************************************************************
     5.5 + * gntdev.h
     5.6 + * 
     5.7 + * Interface to /dev/xen/gntdev.
     5.8 + * 
     5.9 + * Copyright (c) 2007, D G Murray
    5.10 + * 
    5.11 + * This program is free software; you can redistribute it and/or
    5.12 + * modify it under the terms of the GNU General Public License version 2
    5.13 + * as published by the Free Software Foundation; or, when distributed
    5.14 + * separately from the Linux kernel or incorporated into other
    5.15 + * software packages, subject to the following license:
    5.16 + * 
    5.17 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    5.18 + * of this source file (the "Software"), to deal in the Software without
    5.19 + * restriction, including without limitation the rights to use, copy, modify,
    5.20 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    5.21 + * and to permit persons to whom the Software is furnished to do so, subject to
    5.22 + * the following conditions:
    5.23 + * 
    5.24 + * The above copyright notice and this permission notice shall be included in
    5.25 + * all copies or substantial portions of the Software.
    5.26 + * 
    5.27 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    5.28 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    5.29 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    5.30 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    5.31 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    5.32 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    5.33 + * IN THE SOFTWARE.
    5.34 + */
    5.35 +
    5.36 +#ifndef __LINUX_PUBLIC_GNTDEV_H__
    5.37 +#define __LINUX_PUBLIC_GNTDEV_H__
    5.38 +
    5.39 +struct ioctl_gntdev_grant_ref {
    5.40 +	/* The domain ID of the grant to be mapped. */
    5.41 +	uint32_t domid;
    5.42 +	/* The grant reference of the grant to be mapped. */
    5.43 +	uint32_t ref;
    5.44 +};
    5.45 +
    5.46 +/*
    5.47 + * Inserts the grant references into the mapping table of an instance
    5.48 + * of gntdev. N.B. This does not perform the mapping, which is deferred
    5.49 + * until mmap() is called with @index as the offset.
    5.50 + */
    5.51 +#define IOCTL_GNTDEV_MAP_GRANT_REF \
    5.52 +_IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
    5.53 +struct ioctl_gntdev_map_grant_ref {
    5.54 +	/* IN parameters */
    5.55 +	/* The number of grants to be mapped. */
    5.56 +	uint32_t count;
    5.57 +	uint32_t pad;
    5.58 +	/* OUT parameters */
    5.59 +	/* The offset to be used on a subsequent call to mmap(). */
    5.60 +	uint64_t index;
    5.61 +	/* Variable IN parameter. */
    5.62 +	/* Array of grant references, of size @count. */
    5.63 +	struct ioctl_gntdev_grant_ref refs[1];
    5.64 +};
    5.65 +
    5.66 +/*
    5.67 + * Removes the grant references from the mapping table of an instance of
    5.68 + * of gntdev. N.B. munmap() must be called on the relevant virtual address(es)
    5.69 + * before this ioctl is called, or an error will result.
    5.70 + */
    5.71 +#define IOCTL_GNTDEV_UNMAP_GRANT_REF \
    5.72 +_IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))       
    5.73 +struct ioctl_gntdev_unmap_grant_ref {
    5.74 +	/* IN parameters */
    5.75 +	/* The offset was returned by the corresponding map operation. */
    5.76 +	uint64_t index;
    5.77 +	/* The number of pages to be unmapped. */
    5.78 +	uint32_t count;
    5.79 +	uint32_t pad;
    5.80 +};
    5.81 +
    5.82 +/*
    5.83 + * Returns the offset in the driver's address space that corresponds
    5.84 + * to @vaddr. This can be used to perform a munmap(), followed by an
    5.85 + * UNMAP_GRANT_REF ioctl, where no state about the offset is retained by
    5.86 + * the caller. The number of pages that were allocated at the same time as
    5.87 + * @vaddr is returned in @count.
    5.88 + *
    5.89 + * N.B. Where more than one page has been mapped into a contiguous range, the
    5.90 + *      supplied @vaddr must correspond to the start of the range; otherwise
    5.91 + *      an error will result. It is only possible to munmap() the entire
    5.92 + *      contiguously-allocated range at once, and not any subrange thereof.
    5.93 + */
    5.94 +#define IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR \
    5.95 +_IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))
    5.96 +struct ioctl_gntdev_get_offset_for_vaddr {
    5.97 +	/* IN parameters */
    5.98 +	/* The virtual address of the first mapped page in a range. */
    5.99 +	uint64_t vaddr;
   5.100 +	/* OUT parameters */
   5.101 +	/* The offset that was used in the initial mmap() operation. */
   5.102 +	uint64_t offset;
   5.103 +	/* The number of pages mapped in the VM area that begins at @vaddr. */
   5.104 +	uint32_t count;
   5.105 +	uint32_t pad;
   5.106 +};
   5.107 +
   5.108 +#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/tools/include/Linux/privcmd.h	Mon Jun 04 12:47:53 2007 +0100
     6.3 @@ -0,0 +1,79 @@
     6.4 +/******************************************************************************
     6.5 + * privcmd.h
     6.6 + * 
     6.7 + * Interface to /proc/xen/privcmd.
     6.8 + * 
     6.9 + * Copyright (c) 2003-2005, K A Fraser
    6.10 + * 
    6.11 + * This program is free software; you can redistribute it and/or
    6.12 + * modify it under the terms of the GNU General Public License version 2
    6.13 + * as published by the Free Software Foundation; or, when distributed
    6.14 + * separately from the Linux kernel or incorporated into other
    6.15 + * software packages, subject to the following license:
    6.16 + * 
    6.17 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    6.18 + * of this source file (the "Software"), to deal in the Software without
    6.19 + * restriction, including without limitation the rights to use, copy, modify,
    6.20 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    6.21 + * and to permit persons to whom the Software is furnished to do so, subject to
    6.22 + * the following conditions:
    6.23 + * 
    6.24 + * The above copyright notice and this permission notice shall be included in
    6.25 + * all copies or substantial portions of the Software.
    6.26 + * 
    6.27 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    6.28 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    6.29 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    6.30 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    6.31 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    6.32 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    6.33 + * IN THE SOFTWARE.
    6.34 + */
    6.35 +
    6.36 +#ifndef __LINUX_PUBLIC_PRIVCMD_H__
    6.37 +#define __LINUX_PUBLIC_PRIVCMD_H__
    6.38 +
    6.39 +#include <linux/types.h>
    6.40 +
    6.41 +#ifndef __user
    6.42 +#define __user
    6.43 +#endif
    6.44 +
    6.45 +typedef struct privcmd_hypercall
    6.46 +{
    6.47 +	__u64 op;
    6.48 +	__u64 arg[5];
    6.49 +} privcmd_hypercall_t;
    6.50 +
    6.51 +typedef struct privcmd_mmap_entry {
    6.52 +	__u64 va;
    6.53 +	__u64 mfn;
    6.54 +	__u64 npages;
    6.55 +} privcmd_mmap_entry_t; 
    6.56 +
    6.57 +typedef struct privcmd_mmap {
    6.58 +	int num;
    6.59 +	domid_t dom; /* target domain */
    6.60 +	privcmd_mmap_entry_t __user *entry;
    6.61 +} privcmd_mmap_t; 
    6.62 +
    6.63 +typedef struct privcmd_mmapbatch {
    6.64 +	int num;     /* number of pages to populate */
    6.65 +	domid_t dom; /* target domain */
    6.66 +	__u64 addr;  /* virtual address */
    6.67 +	xen_pfn_t __user *arr; /* array of mfns - top nibble set on err */
    6.68 +} privcmd_mmapbatch_t; 
    6.69 +
    6.70 +/*
    6.71 + * @cmd: IOCTL_PRIVCMD_HYPERCALL
    6.72 + * @arg: &privcmd_hypercall_t
    6.73 + * Return: Value returned from execution of the specified hypercall.
    6.74 + */
    6.75 +#define IOCTL_PRIVCMD_HYPERCALL					\
    6.76 +	_IOC(_IOC_NONE, 'P', 0, sizeof(privcmd_hypercall_t))
    6.77 +#define IOCTL_PRIVCMD_MMAP					\
    6.78 +	_IOC(_IOC_NONE, 'P', 2, sizeof(privcmd_mmap_t))
    6.79 +#define IOCTL_PRIVCMD_MMAPBATCH					\
    6.80 +	_IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
    6.81 +
    6.82 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
     7.1 --- a/tools/misc/xen-clone	Mon Jun 04 11:37:50 2007 +0100
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,134 +0,0 @@
     7.4 -#!/bin/sh -x
     7.5 -
     7.6 -# usage: xen-clone hg_repository dest_dir orig_linux_dir
     7.7 -# 
     7.8 -# this script contains some CL site specific details, but can easily be adapted
     7.9 -#
    7.10 -
    7.11 -# test which site we're on
    7.12 -[ -d /usr/groups/xeno/ -a -d /usr/groups/srgboot ] && SITE=UCCL
    7.13 -
    7.14 -case "$SITE" in
    7.15 -UCCL)
    7.16 -	BK_REP=${1:-http://hg.srg.cl.cam.ac.uk/xen-unstable.hg}
    7.17 -	LINUX_DIR=${3:-/usr/groups/xeno/archive/}
    7.18 -	;;
    7.19 -*)
    7.20 -	BK_REP=${1:-http://xenbits.xensource.com/xen-unstable.hg}
    7.21 -	LINUX_DIR=${3:-.:..}
    7.22 -;;
    7.23 -esac
    7.24 -
    7.25 -DEST_DIR=${2:-xeno-clone}
    7.26 -DEST_BK_REP=`basename "${BK_REP}"`
    7.27 -DEST_VER=`basename ${DEST_BK_REP} .hg`
    7.28 -
    7.29 -echo usage: xen-clone hg dest_dir orig_linux_dir
    7.30 -echo Source BK Repository : ${BK_REP}
    7.31 -echo Destination Dir/Repository : ${DEST_DIR}/${DEST_BK_REP}
    7.32 -echo Pristine Linux Source directory : ${LINUX_DIR}
    7.33 -
    7.34 -mkdir -p ${DEST_DIR}
    7.35 -cd ${DEST_DIR}
    7.36 -TOP=`/bin/pwd`
    7.37 -
    7.38 -# site-specific set up of installation directories
    7.39 -case "$SITE" in
    7.40 -UCCL)
    7.41 -	PATH=$PATH:/usr/groups/xeno/build_tools/bin
    7.42 -	mkdir -p install/boot
    7.43 -	cd install/boot
    7.44 -	ln -sf ../../../xeno-roots/roots .
    7.45 -	ln -sf ../../../xeno-roots/usr .
    7.46 -	ln -sf ../lib .
    7.47 -	ln -sf ../bin .
    7.48 -	ln -sf /usr/groups/srgboot/${USER}/xenoboot.sh .
    7.49 -	ln -sf `pwd` /usr/groups/srgboot/${USER}/${DEST_DIR}
    7.50 -	ln -sf xen.gz image.gz
    7.51 -	cd ../..
    7.52 -	;;
    7.53 -esac
    7.54 -
    7.55 -# clone the master repository (now checked-out by default)
    7.56 -if [ ! -d ${DEST_BK_REP} ] 
    7.57 -then 
    7.58 -mkdir -p ${DEST_BK_REP} ; cd ${DEST_BK_REP} ; hg init ${BK_REP} ; hg co ; cd ${TOP}
    7.59 -else
    7.60 -cd ${DEST_BK_REP}
    7.61 -hg pull ; hg co
    7.62 -cd ${TOP}
    7.63 -fi
    7.64 -
    7.65 -
    7.66 -if [ -d ${DEST_BK_REP}/linux-2.4*-xen-sparse ]
    7.67 -then
    7.68 - # this is a new style Xen repository so building is dead easy
    7.69 -
    7.70 - export LINUX_SRC_PATH=${LINUX_DIR}
    7.71 -
    7.72 - cd ${DEST_BK_REP} 
    7.73 -
    7.74 - # Recent repositories install into 'dist/install' rather than 'install'.
    7.75 - if [ -f install.sh ]
    7.76 - then
    7.77 -  mkdir -p dist
    7.78 -  ln -sf ../../install dist/install
    7.79 - else
    7.80 -  ln -sf ../install install
    7.81 - fi
    7.82 -
    7.83 - make -j4 KERNELS=linux-* world
    7.84 - #make -j4 linux24
    7.85 - cd ../install/boot
    7.86 - if [ -r vmlinuz-2.6-xen0 ]
    7.87 - then
    7.88 -  ln -s vmlinuz-2.6-xen0 xenolinux.gz
    7.89 - else
    7.90 -  kern=`ls vmlinuz-2.6.*-xen0 | head -1`
    7.91 -  [ -r "$kern" ] && ln -s "$kern" xenolinux.gz
    7.92 - fi  
    7.93 -
    7.94 -else
    7.95 - # old style repository without 'make world'
    7.96 -
    7.97 -
    7.98 - # identify this version of linux
    7.99 - LINUX_VER=`( /bin/ls -ld ${DEST_BK_REP}/*xenolinux-sparse || /bin/ls -ld ${DEST_BK_REP}/*xenolinux-*-sparse ) 2>/dev/null | sed -e 's!^.*xenolinux-\(.\+\)-sparse!\1!'`
   7.100 -
   7.101 - if [ -z "${LINUX_VER}" ]
   7.102 - then
   7.103 - echo Unable to identify Linux version. Bailing.
   7.104 - exit -1
   7.105 - fi
   7.106 -
   7.107 - # copy in the master Linux tree for this kernel
   7.108 - if [ ! -d linux-${LINUX_VER} ]
   7.109 - then
   7.110 - tar -jxf ${LINUX_DIR}/linux-${LINUX_VER}.tar.bz2 || tar -zxf ${LINUX_DIR}/linux-${LINUX_VER}.tar.gz || tar -zxf ${LINUX_DIR}/linux-${LINUX_VER}.tgz || cp -a ${LINUX_DIR}/linux-${LINUX_VER} . ||  wget ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${LINUX_VER}.tar.gz -O- | tar -zxf - || exit -1
   7.111 - fi
   7.112 -
   7.113 - # build and install Xen and tools
   7.114 - cd ${DEST_BK_REP}
   7.115 - make dist || make install
   7.116 -
   7.117 - # Turn linux into xenolinux then build it
   7.118 - cd xenolinux-${LINUX_VER}-sparse
   7.119 - bash ./mkbuildtree ../../linux-${LINUX_VER}
   7.120 - cd ../..
   7.121 - mv linux-${LINUX_VER} xenolinux-${LINUX_VER}
   7.122 - cd xenolinux-${LINUX_VER}
   7.123 -
   7.124 - # cope with the change from ARCH=xeno to ARCH=xen
   7.125 - cd arch; XEN=`/bin/ls -d xen*`; cd ..
   7.126 -
   7.127 - # built it all
   7.128 - ARCH=$XEN make oldconfig
   7.129 - ARCH=$XEN make dep
   7.130 - ARCH=$XEN make bzImage
   7.131 - ARCH=$XEN make dist || ARCH=xen make install
   7.132 - ARCH=$XEN make modules
   7.133 - ARCH=$XEN make INSTALL_MOD_PATH=${TOP}/install modules_install
   7.134 - cd ..
   7.135 -
   7.136 -fi
   7.137 -
     8.1 --- a/tools/xenfb/Makefile	Mon Jun 04 11:37:50 2007 +0100
     8.2 +++ b/tools/xenfb/Makefile	Mon Jun 04 12:47:53 2007 +0100
     8.3 @@ -2,7 +2,7 @@ XEN_ROOT=../..
     8.4  include $(XEN_ROOT)/tools/Rules.mk
     8.5  
     8.6  CFLAGS  += -I$(XEN_LIBXC) -I$(XEN_XENSTORE)
     8.7 -CFLAGS  += -I$(XEN_ROOT)/linux-2.6-xen-sparse/include -I$(XEN_ROOT)/tools/ioemu
     8.8 +CFLAGS  += -I$(XEN_ROOT)/tools/ioemu
     8.9  LDFLAGS += -L$(XEN_LIBXC) -L$(XEN_XENSTORE)
    8.10  
    8.11  .PHONY: all