Index: debian/patches/tools-python-prefix.diff =================================================================== --- debian/patches/tools-python-prefix.diff (revision 470) +++ debian/patches/tools-python-prefix.diff (working copy) @@ -1,5 +1,7 @@ ---- xen-unstable.orig/tools/python/xen/util/auxbin.py -+++ xen-unstable/tools/python/xen/util/auxbin.py +Index: xen-sid2.hg/tools/python/xen/util/auxbin.py +=================================================================== +--- xen-sid2.hg.orig/tools/python/xen/util/auxbin.py 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/python/xen/util/auxbin.py 2007-11-09 10:43:28.000000000 +0000 @@ -16,19 +16,11 @@ #============================================================================ Index: debian/patches/tools-ldflags.diff =================================================================== --- debian/patches/tools-ldflags.diff (revision 470) +++ debian/patches/tools-ldflags.diff (working copy) @@ -1,8 +1,10 @@ ---- xen-3.orig/tools/blktap/drivers/Makefile -+++ xen-3/tools/blktap/drivers/Makefile -@@ -42,11 +42,11 @@ +Index: xen-sid2.hg/tools/blktap/drivers/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/blktap/drivers/Makefile 2007-11-09 10:42:20.000000000 +0000 ++++ xen-sid2.hg/tools/blktap/drivers/Makefile 2007-11-09 10:44:08.000000000 +0000 +@@ -39,11 +39,11 @@ + all: $(IBIN) qcow-util - blktapctrl: blktapctrl.c - $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c + $(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c @@ -14,32 +16,38 @@ .PHONY: qcow-util qcow-util: img2qcow qcow2raw qcow-create ---- xen-3.orig/tools/console/Makefile -+++ xen-3/tools/console/Makefile +Index: xen-sid2.hg/tools/console/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/console/Makefile 2007-11-09 10:43:48.000000000 +0000 ++++ xen-sid2.hg/tools/console/Makefile 2007-11-09 10:44:47.000000000 +0000 @@ -20,11 +20,11 @@ $(RM) client/*.o daemon/*.o xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ - $(SOCKET_LIBS) -lxenctrl -lxenstore + $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) - $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ - $(SOCKET_LIBS) -lxenctrl -lxenstore + $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore .PHONY: install ---- xen-3.orig/tools/misc/Makefile -+++ xen-3/tools/misc/Makefile +Index: xen-sid2.hg/tools/misc/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/misc/Makefile 2007-11-09 10:43:11.000000000 +0000 ++++ xen-sid2.hg/tools/misc/Makefile 2007-11-09 10:44:08.000000000 +0000 @@ -41,4 +41,4 @@ $(CC) -c $(CFLAGS) -o $@ $< xenperf: %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl ---- xen-3.orig/tools/xcutils/Makefile -+++ xen-3/tools/xcutils/Makefile +Index: xen-sid2.hg/tools/xcutils/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/xcutils/Makefile 2007-11-09 10:42:20.000000000 +0000 ++++ xen-sid2.hg/tools/xcutils/Makefile 2007-11-09 10:44:08.000000000 +0000 @@ -33,7 +33,7 @@ build: $(PROGRAMS) Index: debian/patches/version.patch =================================================================== --- debian/patches/version.patch (revision 470) +++ debian/patches/version.patch (working copy) @@ -5,9 +5,11 @@ ## DP: No description. @DPATCH@ ---- xen-3.orig/xen/Makefile -+++ xen-3/xen/Makefile -@@ -105,16 +105,16 @@ +Index: xen-sid2.hg/xen/Makefile +=================================================================== +--- xen-sid2.hg.orig/xen/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/xen/Makefile 2007-11-09 10:45:08.000000000 +0000 +@@ -92,16 +92,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' \ @@ -28,9 +30,11 @@ @mv -f $@.new $@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s ---- xen-3.orig/xen/arch/powerpc/boot_of.c -+++ xen-3/xen/arch/powerpc/boot_of.c -@@ -1332,9 +1332,10 @@ +Index: xen-sid2.hg/xen/arch/powerpc/boot_of.c +=================================================================== +--- xen-sid2.hg.orig/xen/arch/powerpc/boot_of.c 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/xen/arch/powerpc/boot_of.c 2007-11-09 10:45:08.000000000 +0000 +@@ -1225,9 +1225,10 @@ of_getprop(bof_chosen, "stdout", &of_out, sizeof (of_out)); of_printf("%s\n", "---------------------------------------------------"); @@ -42,10 +46,12 @@ + xen_compile_system_maintainer_local(), xen_compile_system_maintainer_domain(), xen_compiler(), xen_compile_date()); - of_printf("%s args: 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n" ---- xen-3.orig/xen/common/kernel.c -+++ xen-3/xen/common/kernel.c -@@ -151,8 +151,8 @@ + boot_of_fix_maple(); +Index: xen-sid2.hg/xen/common/kernel.c +=================================================================== +--- xen-sid2.hg.orig/xen/common/kernel.c 2007-11-09 10:14:59.000000000 +0000 ++++ xen-sid2.hg/xen/common/kernel.c 2007-11-09 10:45:08.000000000 +0000 +@@ -159,8 +159,8 @@ { struct xen_compile_info info; safe_strcpy(info.compiler, xen_compiler()); @@ -56,8 +62,10 @@ safe_strcpy(info.compile_date, xen_compile_date()); if ( copy_to_guest(arg, &info, 1) ) return -EFAULT; ---- xen-3.orig/xen/common/version.c -+++ xen-3/xen/common/version.c +Index: xen-sid2.hg/xen/common/version.c +=================================================================== +--- xen-sid2.hg.orig/xen/common/version.c 2007-11-09 10:14:59.000000000 +0000 ++++ xen-sid2.hg/xen/common/version.c 2007-11-09 10:45:08.000000000 +0000 @@ -10,19 +10,24 @@ return XEN_COMPILE_TIME; } @@ -97,26 +105,30 @@ -{ - return XEN_BANNER; -} ---- xen-3.orig/xen/drivers/char/console.c -+++ xen-3/xen/drivers/char/console.c -@@ -522,12 +522,10 @@ +Index: xen-sid2.hg/xen/drivers/char/console.c +=================================================================== +--- xen-sid2.hg.orig/xen/drivers/char/console.c 2007-11-09 10:14:59.000000000 +0000 ++++ xen-sid2.hg/xen/drivers/char/console.c 2007-11-09 10:46:37.000000000 +0000 +@@ -554,12 +554,10 @@ serial_set_rx_handler(sercon_handle, serial_rx); /* HELLO WORLD --- start-of-day banner text. */ -- printk(xen_banner()); -- printk(" http://www.cl.cam.ac.uk/netos/xen\n"); -- printk(" University of Cambridge Computer Laboratory\n\n"); -- printk(" Xen version %d.%d%s (%s@%s) (%s) %s\n", -+ printk(" Xen version %d.%d%s (%s %s) (%s@%s) (%s) %s\n", +- spin_lock(&console_lock); +- __putstr(xen_banner()); +- spin_unlock(&console_lock); +- printk("Xen version %d.%d%s (%s@%s) (%s) %s\n", ++ printk("Xen version %d.%d%s (%s %s) (%s@%s) (%s) %s\n", xen_major_version(), xen_minor_version(), xen_extra_version(), - xen_compile_by(), xen_compile_domain(), + 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\n", xen_changeset()); - set_printk_prefix("(XEN) "); ---- xen-3.orig/xen/include/xen/compile.h.in -+++ xen-3/xen/include/xen/compile.h.in + printk("Latest ChangeSet: %s\n", xen_changeset()); + +Index: xen-sid2.hg/xen/include/xen/compile.h.in +=================================================================== +--- xen-sid2.hg.orig/xen/include/xen/compile.h.in 2007-11-09 10:14:59.000000000 +0000 ++++ xen-sid2.hg/xen/include/xen/compile.h.in 2007-11-09 10:45:08.000000000 +0000 @@ -1,8 +1,9 @@ #define XEN_COMPILE_DATE "@@date@@" #define XEN_COMPILE_TIME "@@time@@" @@ -135,8 +147,10 @@ #define XEN_CHANGESET "@@changeset@@" -#define XEN_BANNER \ ---- xen-3.orig/xen/include/xen/version.h -+++ xen-3/xen/include/xen/version.h +Index: xen-sid2.hg/xen/include/xen/version.h +=================================================================== +--- xen-sid2.hg.orig/xen/include/xen/version.h 2007-11-09 10:14:59.000000000 +0000 ++++ xen-sid2.hg/xen/include/xen/version.h 2007-11-09 10:45:08.000000000 +0000 @@ -3,14 +3,14 @@ const char *xen_compile_date(void); Index: debian/patches/tools-ioemu-config.diff =================================================================== --- debian/patches/tools-ioemu-config.diff (revision 470) +++ debian/patches/tools-ioemu-config.diff (working copy) @@ -1,11 +1,13 @@ ---- xen-3.orig/tools/ioemu/vl.c -+++ xen-3/tools/ioemu/vl.c -@@ -89,7 +89,7 @@ +Index: xen-sid2.hg/tools/ioemu/vl.c +=================================================================== +--- xen-sid2.hg.orig/tools/ioemu/vl.c 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/ioemu/vl.c 2007-11-09 10:50:40.000000000 +0000 +@@ -96,7 +96,7 @@ + #include "exec-all.h" - #include -#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup" +#define DEFAULT_NETWORK_SCRIPT "/etc/xen/scripts/qemu-ifup" - #define DEFAULT_BRIDGE "xenbr0" - - //#define DEBUG_UNUSED_IOPORT + #ifdef _BSD + #define DEFAULT_BRIDGE "bridge0" + #else Index: debian/patches/series =================================================================== --- debian/patches/series (revision 470) +++ debian/patches/series (working copy) @@ -12,6 +12,5 @@ tools-pygrub-prefix.diff tools-libfsimage-prefix.diff disable-features.diff -tools-xenfb-prefix.diff tools-misc-xend-race.diff doc-remove-unused.diff Index: debian/patches/tools-prefix.diff =================================================================== --- debian/patches/tools-prefix.diff (revision 470) +++ debian/patches/tools-prefix.diff (working copy) @@ -1,5 +1,7 @@ ---- xen-unstable.orig/tools/blktap/drivers/Makefile -+++ xen-unstable/tools/blktap/drivers/Makefile +Index: xen-sid2.hg/tools/blktap/drivers/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/blktap/drivers/Makefile 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/blktap/drivers/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -5,7 +5,7 @@ IBIN = blktapctrl tapdisk @@ -17,8 +19,10 @@ $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR) clean: ---- xen-unstable.orig/tools/console/Makefile -+++ xen-unstable/tools/console/Makefile +Index: xen-sid2.hg/tools/console/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/console/Makefile 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/console/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -2,8 +2,7 @@ XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk @@ -39,15 +43,17 @@ - $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR) + $(INSTALL_DIR) $(DESTDIR)/$(DIR) + $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)/$(DIR) ---- xen-unstable.orig/tools/misc/Makefile -+++ xen-unstable/tools/misc/Makefile +Index: xen-sid2.hg/tools/misc/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/misc/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/misc/Makefile 2007-11-09 10:43:11.000000000 +0000 @@ -13,8 +13,7 @@ TARGETS-$(CONFIG_X86) += xen-detect TARGETS := $(TARGETS-y) -INSTALL_BIN = $(TARGETS) xencons --INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf -+INSTALL_TARGETS = $(TARGETS) xencons netfix xm xen-bugtool xen-python-path xend +-INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf xsview ++INSTALL_TARGETS = $(TARGETS) xencons netfix xm xen-bugtool xen-python-path xend .PHONY: all all: build @@ -64,8 +70,10 @@ $(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 +Index: xen-sid2.hg/tools/misc/lomount/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/misc/lomount/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/misc/lomount/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -16,7 +16,7 @@ .PHONY: install @@ -75,8 +83,10 @@ .PHONY: clean clean: ---- xen-unstable.orig/tools/python/Makefile -+++ xen-unstable/tools/python/Makefile +Index: xen-sid2.hg/tools/python/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/python/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/python/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -24,7 +24,7 @@ .PHONY: build buildpy @@ -99,8 +109,10 @@ endif install-dtd: all ---- xen-unstable.orig/tools/xcutils/Makefile -+++ xen-unstable/tools/xcutils/Makefile +Index: xen-sid2.hg/tools/xcutils/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/xcutils/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/xcutils/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -11,7 +11,7 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk @@ -110,8 +122,10 @@ INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) ---- xen-unstable.orig/tools/xenmon/Makefile -+++ xen-unstable/tools/xenmon/Makefile +Index: xen-sid2.hg/tools/xenmon/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/xenmon/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/xenmon/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -13,8 +13,6 @@ XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk @@ -134,8 +148,10 @@ .PHONY: clean clean: ---- xen-unstable.orig/tools/xenstat/xentop/Makefile -+++ xen-unstable/tools/xenstat/xentop/Makefile +Index: xen-sid2.hg/tools/xenstat/xentop/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/xenstat/xentop/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/xenstat/xentop/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -21,7 +21,6 @@ prefix=/usr mandir=$(prefix)/share/man @@ -153,9 +169,11 @@ $(INSTALL_DIR) $(DESTDIR)$(man1dir) $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1 ---- xen-unstable.orig/tools/xenstore/Makefile -+++ xen-unstable/tools/xenstore/Makefile -@@ -80,13 +80,9 @@ +Index: xen-sid2.hg/tools/xenstore/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/xenstore/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/xenstore/Makefile 2007-11-09 10:42:20.000000000 +0000 +@@ -81,13 +81,9 @@ install: all $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored @@ -171,8 +189,10 @@ $(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 +Index: xen-sid2.hg/tools/xentrace/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/xentrace/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/xentrace/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -35,15 +35,11 @@ .PHONY: install @@ -194,8 +214,10 @@ $(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 +Index: xen-sid2.hg/tools/ioemu/Makefile.target +=================================================================== +--- xen-sid2.hg.orig/tools/ioemu/Makefile.target 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/ioemu/Makefile.target 2007-11-09 10:42:20.000000000 +0000 @@ -206,6 +206,7 @@ ifdef CONFIG_SOLARIS LIBS+=-lsocket -lnsl -lresolv @@ -204,9 +226,11 @@ # profiling code ifdef TARGET_GPROF ---- xen-unstable.orig/tools/ioemu/configure -+++ xen-unstable/tools/ioemu/configure -@@ -578,9 +578,9 @@ +Index: xen-sid2.hg/tools/ioemu/configure +=================================================================== +--- xen-sid2.hg.orig/tools/ioemu/configure 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/ioemu/configure 2007-11-09 10:42:20.000000000 +0000 +@@ -594,9 +594,9 @@ prefix="/usr/local" fi mandir="$prefix/share/man" @@ -218,8 +242,10 @@ configdir="/etc/xen" fi ---- xen-unstable.orig/tools/firmware/Makefile -+++ xen-unstable/tools/firmware/Makefile +Index: xen-sid2.hg/tools/firmware/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/firmware/Makefile 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/firmware/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -4,7 +4,7 @@ # hvmloader is a 32-bit protected mode binary. # It belongs in /usr/lib, not /usr/lib64. @@ -229,8 +255,10 @@ SUBDIRS := SUBDIRS += rombios rombios/32bit ---- xen-unstable.orig/tools/blktap/lib/Makefile -+++ xen-unstable/tools/blktap/lib/Makefile +Index: xen-sid2.hg/tools/blktap/lib/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/blktap/lib/Makefile 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/blktap/lib/Makefile 2007-11-09 10:42:20.000000000 +0000 @@ -5,7 +5,7 @@ MINOR = 0 SONAME = libblktap.so.$(MAJOR) Index: debian/patches/tools-python-xen-xm-relative-path.diff =================================================================== --- debian/patches/tools-python-xen-xm-relative-path.diff (revision 470) +++ debian/patches/tools-python-xen-xm-relative-path.diff (working copy) @@ -1,6 +1,8 @@ ---- xen-unstable.orig/tools/python/xen/xm/create.py -+++ xen-unstable/tools/python/xen/xm/create.py -@@ -534,6 +534,14 @@ +Index: xen-sid2.hg/tools/python/xen/xm/create.py +=================================================================== +--- xen-sid2.hg.orig/tools/python/xen/xm/create.py 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/python/xen/xm/create.py 2007-11-09 10:50:12.000000000 +0000 +@@ -543,6 +543,14 @@ else: return s @@ -15,7 +17,7 @@ def configure_image(vals): """Create the image config. """ -@@ -541,9 +549,9 @@ +@@ -550,9 +558,9 @@ return None config_image = [ vals.builder ] if vals.kernel: @@ -27,16 +29,16 @@ if vals.cmdline_ip: cmdline_ip = strip('ip=', vals.cmdline_ip) config_image.append(['ip', cmdline_ip]) -@@ -717,7 +725,7 @@ +@@ -729,7 +737,7 @@ def configure_hvm(config_image, vals): """Create the config for HVM devices. """ -- args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', -+ args = [ 'pae', 'vcpus', 'boot', 'fda', 'fdb', +- args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', 'timer_mode', ++ args = [ 'pae', 'vcpus', 'boot', 'fda', 'fdb', 'timer_mode', 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten', 'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor', -@@ -725,6 +733,8 @@ +@@ -737,6 +745,8 @@ for a in args: if a in vals.__dict__ and vals.__dict__[a] is not None: config_image.append([a, vals.__dict__[a]]) Index: debian/patches/tools-lib-abiname.diff =================================================================== --- debian/patches/tools-lib-abiname.diff (revision 470) +++ debian/patches/tools-lib-abiname.diff (working copy) @@ -1,5 +1,7 @@ ---- xen-unstable.orig/tools/libxc/Makefile -+++ xen-unstable/tools/libxc/Makefile +Index: xen-sid2.hg/tools/libxc/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/libxc/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/libxc/Makefile 2007-11-09 10:46:46.000000000 +0000 @@ -1,9 +1,6 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk @@ -10,7 +12,7 @@ CTRL_SRCS-y := CTRL_SRCS-y += xc_core.c CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c -@@ -78,10 +75,10 @@ +@@ -80,10 +77,10 @@ GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y)) LIB := libxenctrl.a @@ -23,7 +25,7 @@ .PHONY: all all: build -@@ -103,16 +100,10 @@ +@@ -105,16 +102,10 @@ install: build [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR) [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include @@ -42,7 +44,7 @@ $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include .PHONY: TAGS -@@ -140,26 +131,16 @@ +@@ -142,26 +133,16 @@ libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ @@ -73,8 +75,10 @@ -include $(DEPS) ---- xen-unstable.orig/tools/xenstore/Makefile -+++ xen-unstable/tools/xenstore/Makefile +Index: xen-sid2.hg/tools/xenstore/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/xenstore/Makefile 2007-11-09 10:42:20.000000000 +0000 ++++ xen-sid2.hg/tools/xenstore/Makefile 2007-11-09 10:46:46.000000000 +0000 @@ -2,9 +2,6 @@ include $(XEN_ROOT)/tools/Rules.mk XEN_LIBXC = $(XEN_ROOT)/tools/libxc @@ -85,7 +89,7 @@ PROFILE=#-pg BASECFLAGS=-Werror # Make gcc generate dependencies. -@@ -49,13 +46,8 @@ +@@ -50,13 +47,8 @@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ @@ -101,7 +105,7 @@ libxenstore.a: xs.o xs_lib.o $(AR) rcs libxenstore.a $^ -@@ -84,9 +76,7 @@ +@@ -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) @@ -112,8 +116,10 @@ $(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 +Index: xen-sid2.hg/tools/blktap/lib/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/blktap/lib/Makefile 2007-11-09 10:42:20.000000000 +0000 ++++ xen-sid2.hg/tools/blktap/lib/Makefile 2007-11-09 10:46:46.000000000 +0000 @@ -1,9 +1,7 @@ XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk @@ -157,8 +163,10 @@ $(AR) rc $@ libblktap.so .PHONY: TAGS all build clean install libblktap ---- xen-unstable.orig/tools/libfsimage/common/Makefile -+++ xen-unstable/tools/libfsimage/common/Makefile +Index: xen-sid2.hg/tools/libfsimage/common/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/libfsimage/common/Makefile 2007-11-09 10:14:58.000000000 +0000 ++++ xen-sid2.hg/tools/libfsimage/common/Makefile 2007-11-09 10:46:46.000000000 +0000 @@ -1,9 +1,6 @@ XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk @@ -205,8 +213,10 @@ -include $(DEPS) ---- xen-unstable.orig/tools/flask/libflask/Makefile -+++ xen-unstable/tools/flask/libflask/Makefile +Index: xen-sid2.hg/tools/flask/libflask/Makefile +=================================================================== +--- xen-sid2.hg.orig/tools/flask/libflask/Makefile 2007-11-09 10:14:57.000000000 +0000 ++++ xen-sid2.hg/tools/flask/libflask/Makefile 2007-11-09 10:48:25.000000000 +0000 @@ -1,6 +1,3 @@ -MAJOR = 1.0 -MINOR = 0 @@ -232,7 +242,7 @@ $(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_op.h $(DESTDIR)/usr/include + $(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include .PHONY: TAGS @@ -54,12 +49,7 @@ @@ -245,7 +255,7 @@ - ln -sf $< $@ - -libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libflask.so.$(MAJOR) -shared -o $@ $^ +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ +libflask.so: $(PIC_OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ Index: debian/changelog =================================================================== --- debian/changelog (revision 470) +++ debian/changelog (working copy) @@ -1,3 +1,9 @@ +xen-unstable (3.0-unstable+hg16319-0.~1) unstable; urgency=low + + * Transplanted to new snapshot. + + -- Ian Jackson Fri, 9 Nov 2007 10:16:58 +0000 + xen-unstable (3.0-unstable+hg15880-1) UNRELEASED; urgency=low * New upstream snapshot.