ia64/xen-unstable

changeset 6222:698a7dc797e4

xenbus build and license fixes.
author kaf24@firebug.cl.cam.ac.uk
date Wed Aug 17 09:59:04 2005 +0000 (2005-08-17)
parents 074aadbb0fa8
children 27a4a073fc75
files linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.h linux-2.6-xen-sparse/include/asm-xen/xenbus.h tools/xenstore/Makefile tools/xenstore/xenstored.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.h	Wed Aug 17 09:50:26 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.h	Wed Aug 17 09:59:04 2005 +0000
     1.3 @@ -1,6 +1,33 @@
     1.4 -/* Private include for xenbus communications. */
     1.5 +/*
     1.6 + * Private include for xenbus communications.
     1.7 + * 
     1.8 + * Copyright (C) 2005 Rusty Russell, IBM Corporation
     1.9 + *
    1.10 + * This file may be distributed separately from the Linux kernel, or
    1.11 + * incorporated into other software packages, subject to the following license:
    1.12 + * 
    1.13 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    1.14 + * of this source file (the "Software"), to deal in the Software without
    1.15 + * restriction, including without limitation the rights to use, copy, modify,
    1.16 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    1.17 + * and to permit persons to whom the Software is furnished to do so, subject to
    1.18 + * the following conditions:
    1.19 + * 
    1.20 + * The above copyright notice and this permission notice shall be included in
    1.21 + * all copies or substantial portions of the Software.
    1.22 + * 
    1.23 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    1.24 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1.25 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    1.26 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    1.27 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    1.28 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    1.29 + * IN THE SOFTWARE.
    1.30 + */
    1.31 +
    1.32  #ifndef _XENBUS_COMMS_H
    1.33  #define _XENBUS_COMMS_H
    1.34 +
    1.35  int xs_init(void);
    1.36  int xb_init_comms(void);
    1.37  void xb_suspend_comms(void);
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Wed Aug 17 09:50:26 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Wed Aug 17 09:59:04 2005 +0000
     2.3 @@ -1,5 +1,3 @@
     2.4 -#ifndef _ASM_XEN_XENBUS_H
     2.5 -#define _ASM_XEN_XENBUS_H
     2.6  /******************************************************************************
     2.7   * xenbus.h
     2.8   *
     2.9 @@ -28,6 +26,10 @@
    2.10   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    2.11   * IN THE SOFTWARE.
    2.12   */
    2.13 +
    2.14 +#ifndef _ASM_XEN_XENBUS_H
    2.15 +#define _ASM_XEN_XENBUS_H
    2.16 +
    2.17  #include <linux/device.h>
    2.18  #include <linux/notifier.h>
    2.19  #include <asm/semaphore.h>
     3.1 --- a/tools/xenstore/Makefile	Wed Aug 17 09:50:26 2005 +0000
     3.2 +++ b/tools/xenstore/Makefile	Wed Aug 17 09:59:04 2005 +0000
     3.3 @@ -24,7 +24,7 @@ TESTDIR  = `pwd`/testsuite/tmp
     3.4  TESTFLAGS= -DTESTING
     3.5  TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
     3.6  
     3.7 -all: xen xenstored libxenstore.a libxenstore-pic.a
     3.8 +all: xen xenstored libxenstore.so
     3.9  
    3.10  testcode: xen xs_test xenstored_test xs_random xs_dom0_test
    3.11  
    3.12 @@ -53,20 +53,14 @@ xs_test_lib.o: xs.c
    3.13  talloc_test.o: talloc.c
    3.14  	$(COMPILE.c) -o $@ $<
    3.15  
    3.16 -LIB_OBJS     := xs.o xs_lib.o
    3.17 -
    3.18 -LIB_OBJS_A   := $(patsubst %.o,libxenstore.a(%.o),$(LIB_OBJS))
    3.19 -LIB_OBJS_PIC := $(patsubst %.o,libxenstore-pic.a(%.opic),$(LIB_OBJS))
    3.20 -
    3.21 -libxenstore.a: $(LIB_OBJS_A)
    3.22 -
    3.23 -libxenstore-pic.a: $(LIB_OBJS_PIC)
    3.24 +libxenstore.so: xs.opic xs_lib.opic
    3.25 +	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so -shared -o $@ $^
    3.26  
    3.27  clean: testsuite-clean
    3.28 -	rm -f *.o *.opic *.a
    3.29 +	rm -f *.o *.opic *.so
    3.30  	rm -f xen xenstored xs_random xs_stress xs_crashme
    3.31  	rm -f xs_test xenstored_test xs_dom0_test
    3.32 -	-$(RM) $(PROG_DEP)
    3.33 +	$(RM) $(PROG_DEP)
    3.34  
    3.35  print-dir:
    3.36  	@echo -n tools/xenstore: 
    3.37 @@ -117,15 +111,14 @@ TAGS:
    3.38  tarball: clean
    3.39  	cd .. && tar -c -j -v -h -f xenstore.tar.bz2 xenstore/
    3.40  
    3.41 -install: xenstored libxenstore.a libxenstore-pic.a
    3.42 +install: xenstored libxenstore.so
    3.43  	$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
    3.44  	$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
    3.45  	$(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
    3.46  	$(INSTALL_DIR) -p $(DESTDIR)/usr/include
    3.47  	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
    3.48  	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
    3.49 -	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
    3.50 -	$(INSTALL_DATA) libxenstore-pic.a $(DESTDIR)/usr/$(LIBDIR)
    3.51 +	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
    3.52  	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
    3.53  	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
    3.54  
     4.1 --- a/tools/xenstore/xenstored.h	Wed Aug 17 09:50:26 2005 +0000
     4.2 +++ b/tools/xenstore/xenstored.h	Wed Aug 17 09:59:04 2005 +0000
     4.3 @@ -1,21 +1,29 @@
     4.4 -/* 
     4.5 -    Simple prototyle Xen Store Daemon providing simple tree-like database.
     4.6 -    Copyright (C) 2005 Rusty Russell IBM Corporation
     4.7 -
     4.8 -    This program is free software; you can redistribute it and/or modify
     4.9 -    it under the terms of the GNU General Public License as published by
    4.10 -    the Free Software Foundation; either version 2 of the License, or
    4.11 -    (at your option) any later version.
    4.12 +/*
    4.13 + * Simple prototyle Xen Store Daemon providing simple tree-like database.
    4.14 + * Copyright (C) 2005 Rusty Russell IBM Corporation
    4.15 + *
    4.16 + * This file may be distributed separately from the Linux kernel, or
    4.17 + * incorporated into other software packages, subject to the following license:
    4.18 + * 
    4.19 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    4.20 + * of this source file (the "Software"), to deal in the Software without
    4.21 + * restriction, including without limitation the rights to use, copy, modify,
    4.22 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    4.23 + * and to permit persons to whom the Software is furnished to do so, subject to
    4.24 + * the following conditions:
    4.25 + * 
    4.26 + * The above copyright notice and this permission notice shall be included in
    4.27 + * all copies or substantial portions of the Software.
    4.28 + * 
    4.29 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    4.30 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    4.31 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    4.32 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    4.33 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    4.34 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    4.35 + * IN THE SOFTWARE.
    4.36 + */
    4.37  
    4.38 -    This program is distributed in the hope that it will be useful,
    4.39 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    4.40 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    4.41 -    GNU General Public License for more details.
    4.42 -
    4.43 -    You should have received a copy of the GNU General Public License
    4.44 -    along with this program; if not, write to the Free Software
    4.45 -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    4.46 -*/
    4.47  #ifndef _XENSTORED_H
    4.48  #define _XENSTORED_H
    4.49