[Pkg-xen-changes] r412 - in trunk/xen-3/debian: . patches templates
Bastian Blank
waldi at alioth.debian.org
Thu Aug 2 11:32:13 UTC 2007
Author: waldi
Date: Thu Aug 2 11:32:13 2007
New Revision: 412
Log:
* debian/patches
- Convert to quilt, not perfect yet.
- Drop blktap-disable.dpatch and pygrub-fix.dpatch.
* debian/rules: Drop dpatch-edit-patch workaround.
* debian/rules.real: Use quilt
* debian/templates/control.source.in: Build-depend against quilt.
Added:
trunk/xen-3/debian/patches/config-prefix.diff
trunk/xen-3/debian/patches/series
trunk/xen-3/debian/patches/tools-ioemu-arch.diff
trunk/xen-3/debian/patches/tools-ioemu-config.diff
trunk/xen-3/debian/patches/tools-ldflags.diff
trunk/xen-3/debian/patches/tools-lib-abiname.diff
trunk/xen-3/debian/patches/tools-prefix-python.diff
trunk/xen-3/debian/patches/tools-prefix.diff
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-3/debian/patches/tools-rpath.diff
trunk/xen-3/debian/patches/version.patch
Removed:
trunk/xen-3/debian/patches/00list
trunk/xen-3/debian/patches/blktap-disable.dpatch
trunk/xen-3/debian/patches/libs.dpatch
trunk/xen-3/debian/patches/path-relative.dpatch
trunk/xen-3/debian/patches/prefix-ioemu.dpatch
trunk/xen-3/debian/patches/prefix-python.dpatch
trunk/xen-3/debian/patches/prefix-utils.dpatch
trunk/xen-3/debian/patches/pygrub-fix.dpatch
trunk/xen-3/debian/patches/qemu-arch.dpatch
trunk/xen-3/debian/patches/qemu-config.dpatch
trunk/xen-3/debian/patches/version.dpatch
Modified:
trunk/xen-3/debian/rules
trunk/xen-3/debian/rules.real
trunk/xen-3/debian/templates/control.source.in
Added: trunk/xen-3/debian/patches/config-prefix.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/config-prefix.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,48 @@
+--- xen-3.orig/Config.mk
++++ xen-3/Config.mk
+@@ -26,6 +26,10 @@
+ include $(XEN_ROOT)/config/$(XEN_OS).mk
+ include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
+
++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-3.orig/config/ia64.mk
++++ xen-3/config/ia64.mk
+@@ -3,5 +3,3 @@
+
+ CONFIG_IOEMU := y
+ CONFIG_XCUTILS := y
+-
+-LIBDIR := lib
+--- xen-3.orig/config/powerpc64.mk
++++ xen-3/config/powerpc64.mk
+@@ -4,4 +4,3 @@
+ CONFIG_XENCOMM := y
+
+ CFLAGS += -DELFSIZE=64
+-LIBDIR := lib
+--- xen-3.orig/config/x86_32.mk
++++ xen-3/config/x86_32.mk
+@@ -8,7 +8,6 @@
+ CONFIG_IOEMU := y
+
+ CFLAGS += -m32 -march=i686
+-LIBDIR := lib
+
+ # Use only if calling $(LD) directly.
+ ifeq ($(XEN_OS),OpenBSD)
+--- xen-3.orig/config/x86_64.mk
++++ xen-3/config/x86_64.mk
+@@ -9,7 +9,6 @@
+ CONFIG_IOEMU := y
+
+ CFLAGS += -m64
+-LIBDIR = $(LIB64DIR)
+
+ # Use only if calling $(LD) directly.
+ ifeq ($(XEN_OS),OpenBSD)
Added: trunk/xen-3/debian/patches/series
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/series Thu Aug 2 11:32:13 2007
@@ -0,0 +1,10 @@
+config-prefix.diff
+tools-rpath.diff
+tools-prefix.diff
+tools-prefix-python.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
Added: trunk/xen-3/debian/patches/tools-ioemu-arch.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-ioemu-arch.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,55 @@
+--- xen-3.orig/tools/ioemu/configure
++++ xen-3/tools/ioemu/configure
+@@ -27,46 +27,18 @@
+ make="make"
+ install="install"
+ strip="strip"
+-cpu=`uname -m`
+ target_list=""
+-case "$cpu" in
+- i386|i486|i586|i686|i86pc|BePC)
++case "$XEN_TARGET_ARCH" in
++ x86_32)
+ cpu="i386"
+ ;;
+- armv*b)
+- cpu="armv4b"
+- ;;
+- armv*l)
+- cpu="armv4l"
+- ;;
+- alpha)
+- cpu="alpha"
+- ;;
+- "Power Macintosh"|ppc|ppc64)
+- cpu="powerpc"
+- ;;
+- mips)
+- cpu="mips"
+- ;;
+- s390)
+- cpu="s390"
+- ;;
+- sparc|sun4[muv])
+- cpu="sparc"
+- ;;
+- sparc64)
+- cpu="sparc64"
+- ;;
+- ia64)
+- cpu="ia64"
+- ;;
+- m68k)
+- cpu="m68k"
+- ;;
+- x86_64|amd64)
++ x86_64)
+ cpu="x86_64"
+ libdir="lib64"
+ ;;
++ powerpc)
++ cpu="powerpc"
++ ;;
+ *)
+ cpu="unknown"
+ ;;
Added: trunk/xen-3/debian/patches/tools-ioemu-config.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-ioemu-config.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,11 @@
+--- xen-3.orig/tools/ioemu/vl.c
++++ xen-3/tools/ioemu/vl.c
+@@ -89,7 +89,7 @@
+ #include "exec-all.h"
+
+ #include <xen/hvm/params.h>
+-#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
Added: trunk/xen-3/debian/patches/tools-ldflags.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-ldflags.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,51 @@
+--- xen-3.orig/tools/blktap/drivers/Makefile
++++ xen-3/tools/blktap/drivers/Makefile
+@@ -42,11 +42,11 @@
+
+
+ blktapctrl: blktapctrl.c
+- $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
++ $(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c
+
+ tapdisk: $(BLK-OBJS) tapdisk.c
+ $(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS) tapdisk.c \
+- $(AIOLIBS) $(LIBS)
++ $(AIOLIBS) $(LDFLAGS) $(LIBS)
+
+ .PHONY: qcow-util
+ qcow-util: img2qcow qcow2raw qcow-create
+--- xen-3.orig/tools/console/Makefile
++++ xen-3/tools/console/Makefile
+@@ -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
+
+ 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
+
+ .PHONY: install
+--- xen-3.orig/tools/misc/Makefile
++++ xen-3/tools/misc/Makefile
+@@ -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
+@@ -33,7 +33,7 @@
+ build: $(PROGRAMS)
+
+ $(PROGRAMS): %: %.o
+- $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
+ .PHONY: install
+ install: build
Added: trunk/xen-3/debian/patches/tools-lib-abiname.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-lib-abiname.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,114 @@
+--- xen-3.orig/tools/libxc/Makefile
++++ xen-3/tools/libxc/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 3.0
+-MINOR = 0
+-
+ CTRL_SRCS-y :=
+ CTRL_SRCS-y += xc_core.c
+ CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
+@@ -79,10 +76,10 @@
+ GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
+
+ LIB := libxenctrl.a
+-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
++LIB += libxenctrl.so
+
+ LIB += libxenguest.a
+-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
++LIB += libxenguest.so
+
+ .PHONY: all
+ all: build
+@@ -104,16 +101,10 @@
+ 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
+
+ .PHONY: TAGS
+@@ -141,26 +132,16 @@
+ libxenctrl.a: $(CTRL_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenctrl.so: libxenctrl.so.$(MAJOR)
+- ln -sf $< $@
+-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
++libxenctrl.so: $(CTRL_PIC_OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
+
+ # libxenguest
+
+ libxenguest.a: $(GUEST_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenguest.so: libxenguest.so.$(MAJOR)
+- ln -sf $< $@
+-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
+- 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
++libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl -lpthread
+
+ -include $(DEPS)
+
+--- xen-3.orig/tools/xenstore/Makefile
++++ xen-3/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.
+@@ -85,13 +82,8 @@
+ talloc_test.o: talloc.c
+ $(COMPILE.c) -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 $^
+@@ -177,9 +169,7 @@
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) xenstore-ls $(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
Added: trunk/xen-3/debian/patches/tools-prefix-python.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-prefix-python.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,102 @@
+--- xen-3.orig/tools/misc/xend
++++ xen-3/tools/misc/xend
+@@ -31,13 +31,8 @@
+ import time
+ import commands
+
+-result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]),
+- 'xen-python-path'))
+-if result[0] != 0:
+- print >>sys.stderr, result[1]
+- sys.exit(1)
+-
+-sys.path.append(result[1])
++AUXBIN = 'xen/util/auxbin.py'
++sys.path.append('%s/../lib/python' % sys.path[0])
+
+ from xen.xend.server import SrvDaemon
+
+@@ -77,18 +72,18 @@
+
+ def start_xenstored():
+ XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
+- cmd = "xenstored --pid-file /var/run/xenstore.pid"
++ cmd = sys.path[0] + "/xenstored --pid-file /var/run/xenstore.pid"
+ if XENSTORED_TRACE:
+ cmd += " -T /var/log/xen/xenstored-trace.log"
+ s,o = commands.getstatusoutput(cmd)
+
+ def start_consoled():
+ if os.fork() == 0:
+- os.execvp('xenconsoled', ['xenconsoled'])
++ os.execvp(sys.path[0] + '/xenconsoled', ['xenconsoled'])
+
+ def start_blktapctrl():
+ if os.fork() == 0:
+- os.execvp('blktapctrl', ['blktapctrl'])
++ os.execvp(sys.path[0] + '/blktapctrl', ['blktapctrl'])
+
+ def main():
+ try:
+--- xen-3.orig/tools/misc/xm
++++ xen-3/tools/misc/xm
+@@ -1,10 +1,7 @@
+ #!/usr/bin/env python
+ # -*- mode: python; -*-
+ import sys
+-
+-# add fallback path for non-native python path installs if needed
+-sys.path.append('/usr/lib/python')
+-sys.path.append('/usr/lib64/python')
++sys.path.append('%s/../lib/python' % sys.path[0])
+ from xen.xm import main
+
+ main.main(sys.argv)
+--- xen-3.orig/tools/python/xen/util/auxbin.py
++++ xen-3/tools/python/xen/util/auxbin.py
+@@ -16,17 +16,9 @@
+ #============================================================================
+
+
+-LIB_32 = "/usr/lib"
+-LIB_64 = "/usr/lib64"
+-LIB_BIN_SUFFIX = "xen/bin"
+-
+-## The architectures on which the LIB_64 directory is used. This
+-# deliberately excludes ia64 and ppc64, and Solaris.
+-LIB_64_ARCHS = [ 'x86_64', 's390x', 'sparc64']
+-
+-
+ import os
+ import os.path
++import sys
+
+
+ def execute(exe, args = None):
+@@ -42,12 +34,12 @@
+
+
+ def path():
+- return os.path.join(libpath(), LIB_BIN_SUFFIX)
++ return sys.path[0]
++
++
++def root():
++ return os.path.realpath(os.path.join(path(), '..'))
+
+
+ def libpath():
+- machine = os.uname()[4]
+- if machine in LIB_64_ARCHS and os.path.exists(LIB_64):
+- return LIB_64
+- else:
+- return LIB_32
++ return os.path.realpath(os.path.join(path(), '../lib'))
+--- xen-3.orig/tools/python/xen/xm/console.py
++++ xen-3/tools/python/xen/xm/console.py
+@@ -21,4 +21,4 @@
+ import xen.util.auxbin
+
+ def execConsole(domid):
+- xen.util.auxbin.execute(XENCONSOLE, [str(domid)])
++ xen.util.auxbin.execute(xen.util.auxbin.pathTo(XENCONSOLE), [str(domid)])
Added: trunk/xen-3/debian/patches/tools-prefix.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-prefix.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,238 @@
+--- xen-3.orig/tools/blktap/drivers/Makefile
++++ xen-3/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
+--- xen-3.orig/tools/console/Makefile
++++ xen-3/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,6 @@
+
+ .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) xenconsoled $(DESTDIR)/$(DIR)
++ $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR)
+--- xen-3.orig/tools/misc/Makefile
++++ xen-3/tools/misc/Makefile
+@@ -14,7 +14,7 @@
+ TARGETS := $(TARGETS-y)
+
+ INSTALL_BIN = $(TARGETS) xencons
+-INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf
++INSTALL_BIN = netfix xm xen-bugtool xen-python-path xend xenperf
+
+ .PHONY: all
+ all: build
+@@ -26,10 +26,7 @@
+
+ .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_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/$(BINDIR)
+ $(MAKE) -C lomount install
+ # No sense in installing miniterm on the Xen box.
+ # $(MAKE) -C miniterm install
+--- xen-3.orig/tools/misc/lomount/Makefile
++++ xen-3/tools/misc/lomount/Makefile
+@@ -16,7 +16,7 @@
+
+ .PHONY: install
+ install: build
+- $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
++ $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/$(BINDIR)
+
+ .PHONY: clean
+ clean:
+--- xen-3.orig/tools/pygrub/Makefile
++++ xen-3/tools/pygrub/Makefile
+@@ -12,7 +12,7 @@
+ ifndef XEN_PYTHON_NATIVE_INSTALL
+ install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
+ install: all
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --install-lib="$(DESTDIR)$(LIBPATH)/python"
++ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --prefix="" --install-lib="$(DESTDIR)/usr/$(LIBDIR)/python" --install-scripts=$(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ else
+ install: all
+--- xen-3.orig/tools/python/Makefile
++++ xen-3/tools/python/Makefile
+@@ -16,7 +16,7 @@
+
+ .PHONY: build buildpy
+ buildpy:
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
++ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py build
+
+ build: buildpy refresh-pot refresh-po $(CATALOGS)
+
+@@ -57,10 +57,10 @@
+ ifndef XEN_PYTHON_NATIVE_INSTALL
+ install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()")
+ install: install-messages install-dtd
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python"
++ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force
+ else
+ install: install-messages install-dtd
+- 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
+
+ install-dtd: all
+--- xen-3.orig/tools/xcutils/Makefile
++++ xen-3/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-3.orig/tools/xenmon/Makefile
++++ xen-3/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,10 @@
+
+ .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 $(DESTDIR)/usr/$(BINDIR)/xenbaked
++ $(INSTALL_PROG) xentrace_setmask $(DESTDIR)/usr/$(BINDIR)/xentrace_setmask
++ $(INSTALL_PROG) xenmon.py $(DESTDIR)/usr/$(BINDIR)/xenmon.py
+
+ .PHONY: clean
+ clean:
+--- xen-3.orig/tools/xenstat/xentop/Makefile
++++ xen-3/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) xentop $(DESTDIR)/usr/$(BINDIR)/xentop
+ $(INSTALL_DIR) $(DESTDIR)$(man1dir)
+ $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
+
+--- xen-3.orig/tools/xenstore/Makefile
++++ xen-3/tools/xenstore/Makefile
+@@ -170,13 +170,12 @@
+ 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) xenstored $(DESTDIR)/usr/$(BINDIR)
++ $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
++ $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
++ $(INSTALL_PROG) xenstore-ls $(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-3.orig/tools/xentrace/Makefile
++++ xen-3/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-3.orig/tools/ioemu/Makefile.target
++++ xen-3/tools/ioemu/Makefile.target
+@@ -192,6 +192,7 @@
+ ifdef CONFIG_SOLARIS
+ LIBS+=-lsocket -lnsl -lresolv
+ endif
++LIBS+=$(RPATH_ARG)
+
+ # profiling code
+ ifdef TARGET_GPROF
+--- xen-3.orig/tools/ioemu/configure
++++ xen-3/tools/ioemu/configure
+@@ -514,9 +514,9 @@
+ prefix="/usr/local"
+ fi
+ mandir="$prefix/share/man"
+-datadir="$prefix/share/xen/qemu"
++datadir="$prefix/share/xen-$XEN_VERSION/qemu"
+ docdir="$prefix/share/doc/qemu"
+-bindir="$prefix/$libdir/xen/bin"
++bindir="$prefix/lib/xen-$XEN_VERSION/bin"
+ configdir="/etc/xen"
+ fi
+
+--- xen-3.orig/tools/firmware/Makefile
++++ xen-3/tools/firmware/Makefile
+@@ -4,7 +4,7 @@
+ # hvmloader is a 32-bit protected mode binary.
+ # It belongs in /usr/lib, not /usr/lib64.
+ TARGET := hvmloader/hvmloader
+-INST_DIR := $(DESTDIR)/usr/lib/xen/boot
++INST_DIR := $(DESTDIR)/usr/$(LIBDIR)/boot
+
+ SUBDIRS :=
+ SUBDIRS += rombios rombios/32bit
Added: trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,47 @@
+--- xen-3.orig/tools/python/xen/xm/create.py
++++ xen-3/tools/python/xen/xm/create.py
+@@ -530,6 +530,14 @@
+ else:
+ return s
+
++def abspath(file, dir):
++ if file[0] == '/':
++ return file
++
++ import xen.util.auxbin
++ path = xen.util.auxbin.root()
++ return os.path.join(path, dir, file)
++
+ def configure_image(vals):
+ """Create the image config.
+ """
+@@ -537,9 +545,9 @@
+ return None
+ config_image = [ vals.builder ]
+ if vals.kernel:
+- config_image.append([ 'kernel', os.path.abspath(vals.kernel) ])
++ 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') ])
+ if vals.cmdline_ip:
+ cmdline_ip = strip('ip=', vals.cmdline_ip)
+ config_image.append(['ip', cmdline_ip])
+@@ -722,7 +730,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',
+ 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
+ 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten',
+ 'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor',
+@@ -730,6 +738,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:
++ config_image.append([ 'device_model', abspath(vals.device_model, 'bin') ])
+ config_image.append(['vncpasswd', vals.vncpasswd])
+
+
Added: trunk/xen-3/debian/patches/tools-rpath.diff
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/tools-rpath.diff Thu Aug 2 11:32:13 2007
@@ -0,0 +1,62 @@
+--- xen-3.orig/tools/Rules.mk
++++ xen-3/tools/Rules.mk
+@@ -10,6 +10,9 @@
+ XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
+ XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+
++RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)
++LDFLAGS += $(RPATH_ARG)
++
+ X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
+
+ CFLAGS += -D__XEN_TOOLS__
+--- xen-3.orig/tools/python/setup.py
++++ xen-3/tools/python/setup.py
+@@ -5,6 +5,7 @@
+ XEN_ROOT = "../.."
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
++extra_link_args = [ "-Wl,-rpath,/usr/%s" % os.environ['LIBDIR'] ]
+
+ include_dirs = [ XEN_ROOT + "/tools/libxc",
+ XEN_ROOT + "/tools/xenstore",
+@@ -18,6 +19,7 @@
+
+ xc = Extension("xc",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [ "xen/lowlevel/xc" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -25,6 +27,7 @@
+
+ xs = Extension("xs",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [ "xen/lowlevel/xs" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -32,6 +35,7 @@
+
+ scf = Extension("scf",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [ "xen/lowlevel/scf" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -39,6 +43,7 @@
+
+ acm = Extension("acm",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [ "xen/lowlevel/acm" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -46,6 +51,7 @@
+
+ ptsname = Extension("ptsname",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [ "ptsname" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
Added: trunk/xen-3/debian/patches/version.patch
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/patches/version.patch Thu Aug 2 11:32:13 2007
@@ -0,0 +1,158 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## version.dpatch by Bastian Blank <waldi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- xen-3.orig/xen/Makefile
++++ xen-3/xen/Makefile
+@@ -105,16 +105,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@@/$(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 | 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 --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' \
++ -e 's/@@system_version@@/$(shell cd ../../../..; dpkg-parsechangelog | awk '/^Version:/ {print $$2}')/g' \
+ < include/xen/compile.h.in > $@.new
+- tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) >> $@.new
+ @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 @@
+ of_getprop(bof_chosen, "stdout", &of_out, sizeof (of_out));
+
+ of_printf("%s\n", "---------------------------------------------------");
+- of_printf("OF: Xen/PPC version %d.%d%s (%s@%s) (%s) %s\n",
++ of_printf("OF: Xen/PPC 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());
+
+ 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 @@
+ {
+ struct xen_compile_info info;
+ safe_strcpy(info.compiler, xen_compiler());
+- safe_strcpy(info.compile_by, xen_compile_by());
+- safe_strcpy(info.compile_domain, xen_compile_domain());
++ safe_strcpy(info.compile_by, xen_compile_system_maintainer_local());
++ safe_strcpy(info.compile_domain, xen_compile_system_maintainer_domain());
+ 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
+@@ -10,19 +10,24 @@
+ return XEN_COMPILE_TIME;
+ }
+
+-const char *xen_compile_by(void)
++const char *xen_compile_system_distribution(void)
+ {
+- return XEN_COMPILE_BY;
++ return XEN_COMPILE_SYSTEM_DISTRIBUTION;
+ }
+
+-const char *xen_compile_domain(void)
++const char *xen_compile_system_maintainer_local(void)
+ {
+- return XEN_COMPILE_DOMAIN;
++ return XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL;
+ }
+
+-const char *xen_compile_host(void)
++const char *xen_compile_system_maintainer_domain(void)
+ {
+- return XEN_COMPILE_HOST;
++ return XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN;
++}
++
++const char *xen_compile_system_version(void)
++{
++ return XEN_COMPILE_SYSTEM_VERSION;
+ }
+
+ const char *xen_compiler(void)
+@@ -50,7 +55,3 @@
+ return XEN_CHANGESET;
+ }
+
+-const char *xen_banner(void)
+-{
+- return XEN_BANNER;
+-}
+--- xen-3.orig/xen/drivers/char/console.c
++++ xen-3/xen/drivers/char/console.c
+@@ -522,12 +522,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",
+ 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
+@@ -1,8 +1,9 @@
+ #define XEN_COMPILE_DATE "@@date@@"
+ #define XEN_COMPILE_TIME "@@time@@"
+-#define XEN_COMPILE_BY "@@whoami@@"
+-#define XEN_COMPILE_DOMAIN "@@domain@@"
+-#define XEN_COMPILE_HOST "@@hostname@@"
++#define XEN_COMPILE_SYSTEM_DISTRIBUTION "@@system_distribution@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN "@@system_maintainer_domain@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL "@@system_maintainer_local@@"
++#define XEN_COMPILE_SYSTEM_VERSION "@@system_version@@"
+ #define XEN_COMPILER "@@compiler@@"
+
+ #define XEN_VERSION @@version@@
+@@ -10,4 +11,3 @@
+ #define XEN_EXTRAVERSION "@@extraversion@@"
+
+ #define XEN_CHANGESET "@@changeset@@"
+-#define XEN_BANNER \
+--- xen-3.orig/xen/include/xen/version.h
++++ xen-3/xen/include/xen/version.h
+@@ -3,14 +3,14 @@
+
+ const char *xen_compile_date(void);
+ const char *xen_compile_time(void);
+-const char *xen_compile_by(void);
+-const char *xen_compile_domain(void);
+-const char *xen_compile_host(void);
++const char *xen_compile_system_distribution(void);
++const char *xen_compile_system_maintainer_domain(void);
++const char *xen_compile_system_maintainer_local(void);
++const char *xen_compile_system_version(void);
+ const char *xen_compiler(void);
+ unsigned int xen_major_version(void);
+ unsigned int xen_minor_version(void);
+ const char *xen_extra_version(void);
+ const char *xen_changeset(void);
+-const char *xen_banner(void);
+
+ #endif /* __XEN_VERSION_H__ */
Modified: trunk/xen-3/debian/rules
==============================================================================
--- trunk/xen-3/debian/rules (original)
+++ trunk/xen-3/debian/rules Thu Aug 2 11:32:13 2007
@@ -49,9 +49,6 @@
orig: $(DIR_ORIG)
rsync --delete --exclude debian --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
-# This is to make dpatch-edit-patch work
-unpatch: clean
-
CONTROL_FILES += debian/changelog $(wildcard debian/templates/control.*)
CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines)
GENCONTROL = $(__MODULES_DIR)gencontrol.py
Modified: trunk/xen-3/debian/rules.real
==============================================================================
--- trunk/xen-3/debian/rules.real (original)
+++ trunk/xen-3/debian/rules.real Thu Aug 2 11:32:13 2007
@@ -25,7 +25,7 @@
@rm -rf $(DIR)
mkdir $(DIR)
cp -a $(srcfiles) $(DIR)
- dpatch -d $(DIR) apply-all
+ cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
touch $@
$(STAMPS_DIR)/setup-docs: SOURCE_DIR=$(BUILD_DIR)/source
Modified: trunk/xen-3/debian/templates/control.source.in
==============================================================================
--- trunk/xen-3/debian/templates/control.source.in (original)
+++ trunk/xen-3/debian/templates/control.source.in Thu Aug 2 11:32:13 2007
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
Uploaders: Julien Danjou <acid at debian.org>, Jeremy T. Bouse <jbouse at debian.org>, Guido Trotter <ultrotter at debian.org>, Bastian Blank <waldi at 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, libssl-dev, libcrypto++-dev
+Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3), libsdl1.2-dev, bcc, lsb-release, python-central (>= 0.5), zlib1g-dev, libncurses5-dev, x11proto-core-dev, libssl-dev, libcrypto++-dev, quilt
Build-Depends-Indep: transfig, tetex-bin, tetex-extra, gs-common, graphviz
Standards-Version: 3.7.2.0
XS-Python-Version: current
More information about the Pkg-xen-changes
mailing list