[Pkg-xen-changes] r531 - trunk/xen-unstable/debian/patches

Bastian Blank waldi at alioth.debian.org
Thu Mar 6 20:14:17 UTC 2008 

Author: waldi
Date: Thu Mar  6 20:14:17 2008
New Revision: 531

Log:
debian/patches: Update.


Removed:
   trunk/xen-unstable/debian/patches/tools-ldflags.diff
Modified:
   trunk/xen-unstable/debian/patches/config-prefix.diff
   trunk/xen-unstable/debian/patches/series
   trunk/xen-unstable/debian/patches/tools-ioemu-config.diff
   trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
   trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff
   trunk/xen-unstable/debian/patches/tools-misc-prefix.diff
   trunk/xen-unstable/debian/patches/tools-prefix.diff
   trunk/xen-unstable/debian/patches/tools-python-prefix.diff
   trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
   trunk/xen-unstable/debian/patches/tools-rpath.diff
   trunk/xen-unstable/debian/patches/version.patch

Modified: trunk/xen-unstable/debian/patches/config-prefix.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/config-prefix.diff	(original)
+++ trunk/xen-unstable/debian/patches/config-prefix.diff	Thu Mar  6 20:14:17 2008
@@ -1,48 +1,35 @@
---- xen-unstable.orig/Config.mk
-+++ xen-unstable/Config.mk
-@@ -30,6 +30,10 @@
- include $(XEN_ROOT)/config/$(XEN_OS).mk
- include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
+--- xen-unstable.orig/config/StdGNU.mk
++++ xen-unstable/config/StdGNU.mk
+@@ -22,16 +22,15 @@
+ BINDIR = $(PREFIX)/bin
+ INCLUDEDIR = $(PREFIX)/include
+ LIBLEAFDIR = lib
+-LIBLEAFDIR_x86_64 = lib64
+ LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
+-LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64)
+ MANDIR = $(PREFIX)/share/man
+ MAN1DIR = $(MANDIR)/man1
+ MAN8DIR = $(MANDIR)/man8
+ SBINDIR = $(PREFIX)/sbin
+ 
+-PRIVATE_PREFIX = $(LIBDIR)/xen
++PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
+ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
++PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
  
-+PREFIX = lib/xen-$(XEN_VERSION)
-+BINDIR = $(PREFIX)/bin
-+LIBDIR = $(PREFIX)/lib
-+
- ifneq ($(EXTRA_PREFIX),)
- EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
- EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
---- xen-unstable.orig/config/ia64.mk
-+++ xen-unstable/config/ia64.mk
-@@ -4,5 +4,3 @@
- CONFIG_IOEMU := y
- CONFIG_XCUTILS := y
- CONFIG_XENCOMM := y
--
--LIBDIR := lib
---- xen-unstable.orig/config/powerpc64.mk
-+++ xen-unstable/config/powerpc64.mk
-@@ -4,4 +4,3 @@
- CONFIG_XENCOMM := y
- 
- CFLAGS += -DELFSIZE=64
--LIBDIR := lib
---- xen-unstable.orig/config/x86_32.mk
-+++ xen-unstable/config/x86_32.mk
-@@ -8,7 +8,6 @@
- CONFIG_IOEMU := y
- 
- CFLAGS += -m32 -march=i686
--LIBDIR := lib
- 
- # Use only if calling $(LD) directly.
- LDFLAGS_DIRECT_OpenBSD = _obsd
+ SOCKET_LIBS =
+ CURSES_LIBS = -lncurses
 --- xen-unstable.orig/config/x86_64.mk
 +++ xen-unstable/config/x86_64.mk
-@@ -9,7 +9,6 @@
- CONFIG_IOEMU := y
+@@ -10,11 +10,6 @@
  
  CFLAGS += -m64
--LIBDIR = $(LIB64DIR)
  
+-LIBLEAFDIR = $(LIBLEAFDIR_x86_64)
+-LIBDIR = $(LIBDIR_x86_64)
+-
+-SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
+-
  # Use only if calling $(LD) directly.
  ifeq ($(XEN_OS),OpenBSD)
+ LDFLAGS_DIRECT += -melf_x86_64_obsd

