Bastian Blank
2007-Jan-25 14:03 UTC
[Pkg-xen-changes] r390 - in trunk/xen-3.0/debian: . patches templates
Author: waldi
Date: Thu Jan 25 14:03:03 2007
New Revision: 390
Modified:
trunk/xen-3.0/debian/changelog
trunk/xen-3.0/debian/patches/blktap-disable.dpatch
trunk/xen-3.0/debian/patches/libs.dpatch
trunk/xen-3.0/debian/patches/path-relative.dpatch
trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch
trunk/xen-3.0/debian/patches/prefix-python.dpatch
trunk/xen-3.0/debian/patches/prefix-utils.dpatch
trunk/xen-3.0/debian/patches/version.dpatch
trunk/xen-3.0/debian/templates/control.source.in
Log:
Update to 3.0.4-0+hg13100-1.
* debian/changelog: Update.
* debian/patches: Fix patches.
* debian/templates/control.source.in: Build-depend on libssl-dev.
Modified: trunk/xen-3.0/debian/changelog
=============================================================================---
trunk/xen-3.0/debian/changelog (original)
+++ trunk/xen-3.0/debian/changelog Thu Jan 25 14:03:03 2007
@@ -1,3 +1,9 @@
+xen-3.0 (3.0.4-0+hg13100-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+
+ -- Bastian Blank <waldi@debian.org> Mon, 1 Jan 2007 13:38:31 +0000
+
xen-3.0 (3.0.3-0-2) unstable; urgency=medium
[Bastian Blank]
Modified: trunk/xen-3.0/debian/patches/blktap-disable.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/blktap-disable.dpatch (original)
+++ trunk/xen-3.0/debian/patches/blktap-disable.dpatch Thu Jan 25 14:03:03 2007
@@ -5,21 +5,21 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/tools/Makefile xen-unstable/tools/Makefile
---- xen-unstable~/tools/Makefile 2006-08-22 09:56:47.000000000 +0000
-+++ xen-unstable/tools/Makefile 2006-08-22 17:56:06.202699107 +0000
+diff -urNad xen-3.0~/tools/Makefile xen-3.0/tools/Makefile
+--- xen-3.0~/tools/Makefile 2007-01-01 13:31:17.000000000 +0000
++++ xen-3.0/tools/Makefile 2007-01-01 13:51:07.342901844 +0000
@@ -17,7 +17,6 @@
SUBDIRS-$(VTPM_TOOLS) += vtpm
SUBDIRS-y += xenstat
SUBDIRS-y += libaio
-SUBDIRS-y += blktap
-
- # These don''t cross-compile
- ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
-diff -urNad xen-unstable~/tools/misc/xend xen-unstable/tools/misc/xend
---- xen-unstable~/tools/misc/xend 2006-08-22 17:56:05.754900357 +0000
-+++ xen-unstable/tools/misc/xend 2006-08-22 17:56:20.568242935 +0000
-@@ -84,10 +84,6 @@
+ SUBDIRS-y += libfsimage
+ SUBDIRS-$(XENFB_TOOLS) += xenfb
+ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
+diff -urNad xen-3.0~/tools/misc/xend xen-3.0/tools/misc/xend
+--- xen-3.0~/tools/misc/xend 2007-01-01 13:50:50.947812144 +0000
++++ xen-3.0/tools/misc/xend 2007-01-01 13:51:34.617386944 +0000
+@@ -87,10 +87,6 @@
if os.fork() == 0:
os.execvp(sys.path[0] + ''/xenconsoled'',
[''xenconsoled''])
@@ -30,11 +30,11 @@
def main():
try:
check_logging()
-@@ -101,19 +97,16 @@
- elif sys.argv[1] == ''start'':
- start_xenstored()
- start_consoled()
-- start_blktapctrl()
+@@ -105,12 +101,10 @@
+ if os.uname()[0] != "SunOS":
+ start_xenstored()
+ start_consoled()
+- start_blktapctrl()
return daemon.start()
elif sys.argv[1] == ''trace_start'':
start_xenstored()
@@ -43,6 +43,7 @@
return daemon.start(trace=1)
elif sys.argv[1] == ''stop'':
return daemon.stop()
+@@ -119,7 +113,6 @@
elif sys.argv[1] == ''restart'':
start_xenstored()
start_consoled()
Modified: trunk/xen-3.0/debian/patches/libs.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/libs.dpatch (original)
+++ trunk/xen-3.0/debian/patches/libs.dpatch Thu Jan 25 14:03:03 2007
@@ -5,20 +5,20 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/tools/libxc/Makefile
xen-unstable/tools/libxc/Makefile
---- xen-unstable~/tools/libxc/Makefile 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/libxc/Makefile 2006-08-22 10:24:54.509973069 +0000
-@@ -4,9 +4,6 @@
- INSTALL_DATA = $(INSTALL) -m0644
- INSTALL_DIR = $(INSTALL) -d -m0755
+diff -urNad xen-3.0~/tools/libxc/Makefile xen-3.0/tools/libxc/Makefile
+--- xen-3.0~/tools/libxc/Makefile 2007-01-01 13:31:39.000000000 +0000
++++ xen-3.0/tools/libxc/Makefile 2007-01-01 13:50:35.148689118 +0000
+@@ -1,9 +1,6 @@
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
-MAJOR = 3.0
-MINOR = 0
-
- XEN_ROOT = ../..
- include $(XEN_ROOT)/tools/Rules.mk
-
-@@ -55,11 +52,9 @@
+ CTRL_SRCS-y :+ CTRL_SRCS-y += xc_core.c
+ CTRL_SRCS-y += xc_domain.c
+@@ -50,11 +47,9 @@
GUEST_LIB_OBJS := $(patsubst %.c,%.o,$(GUEST_SRCS-y))
GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
@@ -32,7 +32,7 @@
.PHONY: all
all: build
-@@ -81,16 +76,10 @@
+@@ -76,16 +71,10 @@
install: build
[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
@@ -51,7 +51,7 @@
$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
.PHONY: TAGS
-@@ -118,26 +107,16 @@
+@@ -113,26 +102,16 @@
libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
@@ -61,9 +61,9 @@
- ln -sf $< $@
-
-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so.$(MAJOR) -shared -o
$@ $^
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^ -lpthread
+libxenctrl.so: $(CTRL_PIC_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
# libxenguest
@@ -76,15 +76,15 @@
- ln -sf $< $@
-
-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so.$(MAJOR) -shared -o
$@ $^ -lz -lxenctrl
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl -lpthread
+libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lz -lxenctrl
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz
-lxenctrl -lpthread
-include $(DEPS)
-diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
---- xen-unstable~/tools/xenstore/Makefile 2006-08-22 10:23:24.313310008 +0000
-+++ xen-unstable/tools/xenstore/Makefile 2006-08-22 10:24:42.839218147 +0000
+diff -urNad xen-3.0~/tools/xenstore/Makefile xen-3.0/tools/xenstore/Makefile
+--- xen-3.0~/tools/xenstore/Makefile 2007-01-01 13:48:53.618319274 +0000
++++ xen-3.0/tools/xenstore/Makefile 2007-01-01 13:49:39.291787747 +0000
@@ -2,9 +2,6 @@
include $(XEN_ROOT)/tools/Rules.mk
XEN_LIBXC = $(XEN_ROOT)/tools/libxc
@@ -92,10 +92,10 @@
-MAJOR = 3.0
-MINOR = 0
-
- INSTALL = install
- INSTALL_DATA = $(INSTALL) -m0644
- INSTALL_PROG = $(INSTALL) -m0755
-@@ -89,13 +86,8 @@
+ PROFILE=#-pg
+ BASECFLAGS=-Werror
+ # Make gcc generate dependencies.
+@@ -85,13 +82,8 @@
talloc_test.o: talloc.c
$(COMPILE.c) -o $@ $<
@@ -105,13 +105,13 @@
- ln -sf $< $@
-
-libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so.$(MAJOR) -shared -o
$@ $^ -lpthread
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^ -lpthread
+libxenstore.so: xs.opic xs_lib.opic
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lpthread
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
libxenstore.a: xs.o xs_lib.o
$(AR) rcs libxenstore.a $^
-@@ -182,9 +174,7 @@
+@@ -177,9 +169,7 @@
$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
Modified: trunk/xen-3.0/debian/patches/path-relative.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/path-relative.dpatch (original)
+++ trunk/xen-3.0/debian/patches/path-relative.dpatch Thu Jan 25 14:03:03 2007
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad xen-3.0~/tools/python/xen/xm/create.py
xen-3.0/tools/python/xen/xm/create.py
---- xen-3.0~/tools/python/xen/xm/create.py 2006-10-14 10:24:31.000000000 +0000
-+++ xen-3.0/tools/python/xen/xm/create.py 2006-10-14 12:30:03.877096876 +0000
-@@ -464,6 +464,14 @@
+--- xen-3.0~/tools/python/xen/xm/create.py 2007-01-01 13:31:46.000000000 +0000
++++ xen-3.0/tools/python/xen/xm/create.py 2007-01-01 13:52:32.342169960 +0000
+@@ -504,6 +504,14 @@
else:
return s
@@ -23,7 +23,7 @@
def configure_image(vals):
"""Create the image config.
"""
-@@ -471,9 +479,9 @@
+@@ -511,9 +519,9 @@
return None
config_image = [ vals.builder ]
if vals.kernel:
@@ -35,7 +35,7 @@
if vals.cmdline_ip:
cmdline_ip = strip(''ip='', vals.cmdline_ip)
config_image.append([''ip'', cmdline_ip])
-@@ -635,7 +643,7 @@
+@@ -693,7 +701,7 @@
def configure_hvm(config_image, vals):
"""Create the config for HVM devices.
"""
@@ -44,12 +44,12 @@
''localtime'', ''serial'',
''stdvga'', ''isa'',
''nographic'', ''soundhw'',
''vnc'', ''vncdisplay'',
''vncunused'', ''vncconsole'',
''vnclisten'',
''sdl'', ''display'',
''xauthority'',
-@@ -643,6 +651,8 @@
+@@ -701,6 +709,8 @@
for a in args:
- if (vals.__dict__[a]):
+ if a in vals.__dict__ and vals.__dict__[a] is not None:
config_image.append([a, vals.__dict__[a]])
+ if vals.device_model:
+ config_image.append([ ''device_model'',
abspath(vals.device_model, ''bin'') ])
+ config_image.append([''vncpasswd'', vals.vncpasswd])
def run_bootloader(vals, config_image):
- if not os.access(vals.bootloader, os.X_OK):
Modified: trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch (original)
+++ trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch Thu Jan 25 14:03:03 2007
@@ -6,22 +6,22 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/tools/firmware/Makefile
xen-unstable/tools/firmware/Makefile
---- xen-unstable~/tools/firmware/Makefile 2006-09-21 21:44:58.000000000 +0200
-+++ xen-unstable/tools/firmware/Makefile 2006-09-21 22:45:05.000000000 +0200
+diff -urNad xen-3.0~/tools/firmware/Makefile xen-3.0/tools/firmware/Makefile
+--- xen-3.0~/tools/firmware/Makefile 2007-01-01 13:31:22.000000000 +0000
++++ xen-3.0/tools/firmware/Makefile 2007-01-01 13:45:38.811446711 +0000
@@ -4,7 +4,7 @@
# hvmloader is a 32-bit protected mode binary.
# It belongs in /usr/lib, not /usr/lib64.
TARGET := hvmloader/hvmloader
--INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot
-+INSTALL_DIR := $(DESTDIR)/usr/lib/xen-$(XEN_VERSION)/boot
+-INST_DIR := $(DESTDIR)/usr/lib/xen/boot
++INST_DIR := $(DESTDIR)/usr/lib/xen-$(XEN_VERSION)/boot
SUBDIRS : SUBDIRS += rombios
-diff -urNad xen-unstable~/tools/ioemu/Makefile.target
xen-unstable/tools/ioemu/Makefile.target
---- xen-unstable~/tools/ioemu/Makefile.target 2006-09-21 21:44:57.000000000
+0200
-+++ xen-unstable/tools/ioemu/Makefile.target 2006-09-21 22:45:50.000000000
+0200
-@@ -191,6 +191,7 @@
+diff -urNad xen-3.0~/tools/ioemu/Makefile.target
xen-3.0/tools/ioemu/Makefile.target
+--- xen-3.0~/tools/ioemu/Makefile.target 2007-01-01 13:31:25.000000000 +0000
++++ xen-3.0/tools/ioemu/Makefile.target 2007-01-01 13:45:23.676282285 +0000
+@@ -192,6 +192,7 @@
ifdef CONFIG_SOLARIS
LIBS+=-lsocket -lnsl -lresolv
endif
@@ -29,9 +29,9 @@
# profiling code
ifdef TARGET_GPROF
-diff -urNad xen-unstable~/tools/ioemu/configure
xen-unstable/tools/ioemu/configure
---- xen-unstable~/tools/ioemu/configure 2006-09-21 21:44:58.000000000 +0200
-+++ xen-unstable/tools/ioemu/configure 2006-09-21 22:45:05.000000000 +0200
+diff -urNad xen-3.0~/tools/ioemu/configure xen-3.0/tools/ioemu/configure
+--- xen-3.0~/tools/ioemu/configure 2007-01-01 13:31:26.000000000 +0000
++++ xen-3.0/tools/ioemu/configure 2007-01-01 13:45:23.676282285 +0000
@@ -514,9 +514,9 @@
prefix="/usr/local"
fi
Modified: trunk/xen-3.0/debian/patches/prefix-python.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/prefix-python.dpatch (original)
+++ trunk/xen-3.0/debian/patches/prefix-python.dpatch Thu Jan 25 14:03:03 2007
@@ -5,10 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/tools/misc/xend xen-unstable/tools/misc/xend
---- xen-unstable~/tools/misc/xend 2006-09-21 21:44:57.000000000 +0200
-+++ xen-unstable/tools/misc/xend 2006-09-21 23:32:35.000000000 +0200
-@@ -35,16 +35,7 @@
+diff -urNad xen-3.0~/tools/misc/xend xen-3.0/tools/misc/xend
+--- xen-3.0~/tools/misc/xend 2007-01-01 13:31:41.000000000 +0000
++++ xen-3.0/tools/misc/xend 2007-01-01 13:45:55.018551704 +0000
+@@ -38,16 +38,7 @@
AUXBIN = ''xen/util/auxbin.py''
@@ -26,7 +26,7 @@
from xen.xend.server import SrvDaemon
-@@ -84,18 +75,18 @@
+@@ -87,18 +78,18 @@
def start_xenstored():
XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
@@ -48,9 +48,9 @@
def main():
try:
-diff -urNad xen-unstable~/tools/misc/xm xen-unstable/tools/misc/xm
---- xen-unstable~/tools/misc/xm 2006-09-21 21:44:57.000000000 +0200
-+++ xen-unstable/tools/misc/xm 2006-09-21 23:32:35.000000000 +0200
+diff -urNad xen-3.0~/tools/misc/xm xen-3.0/tools/misc/xm
+--- xen-3.0~/tools/misc/xm 2007-01-01 13:31:41.000000000 +0000
++++ xen-3.0/tools/misc/xm 2007-01-01 13:45:55.018551704 +0000
@@ -1,10 +1,7 @@
#!/usr/bin/env python
# -*- mode: python; -*-
@@ -63,9 +63,9 @@
from xen.xm import main
main.main(sys.argv)
-diff -urNad xen-unstable~/tools/python/xen/util/auxbin.py
xen-unstable/tools/python/xen/util/auxbin.py
---- xen-unstable~/tools/python/xen/util/auxbin.py 2006-09-21 21:44:56.000000000
+0200
-+++ xen-unstable/tools/python/xen/util/auxbin.py 2006-09-21 23:33:12.000000000
+0200
+diff -urNad xen-3.0~/tools/python/xen/util/auxbin.py
xen-3.0/tools/python/xen/util/auxbin.py
+--- xen-3.0~/tools/python/xen/util/auxbin.py 2007-01-01 13:31:43.000000000
+0000
++++ xen-3.0/tools/python/xen/util/auxbin.py 2007-01-01 13:46:21.697077864 +0000
@@ -16,17 +16,9 @@
#===========================================================================
@@ -75,7 +75,7 @@
-LIB_BIN_SUFFIX = "xen/bin"
-
-## The architectures on which the LIB_64 directory is used. This
--# deliberately excludes ia64 and ppc64.
+-# deliberately excludes ia64 and ppc64, and Solaris.
-LIB_64_ARCHS = [ ''x86_64'', ''s390x'',
''sparc64'']
-
-
@@ -104,11 +104,11 @@
- else:
- return LIB_32
+ return os.path.realpath(os.path.join(path(), ''../lib''))
-diff -urNad xen-unstable~/tools/python/xen/xm/console.py
xen-unstable/tools/python/xen/xm/console.py
---- xen-unstable~/tools/python/xen/xm/console.py 2006-09-21 21:44:56.000000000
+0200
-+++ xen-unstable/tools/python/xen/xm/console.py 2006-09-21 23:32:35.000000000
+0200
-@@ -23,4 +23,4 @@
-
+diff -urNad xen-3.0~/tools/python/xen/xm/console.py
xen-3.0/tools/python/xen/xm/console.py
+--- xen-3.0~/tools/python/xen/xm/console.py 2007-01-01 13:31:46.000000000 +0000
++++ xen-3.0/tools/python/xen/xm/console.py 2007-01-01 13:45:55.018551704 +0000
+@@ -21,4 +21,4 @@
+ import xen.util.auxbin
def execConsole(domid):
- xen.util.auxbin.execute(XENCONSOLE, [str(domid)])
Modified: trunk/xen-3.0/debian/patches/prefix-utils.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/prefix-utils.dpatch (original)
+++ trunk/xen-3.0/debian/patches/prefix-utils.dpatch Thu Jan 25 14:03:03 2007
@@ -6,11 +6,11 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
---- xen-unstable~/Config.mk 2006-09-21 19:44:53.000000000 +0000
-+++ xen-unstable/Config.mk 2006-09-21 19:45:52.250012573 +0000
-@@ -43,6 +43,10 @@
-
+diff -urNad xen-3.0~/Config.mk xen-3.0/Config.mk
+--- xen-3.0~/Config.mk 2007-01-01 13:30:55.000000000 +0000
++++ xen-3.0/Config.mk 2007-01-01 13:39:52.798490332 +0000
+@@ -21,6 +21,10 @@
+ include $(XEN_ROOT)/config/$(XEN_OS).mk
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
+PREFIX = lib/xen-$(XEN_VERSION)
@@ -20,43 +20,49 @@
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
-diff -urNad xen-unstable~/config/ia64.mk xen-unstable/config/ia64.mk
---- xen-unstable~/config/ia64.mk 2006-09-21 19:44:53.000000000 +0000
-+++ xen-unstable/config/ia64.mk 2006-09-21 19:45:52.250012573 +0000
-@@ -1,5 +1,3 @@
- CONFIG_IA64 := y
+diff -urNad xen-3.0~/config/ia64.mk xen-3.0/config/ia64.mk
+--- xen-3.0~/config/ia64.mk 2007-01-01 13:30:55.000000000 +0000
++++ xen-3.0/config/ia64.mk 2007-01-01 13:39:52.798490332 +0000
+@@ -3,5 +3,3 @@
+
CONFIG_IOEMU := y
CONFIG_XCUTILS := y
-
-LIBDIR := lib
-diff -urNad xen-unstable~/config/powerpc64.mk xen-unstable/config/powerpc64.mk
---- xen-unstable~/config/powerpc64.mk 2006-09-21 19:44:53.000000000 +0000
-+++ xen-unstable/config/powerpc64.mk 2006-09-21 19:45:52.250012573 +0000
-@@ -1,4 +1,3 @@
- CONFIG_POWERPC := y
+diff -urNad xen-3.0~/config/powerpc64.mk xen-3.0/config/powerpc64.mk
+--- xen-3.0~/config/powerpc64.mk 2007-01-01 13:30:55.000000000 +0000
++++ xen-3.0/config/powerpc64.mk 2007-01-01 13:39:52.798490332 +0000
+@@ -4,4 +4,3 @@
+ CONFIG_XENCOMM := y
CFLAGS += -DELFSIZE=64
-LIBDIR := lib
-diff -urNad xen-unstable~/config/x86_32.mk xen-unstable/config/x86_32.mk
---- xen-unstable~/config/x86_32.mk 2006-09-21 19:44:53.000000000 +0000
-+++ xen-unstable/config/x86_32.mk 2006-09-21 19:45:52.250012573 +0000
-@@ -6,4 +6,3 @@
- CONFIG_MBOOTPACK := y
+diff -urNad xen-3.0~/config/x86_32.mk xen-3.0/config/x86_32.mk
+--- xen-3.0~/config/x86_32.mk 2007-01-01 13:30:55.000000000 +0000
++++ xen-3.0/config/x86_32.mk 2007-01-01 13:40:12.717397475 +0000
+@@ -8,7 +8,6 @@
+ CONFIG_IOEMU := y
CFLAGS += -m32 -march=i686
-LIBDIR := lib
-diff -urNad xen-unstable~/config/x86_64.mk xen-unstable/config/x86_64.mk
---- xen-unstable~/config/x86_64.mk 2006-09-21 19:44:53.000000000 +0000
-+++ xen-unstable/config/x86_64.mk 2006-09-21 19:45:52.250012573 +0000
-@@ -6,4 +6,3 @@
- CONFIG_MBOOTPACK := y
+
+ # Use only if calling $(LD) directly.
+ ifeq ($(XEN_OS),OpenBSD)
+diff -urNad xen-3.0~/config/x86_64.mk xen-3.0/config/x86_64.mk
+--- xen-3.0~/config/x86_64.mk 2007-01-01 13:30:55.000000000 +0000
++++ xen-3.0/config/x86_64.mk 2007-01-01 13:40:23.064829590 +0000
+@@ -8,7 +8,6 @@
+ CONFIG_IOEMU := y
CFLAGS += -m64
--LIBDIR = lib64
-diff -urNad xen-unstable~/tools/Rules.mk xen-unstable/tools/Rules.mk
---- xen-unstable~/tools/Rules.mk 2006-09-21 19:44:56.000000000 +0000
-+++ xen-unstable/tools/Rules.mk 2006-09-21 19:45:52.250012573 +0000
-@@ -12,6 +12,9 @@
+-LIBDIR = $(LIB64DIR)
+
+ # Use only if calling $(LD) directly.
+ ifeq ($(XEN_OS),OpenBSD)
+diff -urNad xen-3.0~/tools/Rules.mk xen-3.0/tools/Rules.mk
+--- xen-3.0~/tools/Rules.mk 2007-01-01 13:31:17.000000000 +0000
++++ xen-3.0/tools/Rules.mk 2007-01-01 13:39:52.798490332 +0000
+@@ -10,6 +10,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -66,19 +72,19 @@
X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
CFLAGS += -D__XEN_TOOLS__
-diff -urNad xen-unstable~/tools/blktap/drivers/Makefile
xen-unstable/tools/blktap/drivers/Makefile
---- xen-unstable~/tools/blktap/drivers/Makefile 2006-09-21 19:44:58.000000000
+0000
-+++ xen-unstable/tools/blktap/drivers/Makefile 2006-09-21 19:45:52.250012573
+0000
-@@ -7,7 +7,7 @@
- INSTALL_PROG = $(INSTALL) -m0755
+diff -urNad xen-3.0~/tools/blktap/drivers/Makefile
xen-3.0/tools/blktap/drivers/Makefile
+--- xen-3.0~/tools/blktap/drivers/Makefile 2007-01-01 13:31:17.000000000 +0000
++++ xen-3.0/tools/blktap/drivers/Makefile 2007-01-01 13:44:25.231506711 +0000
+@@ -5,7 +5,7 @@
+
IBIN = blktapctrl tapdisk
QCOW_UTIL = img2qcow qcow2raw qcow-create
--INSTALL_DIR = /usr/sbin
-+INSTALL_DIR = /usr/$(BINDIR)
+-INST_DIR = /usr/sbin
++INST_DIR = /usr/$(BINDIR)
LIBAIO_DIR = ../../libaio/src
- CFLAGS += -fPIC
-@@ -48,11 +48,11 @@
+ CFLAGS += -Werror
+@@ -42,11 +42,11 @@
blktapctrl: blktapctrl.c
@@ -92,9 +98,9 @@
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
-diff -urNad xen-unstable~/tools/console/Makefile
xen-unstable/tools/console/Makefile
---- xen-unstable~/tools/console/Makefile 2006-09-21 19:44:55.000000000 +0000
-+++ xen-unstable/tools/console/Makefile 2006-09-21 19:45:52.250012573 +0000
+diff -urNad xen-3.0~/tools/console/Makefile xen-3.0/tools/console/Makefile
+--- xen-3.0~/tools/console/Makefile 2007-01-01 13:31:18.000000000 +0000
++++ xen-3.0/tools/console/Makefile 2007-01-01 13:41:54.791790444 +0000
@@ -2,8 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -103,20 +109,20 @@
-CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+DIR = /usr/$(BINDIR)
- INSTALL = install
- INSTALL_PROG = $(INSTALL) -m0755
-@@ -25,16 +24,15 @@
+ CFLAGS += -Werror
+
+@@ -21,16 +20,15 @@
$(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) \
- -lxenctrl -lxenstore
+ $(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) \
- -lxenctrl -lxenstore
+ $(SOCKET_LIBS) -lxenctrl -lxenstore
.PHONY: install
install: $(BIN)
@@ -127,10 +133,10 @@
+ $(INSTALL_DIR) -p $(DESTDIR)/$(DIR)
+ $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DIR)
+ $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR)
-diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
---- xen-unstable~/tools/misc/Makefile 2006-09-21 19:44:57.000000000 +0000
-+++ xen-unstable/tools/misc/Makefile 2006-09-21 19:45:52.250012573 +0000
-@@ -16,7 +16,7 @@
+diff -urNad xen-3.0~/tools/misc/Makefile xen-3.0/tools/misc/Makefile
+--- xen-3.0~/tools/misc/Makefile 2007-01-01 13:31:41.000000000 +0000
++++ xen-3.0/tools/misc/Makefile 2007-01-01 13:39:52.798490332 +0000
+@@ -12,7 +12,7 @@
TARGETS = xenperf xc_shadow
INSTALL_BIN = $(TARGETS) xencons
@@ -139,7 +145,7 @@
.PHONY: all
all: build
-@@ -31,10 +31,7 @@
+@@ -24,10 +24,7 @@
.PHONY: install
install: build
@@ -151,16 +157,16 @@
$(MAKE) -C lomount install
# No sense in installing miniterm on the Xen box.
# $(MAKE) -C miniterm install
-@@ -52,4 +49,4 @@
+@@ -42,4 +39,4 @@
$(CC) -c $(CFLAGS) -o $@ $<
$(TARGETS): %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
-diff -urNad xen-unstable~/tools/misc/lomount/Makefile
xen-unstable/tools/misc/lomount/Makefile
---- xen-unstable~/tools/misc/lomount/Makefile 2006-09-21 19:44:57.000000000
+0000
-+++ xen-unstable/tools/misc/lomount/Makefile 2006-09-21 19:45:52.250012573
+0000
-@@ -21,7 +21,7 @@
+diff -urNad xen-3.0~/tools/misc/lomount/Makefile
xen-3.0/tools/misc/lomount/Makefile
+--- xen-3.0~/tools/misc/lomount/Makefile 2007-01-01 13:31:41.000000000 +0000
++++ xen-3.0/tools/misc/lomount/Makefile 2007-01-01 13:39:52.798490332 +0000
+@@ -16,7 +16,7 @@
.PHONY: install
install: build
@@ -169,53 +175,52 @@
.PHONY: clean
clean:
-diff -urNad xen-unstable~/tools/pygrub/Makefile
xen-unstable/tools/pygrub/Makefile
---- xen-unstable~/tools/pygrub/Makefile 2006-09-21 19:44:56.000000000 +0000
-+++ xen-unstable/tools/pygrub/Makefile 2006-09-21 19:46:38.536905323 +0000
+diff -urNad xen-3.0~/tools/pygrub/Makefile xen-3.0/tools/pygrub/Makefile
+--- xen-3.0~/tools/pygrub/Makefile 2007-01-01 13:31:41.000000000 +0000
++++ xen-3.0/tools/pygrub/Makefile 2007-01-01 13:42:31.185788620 +0000
@@ -11,7 +11,7 @@
.PHONY: install
ifndef XEN_PYTHON_NATIVE_INSTALL
install: all
-- CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix=""
-+ CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr/$(LIBDIR)"
--install-lib=$(DESTDIR)/usr/$(LIBDIR)/python
--install-scripts=$(DESTDIR)/usr/$(BINDIR)
- $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix=""
++ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr/$(LIBDIR)"
--install-lib=$(DESTDIR)/usr/$(LIBDIR)/python
--install-scripts=$(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
else
install: all
-diff -urNad xen-unstable~/tools/python/Makefile
xen-unstable/tools/python/Makefile
---- xen-unstable~/tools/python/Makefile 2006-09-21 19:44:56.000000000 +0000
-+++ xen-unstable/tools/python/Makefile 2006-09-21 19:45:52.250012573 +0000
+diff -urNad xen-3.0~/tools/python/Makefile xen-3.0/tools/python/Makefile
+--- xen-3.0~/tools/python/Makefile 2007-01-01 13:31:41.000000000 +0000
++++ xen-3.0/tools/python/Makefile 2007-01-01 13:43:16.239308569 +0000
@@ -6,15 +6,15 @@
.PHONY: build
build:
-- CFLAGS="$(CFLAGS)" python setup.py build
-+ CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py
build
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
++ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py build
.PHONY: install
ifndef XEN_PYTHON_NATIVE_INSTALL
install: all
-- CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix="" --force
-+ CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py
install --home="$(DESTDIR)/usr/$(LIBDIR)"
--install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix="" --force
++ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py install
--home="$(DESTDIR)/usr/$(LIBDIR)"
--install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force
else
install: all
-- CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)" --force
-+ CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py
install --root="$(DESTDIR)" --force
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)" --force
++ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py install
--root="$(DESTDIR)" --force
endif
.PHONY: test
-diff -urNad xen-unstable~/tools/python/setup.py
xen-unstable/tools/python/setup.py
---- xen-unstable~/tools/python/setup.py 2006-09-21 19:44:56.000000000 +0000
-+++ xen-unstable/tools/python/setup.py 2006-09-21 19:45:52.250012573 +0000
-@@ -5,6 +5,8 @@
+diff -urNad xen-3.0~/tools/python/setup.py xen-3.0/tools/python/setup.py
+--- xen-3.0~/tools/python/setup.py 2007-01-01 13:31:43.000000000 +0000
++++ xen-3.0/tools/python/setup.py 2007-01-01 13:43:36.862172645 +0000
+@@ -5,6 +5,7 @@
XEN_ROOT = "../.."
- extra_compile_args = [ "-fno-strict-aliasing", "-Wall",
"-Werror" ]
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
+extra_link_args = [ "-Wl,-rpath,/usr/%s" %
os.environ[''LIBDIR''] ]
-+
-
include_dirs = [ XEN_ROOT + "/tools/libxc",
-@@ -19,6 +21,7 @@
+ XEN_ROOT + "/tools/xenstore",
+@@ -18,6 +19,7 @@
xc = Extension("xc",
extra_compile_args = extra_compile_args,
@@ -223,7 +228,7 @@
include_dirs = include_dirs + [
"xen/lowlevel/xc" ],
library_dirs = library_dirs,
libraries = libraries,
-@@ -26,6 +29,7 @@
+@@ -25,6 +27,7 @@
xs = Extension("xs",
extra_compile_args = extra_compile_args,
@@ -231,7 +236,7 @@
include_dirs = include_dirs + [
"xen/lowlevel/xs" ],
library_dirs = library_dirs,
libraries = libraries,
-@@ -33,6 +37,7 @@
+@@ -32,6 +35,7 @@
acm = Extension("acm",
extra_compile_args = extra_compile_args,
@@ -239,10 +244,10 @@
include_dirs = include_dirs + [
"xen/lowlevel/acm" ],
library_dirs = library_dirs,
libraries = libraries,
-diff -urNad xen-unstable~/tools/xcutils/Makefile
xen-unstable/tools/xcutils/Makefile
---- xen-unstable~/tools/xcutils/Makefile 2006-09-21 19:44:58.000000000 +0000
-+++ xen-unstable/tools/xcutils/Makefile 2006-09-21 19:45:52.250012573 +0000
-@@ -15,7 +15,7 @@
+diff -urNad xen-3.0~/tools/xcutils/Makefile xen-3.0/tools/xcutils/Makefile
+--- xen-3.0~/tools/xcutils/Makefile 2007-01-01 13:31:49.000000000 +0000
++++ xen-3.0/tools/xcutils/Makefile 2007-01-01 13:39:52.810489674 +0000
+@@ -11,7 +11,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -251,19 +256,19 @@
INCLUDES += -I $(XEN_LIBXC)
-diff -urNad xen-unstable~/tools/xenmon/Makefile
xen-unstable/tools/xenmon/Makefile
---- xen-unstable~/tools/xenmon/Makefile 2006-09-21 19:44:56.000000000 +0000
-+++ xen-unstable/tools/xenmon/Makefile 2006-09-21 19:45:52.250012573 +0000
-@@ -15,8 +15,6 @@
- INSTALL_DIR = $(INSTALL) -d -m0755
- INSTALL_DATA = $(INSTALL) -m0644
-
--sbindir=/usr/sbin
--
+diff -urNad xen-3.0~/tools/xenmon/Makefile xen-3.0/tools/xenmon/Makefile
+--- xen-3.0~/tools/xenmon/Makefile 2007-01-01 13:31:49.000000000 +0000
++++ xen-3.0/tools/xenmon/Makefile 2007-01-01 13:44:10.036344468 +0000
+@@ -13,8 +13,6 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-@@ -36,10 +34,10 @@
+-sbindir=/usr/sbin
+-
+ CFLAGS += -Werror
+ CFLAGS += -I $(XEN_XC)
+ CFLAGS += -I $(XEN_LIBXC)
+@@ -31,10 +29,10 @@
.PHONY: install
install: build
@@ -278,10 +283,10 @@
.PHONY: clean
clean:
-diff -urNad xen-unstable~/tools/xenstat/xentop/Makefile
xen-unstable/tools/xenstat/xentop/Makefile
---- xen-unstable~/tools/xenstat/xentop/Makefile 2006-09-21 19:44:59.000000000
+0000
-+++ xen-unstable/tools/xenstat/xentop/Makefile 2006-09-21 19:45:52.250012573
+0000
-@@ -25,7 +25,6 @@
+diff -urNad xen-3.0~/tools/xenstat/xentop/Makefile
xen-3.0/tools/xenstat/xentop/Makefile
+--- xen-3.0~/tools/xenstat/xentop/Makefile 2007-01-01 13:31:49.000000000 +0000
++++ xen-3.0/tools/xenstat/xentop/Makefile 2007-01-01 13:45:00.793545148 +0000
+@@ -21,7 +21,6 @@
prefix=/usr
mandir=$(prefix)/share/man
man1dir=$(mandir)/man1
@@ -289,19 +294,19 @@
CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
-@@ -36,7 +35,7 @@
+@@ -32,7 +31,7 @@
.PHONY: install
install: xentop xentop.1
- $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
+ $(INSTALL_PROG) xentop $(DESTDIR)/usr/$(BINDIR)/xentop
+ $(INSTALL_DIR) $(DESTDIR)$(man1dir)
$(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
- endif
-diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
---- xen-unstable~/tools/xenstore/Makefile 2006-09-21 19:44:56.000000000 +0000
-+++ xen-unstable/tools/xenstore/Makefile 2006-09-21 19:45:52.250012573 +0000
-@@ -174,13 +174,12 @@
+diff -urNad xen-3.0~/tools/xenstore/Makefile xen-3.0/tools/xenstore/Makefile
+--- xen-3.0~/tools/xenstore/Makefile 2007-01-01 13:31:50.000000000 +0000
++++ xen-3.0/tools/xenstore/Makefile 2007-01-01 13:39:52.810489674 +0000
+@@ -170,13 +170,12 @@
install: all
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
@@ -320,10 +325,10 @@
$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
-diff -urNad xen-unstable~/tools/xentrace/Makefile
xen-unstable/tools/xentrace/Makefile
---- xen-unstable~/tools/xentrace/Makefile 2006-09-21 19:44:56.000000000 +0000
-+++ xen-unstable/tools/xentrace/Makefile 2006-09-21 19:45:52.250012573 +0000
-@@ -15,21 +15,20 @@
+diff -urNad xen-3.0~/tools/xentrace/Makefile xen-3.0/tools/xentrace/Makefile
+--- xen-3.0~/tools/xentrace/Makefile 2007-01-01 13:31:50.000000000 +0000
++++ xen-3.0/tools/xentrace/Makefile 2007-01-01 13:39:52.810489674 +0000
+@@ -10,21 +10,20 @@
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
BIN = xentrace xentrace_setsize
@@ -348,7 +353,7 @@
endif
.PHONY: all
-@@ -40,21 +39,16 @@
+@@ -35,21 +34,16 @@
.PHONY: install
install: build
Modified: trunk/xen-3.0/debian/patches/version.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/version.dpatch (original)
+++ trunk/xen-3.0/debian/patches/version.dpatch Thu Jan 25 14:03:03 2007
@@ -5,22 +5,21 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/xen/Makefile xen-unstable/xen/Makefile
---- xen-unstable~/xen/Makefile 2006-08-18 15:35:47.000000000 +0000
-+++ xen-unstable/xen/Makefile 2006-08-18 16:22:45.830247330 +0000
-@@ -92,17 +92,17 @@
- # compile.h contains dynamic build info. Rebuilt on every
''make'' invocation.
+diff -urNad xen-3.0~/xen/Makefile xen-3.0/xen/Makefile
+--- xen-3.0~/xen/Makefile 2007-01-01 13:31:54.000000000 +0000
++++ xen-3.0/xen/Makefile 2007-01-01 13:47:54.953567948 +0000
+@@ -93,16 +93,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'' \
-- -e ''s/@@whoami@@/$(shell whoami)/g'' \
+- -e ''s/@@whoami@@/$(USER)/g'' \
- -e ''s/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] &&
/bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname ||
echo [unknown]))/g'' \
- -e ''s/@@hostname@@/$(shell hostname)/g'' \
- -e ''s|@@compiler@@|$(shell $(CC) $(CFLAGS) -v 2>&1 | tail
-n 1 | sed -e "s;|;/;")|g'' \
+ -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep
-i "gcc.*version")!g'' \
-e ''s/@@version@@/$(XEN_VERSION)/g'' \
-e ''s/@@subversion@@/$(XEN_SUBVERSION)/g'' \
-e ''s/@@extraversion@@/$(XEN_EXTRAVERSION)/g'' \
- -e ''s!@@changeset@@!$(shell ((hg parents || head -n 7
../ChangeLog || echo date: unavailable) | awk ''{FS="changeset:[
]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END
{print D, CS}'') 2>/dev/null)!g'' \
+ -e ''s!@@changeset@@!$(shell ((hg parents --template
"{date|date} {rev}:{node|short}" >/dev/null && hg parents
--template "{date|date} {rev}:{node|short}") || echo
"unavailable") 2>/dev/null)!g'' \
+ -e ''s/@@system_distribution@@/$(shell lsb_release
-is)/g'' \
+ -e ''s/@@system_maintainer_domain@@/$(shell cd ../../../..;
dpkg-parsechangelog | sed -ne ''s,^Maintainer:
.[^<]*<[^@>]*@\([^>]*\)>,\1,p'')/g'' \
+ -e ''s/@@system_maintainer_local@@/$(shell cd ../../../..;
dpkg-parsechangelog | sed -ne ''s,^Maintainer:
.[^<]*<\([^@>]*\)@.*>,\1,p'')/g'' \
@@ -30,10 +29,10 @@
@mv -f $@.new $@
include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
-diff -urNad xen-unstable~/xen/arch/powerpc/boot_of.c
xen-unstable/xen/arch/powerpc/boot_of.c
---- xen-unstable~/xen/arch/powerpc/boot_of.c 2006-08-18 15:35:46.000000000
+0000
-+++ xen-unstable/xen/arch/powerpc/boot_of.c 2006-08-18 16:22:24.124066693 +0000
-@@ -988,9 +988,10 @@
+diff -urNad xen-3.0~/xen/arch/powerpc/boot_of.c
xen-3.0/xen/arch/powerpc/boot_of.c
+--- xen-3.0~/xen/arch/powerpc/boot_of.c 2007-01-01 13:31:57.000000000 +0000
++++ xen-3.0/xen/arch/powerpc/boot_of.c 2007-01-01 13:46:38.345805238 +0000
+@@ -1292,9 +1292,10 @@
of_getprop(bof_chosen, "stdout", &of_out, sizeof (of_out));
of_printf("%s\n",
"---------------------------------------------------");
@@ -46,9 +45,9 @@
xen_compiler(), xen_compile_date());
of_printf("%s args: 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n"
-diff -urNad xen-unstable~/xen/common/kernel.c xen-unstable/xen/common/kernel.c
---- xen-unstable~/xen/common/kernel.c 2006-08-18 15:35:47.000000000 +0000
-+++ xen-unstable/xen/common/kernel.c 2006-08-18 16:22:24.124066693 +0000
+diff -urNad xen-3.0~/xen/common/kernel.c xen-3.0/xen/common/kernel.c
+--- xen-3.0~/xen/common/kernel.c 2007-01-01 13:32:04.000000000 +0000
++++ xen-3.0/xen/common/kernel.c 2007-01-01 13:46:38.345805238 +0000
@@ -141,8 +141,8 @@
{
struct xen_compile_info info;
@@ -60,9 +59,9 @@
safe_strcpy(info.compile_date, xen_compile_date());
if ( copy_to_guest(arg, &info, 1) )
return -EFAULT;
-diff -urNad xen-unstable~/xen/common/version.c
xen-unstable/xen/common/version.c
---- xen-unstable~/xen/common/version.c 2006-08-18 15:35:47.000000000 +0000
-+++ xen-unstable/xen/common/version.c 2006-08-18 16:22:24.124066693 +0000
+diff -urNad xen-3.0~/xen/common/version.c xen-3.0/xen/common/version.c
+--- xen-3.0~/xen/common/version.c 2007-01-01 13:32:06.000000000 +0000
++++ xen-3.0/xen/common/version.c 2007-01-01 13:46:38.345805238 +0000
@@ -10,19 +10,24 @@
return XEN_COMPILE_TIME;
}
@@ -102,10 +101,10 @@
-{
- return XEN_BANNER;
-}
-diff -urNad xen-unstable~/xen/drivers/char/console.c
xen-unstable/xen/drivers/char/console.c
---- xen-unstable~/xen/drivers/char/console.c 2006-08-18 15:35:45.000000000
+0000
-+++ xen-unstable/xen/drivers/char/console.c 2006-08-18 16:22:24.124066693 +0000
-@@ -463,12 +463,10 @@
+diff -urNad xen-3.0~/xen/drivers/char/console.c
xen-3.0/xen/drivers/char/console.c
+--- xen-3.0~/xen/drivers/char/console.c 2007-01-01 13:32:06.000000000 +0000
++++ xen-3.0/xen/drivers/char/console.c 2007-01-01 13:46:38.345805238 +0000
+@@ -502,12 +502,10 @@
serial_set_rx_handler(sercon_handle, serial_rx);
/* HELLO WORLD --- start-of-day banner text. */
@@ -121,9 +120,9 @@
xen_compiler(), xen_compile_date());
printk(" Latest ChangeSet: %s\n\n", xen_changeset());
set_printk_prefix("(XEN) ");
-diff -urNad xen-unstable~/xen/include/xen/compile.h.in
xen-unstable/xen/include/xen/compile.h.in
---- xen-unstable~/xen/include/xen/compile.h.in 2006-08-18 15:35:50.000000000
+0000
-+++ xen-unstable/xen/include/xen/compile.h.in 2006-08-18 16:22:54.278450533
+0000
+diff -urNad xen-3.0~/xen/include/xen/compile.h.in
xen-3.0/xen/include/xen/compile.h.in
+--- xen-3.0~/xen/include/xen/compile.h.in 2007-01-01 13:32:12.000000000 +0000
++++ xen-3.0/xen/include/xen/compile.h.in 2007-01-01 13:46:38.345805238 +0000
@@ -1,8 +1,9 @@
#define XEN_COMPILE_DATE "@@date@@"
#define XEN_COMPILE_TIME "@@time@@"
@@ -142,9 +141,9 @@
#define XEN_CHANGESET "@@changeset@@"
-#define XEN_BANNER \
-diff -urNad xen-unstable~/xen/include/xen/version.h
xen-unstable/xen/include/xen/version.h
---- xen-unstable~/xen/include/xen/version.h 2006-08-18 15:35:49.000000000 +0000
-+++ xen-unstable/xen/include/xen/version.h 2006-08-18 16:22:24.124066693 +0000
+diff -urNad xen-3.0~/xen/include/xen/version.h
xen-3.0/xen/include/xen/version.h
+--- xen-3.0~/xen/include/xen/version.h 2007-01-01 13:32:12.000000000 +0000
++++ xen-3.0/xen/include/xen/version.h 2007-01-01 13:46:38.345805238 +0000
@@ -3,14 +3,14 @@
const char *xen_compile_date(void);
Modified: trunk/xen-3.0/debian/templates/control.source.in
=============================================================================---
trunk/xen-3.0/debian/templates/control.source.in (original)
+++ trunk/xen-3.0/debian/templates/control.source.in Thu Jan 25 14:03:03 2007
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Xen Team <pkg-xen-devel@lists.alioth.debian.org>
Uploaders: Julien Danjou <acid@debian.org>, Jeremy T. Bouse
<jbouse@debian.org>, Guido Trotter <ultrotter@debian.org>, Bastian
Blank <waldi@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3),
libsdl1.2-dev, bcc, dpatch, lsb-release, python-central (>= 0.5), zlib1g-dev,
libncurses5-dev, x11proto-core-dev
+Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3),
libsdl1.2-dev, bcc, dpatch, lsb-release, python-central (>= 0.5), zlib1g-dev,
libncurses5-dev, x11proto-core-dev, libssl-dev
Build-Depends-Indep: transfig, tetex-bin, tetex-extra, gs-common
Standards-Version: 3.7.2.0
XS-Python-Version: current