Modified: trunk/xen-unstable/debian/patches/series
==============================================================================
--- trunk/xen-unstable/debian/patches/series	(original)
+++ trunk/xen-unstable/debian/patches/series	Thu Mar  6 20:14:17 2008
@@ -3,14 +3,11 @@
 tools-prefix.diff
 tools-misc-prefix.diff
 tools-python-prefix.diff
-tools-ldflags.diff
 version.patch
 tools-lib-abiname.diff
 tools-python-xen-xm-relative-path.diff
-tools-ioemu-arch.diff
 tools-ioemu-config.diff
 tools-pygrub-prefix.diff
 tools-libfsimage-prefix.diff
-disable-features.diff
 tools-misc-xend-race.diff
 doc-remove-unused.diff

Modified: trunk/xen-unstable/debian/patches/tools-ioemu-config.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-ioemu-config.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-ioemu-config.diff	Thu Mar  6 20:14:17 2008
@@ -1,6 +1,6 @@
 --- xen-unstable.orig/tools/ioemu/vl.c
 +++ xen-unstable/tools/ioemu/vl.c
-@@ -96,7 +96,7 @@
+@@ -108,7 +108,7 @@
  
  #include "exec-all.h"
  

Modified: trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-lib-abiname.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-lib-abiname.diff	Thu Mar  6 20:14:17 2008
@@ -4,45 +4,47 @@
  XEN_ROOT = ../..
  include $(XEN_ROOT)/tools/Rules.mk
  
--MAJOR    = 3.0
+-MAJOR    = 3.2
 -MINOR    = 0
 -
  CTRL_SRCS-y       :=
+ ifneq ($(stubdom),y)
  CTRL_SRCS-y       += xc_core.c
- CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -80,10 +77,10 @@
- GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
+@@ -81,12 +78,12 @@
  
  LIB := libxenctrl.a
+ ifneq ($(stubdom),y)
 -LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
 +LIB += libxenctrl.so
+ endif
  
  LIB += libxenguest.a
+ ifneq ($(stubdom),y)
 -LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
 +LIB += libxenguest.so
+ endif
  
  .PHONY: all
- all: build
-@@ -105,16 +102,10 @@
+@@ -103,16 +100,12 @@
  install: build
- 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
--	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
-+	$(INSTALL_DATA) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
- 
--	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
--	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
-+	$(INSTALL_DATA) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++	$(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(PRIVATE_LIBDIR)
+-	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so.$(MAJOR)
+-	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so
+ 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR)
+ 
+-	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++	$(INSTALL_PROG) libxenguest.so $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(PRIVATE_LIBDIR)
+-	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so.$(MAJOR)
+-	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so
+ 	$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
  
  .PHONY: TAGS
-@@ -142,26 +133,16 @@
+@@ -140,26 +133,16 @@
  libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
@@ -52,9 +54,9 @@
 -	ln -sf $< $@
 -
 -libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS)
 +libxenctrl.so: $(CTRL_PIC_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS)
  
  # libxenguest
  
@@ -67,51 +69,12 @@
 -	ln -sf $< $@
 -
 -libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
--	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl -lpthread
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
 +libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
  
  -include $(DEPS)
  
---- xen-unstable.orig/tools/xenstore/Makefile
-+++ xen-unstable/tools/xenstore/Makefile
-@@ -2,9 +2,6 @@
- include $(XEN_ROOT)/tools/Rules.mk
- XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
- 
--MAJOR = 3.0
--MINOR = 0
--
- PROFILE=#-pg
- BASECFLAGS=-Werror
- # Make gcc generate dependencies.
-@@ -50,13 +47,8 @@
- xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
--libxenstore.so: libxenstore.so.$(MAJOR)
--	ln -sf $< $@
--libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR)
--	ln -sf $< $@
--
--libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
--	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread
-+libxenstore.so: xs.opic xs_lib.opic
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread
- 
- libxenstore.a: xs.o xs_lib.o
- 	$(AR) rcs libxenstore.a $^
-@@ -85,9 +77,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)/usr/include
- 	$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
--	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
-+	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
 --- xen-unstable.orig/tools/blktap/lib/Makefile
 +++ xen-unstable/tools/blktap/lib/Makefile
 @@ -1,9 +1,7 @@
@@ -123,9 +86,9 @@
 -SONAME   = libblktap.so.$(MAJOR)
 +SONAME   = libblktap.so
  
- BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
+ INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I$(XEN_INCLUDE) $(CFLAGS_libxenstore)
  
-@@ -28,7 +26,7 @@
+@@ -26,7 +24,7 @@
  OBJS     = $(patsubst %.c,%.o,$(SRCS))
  IBINS   :=
  
@@ -134,25 +97,24 @@
  
  .PHONY: all
  all: build
-@@ -43,19 +41,15 @@
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
--	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
- 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
+@@ -41,19 +39,15 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
+-	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so.$(MAJOR)
+-	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
+ 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
  
  clean:
  	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
  
  libblktap.a: $(OBJS) 
 -	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
--	      -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
++	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
+ 	      -L$(XEN_XENSTORE) $(LDFLAGS)                                 \
 -	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
 -	ln -sf libblktap.so.$(MAJOR) libblktap.so
-+	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
-+	      -L$(XEN_XENSTORE) $(LDFLAGS) -lxenstore                                \
 +	      -o libblktap.so $^ $(LIBS)
  	$(AR) rc $@ libblktap.so
  
@@ -180,18 +142,18 @@
  all: $(LIB)
 @@ -24,9 +21,7 @@
  install: all
- 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so.$(MAJOR)
--	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so
-+	$(INSTALL_PROG) libfsimage.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
+-	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
++	$(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
 @@ -34,13 +29,8 @@
  clean distclean:
- 	rm -f $(PIC_OBJS) $(LIB)
+ 	rm -f $(PIC_OBJS) $(LIB) $(DEPS)
  
 -libfsimage.so: libfsimage.so.$(MAJOR)
 -	ln -sf $< $@
@@ -214,7 +176,8 @@
  XEN_ROOT = ../../..
  include $(XEN_ROOT)/tools/Rules.mk
  
-@@ -22,7 +19,7 @@
+@@ -21,8 +18,8 @@
+ LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
  PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
  
  LIB := libflask.a
@@ -223,19 +186,22 @@
  
  .PHONY: all
  all: build
-@@ -35,10 +32,8 @@
+@@ -35,10 +31,8 @@
  install: build
- 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-+	$(INSTALL_PROG) libflask.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
--	ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
- 	$(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++	$(INSTALL_PROG) libflask.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
+-	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
+-	ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
+ 	$(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
  
  .PHONY: TAGS
-@@ -54,12 +49,7 @@
+@@ -51,15 +45,10 @@
+ 
+ # libflask
+ 
  libflask.a: $(LIB_OBJS)
  	$(AR) rc $@ $^
  

Modified: trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff	Thu Mar  6 20:14:17 2008
@@ -1,20 +1,20 @@
---- xen-3.orig/tools/libfsimage/Rules.mk
-+++ xen-3/tools/libfsimage/Rules.mk
+--- xen-unstable.orig/tools/libfsimage/Rules.mk
++++ xen-unstable/tools/libfsimage/Rules.mk
 @@ -7,11 +7,7 @@
  
  PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
  
 -FSDIR-$(CONFIG_Linux) = $(LIBDIR)/fs/$(FS)
--FSDIR-$(CONFIG_SunOS)-x86_64 = lib/fs/$(FS)/64
--FSDIR-$(CONFIG_SunOS)-x86_32 = lib/fs/$(FS)/
+-FSDIR-$(CONFIG_SunOS)-x86_64 = $(PREFIX)/lib/fs/$(FS)/64
+-FSDIR-$(CONFIG_SunOS)-x86_32 = $(PREFIX)/lib/fs/$(FS)/
 -FSDIR-$(CONFIG_SunOS) = $(FSDIR-$(CONFIG_SunOS)-$(XEN_TARGET_ARCH))
 -FSDIR = $(FSDIR-y)
-+FSDIR = $(LIBDIR)/fs/$(FS)
++FSDIR = $(PRIVATE_LIBDIR)/fs/$(FS)
  
  FSLIB = fsimage.so
  
---- xen-3.orig/tools/libfsimage/common/Makefile
-+++ xen-3/tools/libfsimage/common/Makefile
+--- xen-unstable.orig/tools/libfsimage/common/Makefile
++++ xen-unstable/tools/libfsimage/common/Makefile
 @@ -1,7 +1,7 @@
  XEN_ROOT = ../../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -24,8 +24,8 @@
  DEPS = .*.d
  
  LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
---- xen-3.orig/tools/libfsimage/common/fsimage_plugin.c
-+++ xen-3/tools/libfsimage/common/fsimage_plugin.c
+--- xen-unstable.orig/tools/libfsimage/common/fsimage_plugin.c
++++ xen-unstable/tools/libfsimage/common/fsimage_plugin.c
 @@ -131,23 +131,8 @@
  	int err;
  	int ret = -1;

Modified: trunk/xen-unstable/debian/patches/tools-misc-prefix.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-misc-prefix.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-misc-prefix.diff	Thu Mar  6 20:14:17 2008
@@ -1,5 +1,5 @@
---- xen-unstable.orig/tools/misc/xend
-+++ xen-unstable/tools/misc/xend
+--- xen-3.orig/tools/misc/xend
++++ xen-3/tools/misc/xend
 @@ -33,15 +33,10 @@
  import time
  import commands
@@ -18,7 +18,7 @@
  
  class CheckError(ValueError):
      pass
-@@ -95,19 +90,19 @@
+@@ -95,20 +90,20 @@
          f.close()
      except:
          pass
@@ -41,12 +41,14 @@
  def start_blktapctrl():
      if os.fork() == 0:
 -        os.execvp('blktapctrl', ['blktapctrl'])
+-            
 +        execute('blktapctrl')
-             
++
  def main():
      try:
---- xen-unstable.orig/tools/misc/xm
-+++ xen-unstable/tools/misc/xm
+         check_logging()
+--- xen-3.orig/tools/misc/xm
++++ xen-3/tools/misc/xm
 @@ -1,10 +1,7 @@
  #!/usr/bin/env python
  #  -*- mode: python; -*-

Modified: trunk/xen-unstable/debian/patches/tools-prefix.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-prefix.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-prefix.diff	Thu Mar  6 20:14:17 2008
@@ -1,80 +1,39 @@
---- xen-unstable.orig/tools/blktap/drivers/Makefile
-+++ xen-unstable/tools/blktap/drivers/Makefile
-@@ -5,7 +5,7 @@
- 
- IBIN         = blktapctrl tapdisk
- QCOW_UTIL    = img2qcow qcow2raw qcow-create
--INST_DIR     = /usr/sbin
-+INST_DIR     = /usr/$(BINDIR)
- LIBAIO_DIR   = ../../libaio/src
- 
- CFLAGS   += -Werror
-@@ -52,6 +52,7 @@
- 	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
- 
- install: all
-+	$(INSTALL_DIR) $(DESTDIR)$(INST_DIR)
- 	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
- 
- clean:
 --- xen-unstable.orig/tools/console/Makefile
 +++ xen-unstable/tools/console/Makefile
-@@ -2,8 +2,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--DAEMON_INSTALL_DIR = /usr/sbin
--CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+DIR = /usr/$(BINDIR)
- 
- CFLAGS  += -Werror
- 
-@@ -30,7 +29,5 @@
+@@ -29,7 +29,5 @@
  
  .PHONY: install
  install: $(BIN)
--	$(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
--	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
--	$(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
--	$(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
-+	$(INSTALL_DIR) $(DESTDIR)/$(DIR)
-+	$(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)/$(DIR)
+-	$(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
+-	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+-	$(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)$(PRIVATE_BINDIR)
 --- xen-unstable.orig/tools/misc/Makefile
 +++ xen-unstable/tools/misc/Makefile
-@@ -13,8 +13,7 @@
- TARGETS-$(CONFIG_X86) += xen-detect
- TARGETS := $(TARGETS-y)
+@@ -18,8 +18,7 @@
+ SUBDIRS-$(CONFIG_MINITERM) += miniterm
+ SUBDIRS := $(SUBDIRS-y)
  
 -INSTALL_BIN  = $(TARGETS) xencons
 -INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf xsview
-+INSTALL_TARGETS = $(TARGETS) xencons netfix xm xend xsview
++INSTALL_TARGETS = $(TARGETS) xencons netfix xm xen-bugtool xen-python-path xend xsview
  
  .PHONY: all
  all: build
-@@ -26,10 +25,8 @@
- 
- .PHONY: install
- install: build
--	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
--	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
--	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
--	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
-+	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
-+	$(INSTALL_PROG) $(INSTALL_TARGETS) $(DESTDIR)/usr/$(BINDIR)
- 	$(MAKE) -C lomount install
- #       No sense in installing miniterm on the Xen box.
- #	$(MAKE) -C miniterm install
---- xen-unstable.orig/tools/misc/lomount/Makefile
-+++ xen-unstable/tools/misc/lomount/Makefile
-@@ -16,7 +16,7 @@
+@@ -30,10 +29,8 @@
  
  .PHONY: install
  install: build
--	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
-+	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/$(BINDIR)
+-	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+-	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+-	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
+-	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) $(INSTALL_TARGETS) $(DESTDIR)$(PRIVATE_BINDIR)
+ 	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
  
  .PHONY: clean
- clean:
 --- xen-unstable.orig/tools/python/Makefile
 +++ xen-unstable/tools/python/Makefile
 @@ -24,7 +24,7 @@
@@ -99,104 +58,9 @@
  endif
  
  install-dtd: all
---- xen-unstable.orig/tools/xcutils/Makefile
-+++ xen-unstable/tools/xcutils/Makefile
-@@ -11,7 +11,7 @@
- XEN_ROOT	= ../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+PROGRAMS_INSTALL_DIR = /usr/$(BINDIR)
- 
- INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
- 
---- xen-unstable.orig/tools/xenmon/Makefile
-+++ xen-unstable/tools/xenmon/Makefile
-@@ -13,8 +13,6 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--sbindir=/usr/sbin
--
- CFLAGS  += -Werror
- CFLAGS  += -I $(XEN_XC)
- CFLAGS  += -I $(XEN_LIBXC)
-@@ -31,10 +29,8 @@
- 
- .PHONY: install
- install: build
--	[ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
--	$(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
--	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(sbindir)/xentrace_setmask
--	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(sbindir)/xenmon.py
-+	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
-+	$(INSTALL_PROG) xenbaked xenmon.py xentrace_setmask $(DESTDIR)/usr/$(BINDIR)
- 
- .PHONY: clean
- clean:
---- xen-unstable.orig/tools/xenstat/xentop/Makefile
-+++ xen-unstable/tools/xenstat/xentop/Makefile
-@@ -21,7 +21,6 @@
- prefix=/usr
- mandir=$(prefix)/share/man
- man1dir=$(mandir)/man1
--sbindir=$(prefix)/sbin
- 
- CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
- LDFLAGS += -L$(XEN_LIBXENSTAT)
-@@ -33,7 +32,7 @@
- 
- .PHONY: install
- install: xentop xentop.1
--	$(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
-+	$(INSTALL_PROG) -D xentop $(DESTDIR)/usr/$(BINDIR)/xentop
- 	$(INSTALL_DIR) $(DESTDIR)$(man1dir)
- 	$(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
- 
---- xen-unstable.orig/tools/xenstore/Makefile
-+++ xen-unstable/tools/xenstore/Makefile
-@@ -81,13 +81,9 @@
- install: all
- 	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
- 	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
--	$(INSTALL_DIR) $(DESTDIR)/usr/bin
--	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
-+	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
--	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
--	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
--	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-+	$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- 	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
---- xen-unstable.orig/tools/xentrace/Makefile
-+++ xen-unstable/tools/xentrace/Makefile
-@@ -35,15 +35,11 @@
- 
- .PHONY: install
- install: build
--	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
--	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
--		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
--	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
--		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
--	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
--		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
--	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
--	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
-+	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
-+	$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
-+	$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
-+	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/$(BINDIR)
-+	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
- 	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
- 
 --- xen-unstable.orig/tools/ioemu/Makefile.target
 +++ xen-unstable/tools/ioemu/Makefile.target
-@@ -206,6 +206,7 @@
+@@ -211,6 +211,7 @@
  ifdef CONFIG_SOLARIS
  LIBS+=-lsocket -lnsl -lresolv
  endif
@@ -206,7 +70,7 @@
  ifdef TARGET_GPROF
 --- xen-unstable.orig/tools/ioemu/configure
 +++ xen-unstable/tools/ioemu/configure
-@@ -594,9 +594,9 @@
+@@ -576,9 +576,9 @@
      prefix="/usr/local"
  fi
  mandir="$prefix/share/man"
@@ -231,12 +95,138 @@
  SUBDIRS += rombios rombios/32bit
 --- xen-unstable.orig/tools/blktap/lib/Makefile
 +++ xen-unstable/tools/blktap/lib/Makefile
-@@ -5,7 +5,7 @@
- MINOR    = 0
- SONAME   = libblktap.so.$(MAJOR)
+@@ -38,11 +38,11 @@
+ libblktap: libblktap.a
+ 
+ install: all
+-	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
+-	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
+-	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
++	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
++	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so.$(MAJOR)
++	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
+ 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
+ 
+ clean:
+--- xen-unstable.orig/tools/xenstore/Makefile
++++ xen-unstable/tools/xenstore/Makefile
+@@ -93,18 +93,17 @@
+ install: all
+ 	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+ 	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+-	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+-	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
+-	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR)
+-	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
+-	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)
+-	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+-	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
+-	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
+-	$(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
++	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenstore.so.$(MAJOR)
++	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenstore.so
++	$(INSTALL_DATA) libxenstore.a $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR)
+ 
+--- xen-unstable.orig/tools/xenmon/Makefile
++++ xen-unstable/tools/xenmon/Makefile
+@@ -29,10 +29,10 @@
+ 
+ .PHONY: install
+ install: build
+-	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+-	$(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked
+-	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(SBINDIR)/xentrace_setmask
+-	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(SBINDIR)/xenmon.py
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) xenbaked $(DESTDIR)$(PRIVATE_BINDIR)/xenbaked
++	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(PRIVATE_BINDIR)/xentrace_setmask
++	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(PRIVATE_BINDIR)/xenmon.py
+ 
+ .PHONY: clean
+ clean:
+--- xen-unstable.orig/tools/xentrace/Makefile
++++ xen-unstable/tools/xentrace/Makefile
+@@ -35,12 +35,10 @@
+ 
+ .PHONY: install
+ install: build
+-	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+-	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
+-	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+-	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) $(BIN) $(LIBBIN) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
+ 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
+ 	$(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
+ 
+--- xen-unstable.orig/tools/libxc/Makefile
++++ xen-unstable/tools/libxc/Makefile
+@@ -101,18 +101,18 @@
+ 
+ .PHONY: install
+ install: build
+-	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
+-	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
+-	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
++	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(PRIVATE_LIBDIR)
++	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so.$(MAJOR)
++	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so
+ 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR)
+ 
+-	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
+-	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
+-	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
++	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(PRIVATE_LIBDIR)
++	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so.$(MAJOR)
++	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so
+ 	$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
+ 
+ .PHONY: TAGS
+--- xen-unstable.orig/tools/misc/lomount/Makefile
++++ xen-unstable/tools/misc/lomount/Makefile
+@@ -16,7 +16,7 @@
  
--BLKTAP_INSTALL_DIR = /usr/sbin
-+BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
+ .PHONY: install
+ install install-recurse: build
+-	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
++	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
+ 
+ .PHONY: clean
+ clean:
+--- xen-unstable.orig/tools/xenstat/xentop/Makefile
++++ xen-unstable/tools/xenstat/xentop/Makefile
+@@ -28,8 +28,8 @@
  
- INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
+ .PHONY: install
+ install: xentop xentop.1
+-	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+-	$(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop
++	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) xentop $(DESTDIR)$(PRIVATE_BINDIR)/xentop
+ 	$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+ 	$(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1
  

Modified: trunk/xen-unstable/debian/patches/tools-python-prefix.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-python-prefix.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-python-prefix.diff	Thu Mar  6 20:14:17 2008
@@ -1,5 +1,5 @@
---- xen-unstable.orig/tools/python/xen/util/auxbin.py
-+++ xen-unstable/tools/python/xen/util/auxbin.py
+--- xen-3.orig/tools/python/xen/util/auxbin.py
++++ xen-3/tools/python/xen/util/auxbin.py
 @@ -16,19 +16,11 @@
  #============================================================================
  

Modified: trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff	Thu Mar  6 20:14:17 2008
@@ -1,6 +1,6 @@
 --- xen-unstable.orig/tools/python/xen/xm/create.py
 +++ xen-unstable/tools/python/xen/xm/create.py
-@@ -543,6 +543,14 @@
+@@ -561,6 +561,14 @@
      else:
          return s
  
@@ -15,7 +15,7 @@
  def configure_image(vals):
      """Create the image config.
      """
-@@ -550,9 +558,9 @@
+@@ -568,11 +576,11 @@
          return None
      config_image = [ vals.builder ]
      if vals.kernel:
@@ -23,11 +23,14 @@
 +        config_image.append([ 'kernel', abspath(vals.kernel, 'boot') ])
      if vals.ramdisk:
 -        config_image.append([ 'ramdisk', os.path.abspath(vals.ramdisk) ])
-+        config_image.append([ 'ramdisk', abspath(vals.ramdisk, 'boot') ])
++        config_image.append([ 'ramdisk', abspath(vals.kernel, 'boot') ])
+     if vals.loader:
+-        config_image.append([ 'loader', os.path.abspath(vals.loader) ])
++        config_image.append([ 'loader', abspath(vals.kernel, 'boot') ])
      if vals.cmdline_ip:
          cmdline_ip = strip('ip=', vals.cmdline_ip)
          config_image.append(['ip', cmdline_ip])
-@@ -729,7 +737,7 @@
+@@ -740,7 +748,7 @@
  def configure_hvm(config_image, vals):
      """Create the config for HVM devices.
      """
@@ -36,12 +39,12 @@
               'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
               'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten',
               'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor',
-@@ -737,6 +745,8 @@
+@@ -750,6 +758,8 @@
      for a in args:
          if a in vals.__dict__ and vals.__dict__[a] is not None:
              config_image.append([a, vals.__dict__[a]])
-+    if vals.device_model is not None:
-+        config_image.append([ 'device_model', abspath(vals.device_model, 'bin') ])
++    if vals.device_model:
++        config_image.append(['device_model', abspath(vals.device_model, 'bin')])
      if vals.vncpasswd is not None:
          config_image.append(['vncpasswd', vals.vncpasswd])
  

Modified: trunk/xen-unstable/debian/patches/tools-rpath.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-rpath.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-rpath.diff	Thu Mar  6 20:14:17 2008
@@ -1,15 +1,27 @@
 --- xen-unstable.orig/tools/Rules.mk
 +++ xen-unstable/tools/Rules.mk
-@@ -10,6 +10,9 @@
- XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
- XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+@@ -5,6 +5,8 @@
  
-+RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)
-+LDFLAGS += $(RPATH_ARG)
+ include $(XEN_ROOT)/Config.mk
+ 
++LDFLAGS_RPATH := -Wl,-rpath,$(PRIVATE_LIBDIR)
 +
- X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
+ XEN_INCLUDE        = $(XEN_ROOT)/tools/include
+ XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
+ XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
+@@ -14,10 +16,10 @@
+ CFLAGS_include = -I$(XEN_INCLUDE)
+ 
+ CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
+-LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
++LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl $(LDFLAGS_RPATH)
+ 
+ CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include)
+-LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest
++LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest $(LDFLAGS_RPATH)
  
- CFLAGS += -D__XEN_TOOLS__
+ CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
+ LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
 --- xen-unstable.orig/tools/python/setup.py
 +++ xen-unstable/tools/python/setup.py
 @@ -5,6 +5,7 @@
@@ -20,7 +32,7 @@
  
  include_dirs = [ XEN_ROOT + "/tools/libxc",
                   XEN_ROOT + "/tools/xenstore",
-@@ -18,6 +19,7 @@
+@@ -19,6 +20,7 @@
  
  xc = Extension("xc",
                 extra_compile_args = extra_compile_args,
@@ -28,7 +40,7 @@
                 include_dirs       = include_dirs + [ "xen/lowlevel/xc" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
-@@ -25,6 +27,7 @@
+@@ -26,6 +28,7 @@
  
  xs = Extension("xs",
                 extra_compile_args = extra_compile_args,
@@ -36,7 +48,7 @@
                 include_dirs       = include_dirs + [ "xen/lowlevel/xs" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
-@@ -32,6 +35,7 @@
+@@ -33,6 +36,7 @@
  
  scf = Extension("scf",
                 extra_compile_args = extra_compile_args,
@@ -44,7 +56,7 @@
                 include_dirs       = include_dirs + [ "xen/lowlevel/scf" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
-@@ -39,6 +43,7 @@
+@@ -40,6 +44,7 @@
               
  acm = Extension("acm",
                 extra_compile_args = extra_compile_args,
@@ -52,7 +64,7 @@
                 include_dirs       = include_dirs + [ "xen/lowlevel/acm" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
-@@ -46,6 +51,7 @@
+@@ -47,6 +52,7 @@
  
  flask = Extension("flask",
                 extra_compile_args = extra_compile_args,
@@ -60,7 +72,7 @@
                 include_dirs       = include_dirs + [ "xen/lowlevel/flask" ] + 
                                          [ "../flask/libflask/include" ],
                 library_dirs       = library_dirs + [ "../flask/libflask" ],
-@@ -54,6 +60,7 @@
+@@ -55,6 +61,7 @@
  
  ptsname = Extension("ptsname",
                 extra_compile_args = extra_compile_args,
@@ -68,36 +80,14 @@
                 include_dirs       = include_dirs + [ "ptsname" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
---- xen-unstable.orig/tools/xentrace/Makefile
-+++ xen-unstable/tools/xentrace/Makefile
-@@ -52,6 +52,6 @@
- 	$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
- 
- %: %.c $(HDRS) Makefile
--	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
- xentrace_%: %.c $(HDRS) Makefile
--	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
---- xen-unstable.orig/tools/blktap/drivers/Makefile
-+++ xen-unstable/tools/blktap/drivers/Makefile
-@@ -49,7 +49,7 @@
- qcow-util: img2qcow qcow2raw qcow-create
- 
- img2qcow qcow2raw qcow-create: %: $(BLK-OBJS)
--	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
- 
- install: all
- 	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
---- xen-unstable.orig/tools/blktap/lib/Makefile
-+++ xen-unstable/tools/blktap/lib/Makefile
-@@ -52,7 +52,7 @@
- 
- libblktap.a: $(OBJS) 
- 	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
--	      -L$(XEN_XENSTORE) -l xenstore                                \
-+	      -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
- 	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
- 	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
- 	ln -sf libblktap.so.$(MAJOR) libblktap.so
+--- xen-unstable.orig/tools/ioemu/Makefile.target
++++ xen-unstable/tools/ioemu/Makefile.target
+@@ -528,6 +528,8 @@
+ VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld
+ endif
+ 
++VL_LDFLAGS+=$(LDFLAGS_RPATH)
++
+ ifdef CONFIG_WIN32
+ SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+ endif

Modified: trunk/xen-unstable/debian/patches/version.patch
==============================================================================
--- trunk/xen-unstable/debian/patches/version.patch	(original)
+++ trunk/xen-unstable/debian/patches/version.patch	Thu Mar  6 20:14:17 2008
@@ -7,7 +7,7 @@
 @DPATCH@
 --- xen-unstable.orig/xen/Makefile
 +++ xen-unstable/xen/Makefile
-@@ -92,16 +92,16 @@
+@@ -74,16 +74,16 @@
  include/xen/compile.h: include/xen/compile.h.in
  	@sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
  	    -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \
@@ -99,7 +99,7 @@
 -}
 --- xen-unstable.orig/xen/drivers/char/console.c
 +++ xen-unstable/xen/drivers/char/console.c
-@@ -552,12 +552,10 @@
+@@ -552,14 +552,11 @@
      serial_set_rx_handler(sercon_handle, serial_rx);
  
      /* HELLO WORLD --- start-of-day banner text. */
@@ -113,8 +113,10 @@
 +           xen_compile_system_distribution(), xen_compile_system_version(),
 +           xen_compile_system_maintainer_local(), xen_compile_system_maintainer_domain(),
             xen_compiler(), xen_compile_date());
-     printk("Latest ChangeSet: %s\n", xen_changeset());
+-    printk("Latest ChangeSet: %s\n", xen_changeset());
  
+     if ( opt_sync_console )
+     {
 --- xen-unstable.orig/xen/include/xen/compile.h.in
 +++ xen-unstable/xen/include/xen/compile.h.in
 @@ -1,8 +1,9 @@

More information about the Pkg-xen-changes mailing list