Julien Danjou
2007-Jun-19 20:18 UTC
[Pkg-xen-changes] r403 - in trunk/xen-3.1: . debian debian/patches
Author: acid
Date: Tue Jun 19 20:18:12 2007
New Revision: 403
Log:
* New upstream version.
* Update some dpatches, fix pygrub, thanks to Peter Siering
Actually this is not very well tested yet.
Added:
trunk/xen-3.1/
- copied from r400, /trunk/xen-3.0/
trunk/xen-3.1/debian/patches/pygrub-fix.dpatch (contents, props changed)
Removed:
trunk/xen-3.1/debian/patches/not-reinvent-udev.dpatch
Modified:
trunk/xen-3.1/debian/changelog
trunk/xen-3.1/debian/patches/00list
trunk/xen-3.1/debian/patches/libs.dpatch
trunk/xen-3.1/debian/patches/prefix-python.dpatch
trunk/xen-3.1/debian/patches/prefix-utils.dpatch
trunk/xen-3.1/debian/patches/qemu-config.dpatch
trunk/xen-3.1/debian/rules.defs
Modified: trunk/xen-3.1/debian/changelog
=============================================================================---
/trunk/xen-3.0/debian/changelog (original)
+++ trunk/xen-3.1/debian/changelog Tue Jun 19 20:18:12 2007
@@ -1,3 +1,10 @@
+xen-3.1 (3.1.0-0-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ * Update some dpatches, fix pygrub, thanks to Peter Siering
+
+ -- Julien Danjou <acid at debian.org> Tue, 19 Jun 2007 20:55:15 +0200
+
xen-3.0 (3.0.4-1-1) unstable; urgency=low
[ Bastian Blank ]
Modified: trunk/xen-3.1/debian/patches/00list
=============================================================================---
/trunk/xen-3.0/debian/patches/00list (original)
+++ trunk/xen-3.1/debian/patches/00list Tue Jun 19 20:18:12 2007
@@ -1,10 +1,10 @@
prefix-utils
prefix-ioemu
prefix-python
+pygrub-fix
version
qemu-config
libs
qemu-arch
blktap-disable
path-relative
-not-reinvent-udev
Modified: trunk/xen-3.1/debian/patches/libs.dpatch
=============================================================================---
/trunk/xen-3.0/debian/patches/libs.dpatch (original)
+++ trunk/xen-3.1/debian/patches/libs.dpatch Tue Jun 19 20:18:12 2007
@@ -18,6 +18,24 @@
CTRL_SRCS-y : CTRL_SRCS-y += xc_core.c
CTRL_SRCS-y += xc_domain.c
+@@ -30,7 +30,7 @@
+ GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c
+
+ # symlink libelf from xen/common/libelf/
+-LIBELF_SRCS := libelf-tools.c libelf-loader.c
++LIBELF_SRCS := libelf-private.h libelf-tools.c libelf-loader.c
+ LIBELF_SRCS += libelf-dominfo.c libelf-relocate.c
+
+ libelf-tools.o: libelf-tools.c libelf-private.h
+@@ -39,7 +39,7 @@
+ libelf-relocate.o: libelf-relocate.c libelf-private.h
+
+ $(LIBELF_SRCS) libelf-private.h:
+- ln -s ../../xen/common/libelf/$@ $@
++ ln -sf ../../xen/common/libelf/$@ $@
+
+ # add libelf bits to libxc
+ GUEST_SRCS-y += $(LIBELF_SRCS)
@@ -50,11 +47,9 @@
GUEST_LIB_OBJS := $(patsubst %.c,%.o,$(GUEST_SRCS-y))
GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
@@ -114,7 +132,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)
+ $(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
Modified: trunk/xen-3.1/debian/patches/prefix-python.dpatch
=============================================================================---
/trunk/xen-3.0/debian/patches/prefix-python.dpatch (original)
+++ trunk/xen-3.1/debian/patches/prefix-python.dpatch Tue Jun 19 20:18:12 2007
@@ -8,20 +8,18 @@
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''
-
--for p in [''python%s'' % sys.version[:3],
''python'']:
-- for l in [''/usr/lib64'', ''/usr/lib'']:
-- d = os.path.join(l, p)
-- if os.path.exists(os.path.join(d, AUXBIN)):
-- sys.path.append(d)
-- import xen.util.auxbin
-- libpath = xen.util.auxbin.libpath()
-- sys.path = sys.path[:-1]
-- sys.path.append(libpath)
-- break
+@@ -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
Modified: trunk/xen-3.1/debian/patches/prefix-utils.dpatch
=============================================================================---
/trunk/xen-3.0/debian/patches/prefix-utils.dpatch (original)
+++ trunk/xen-3.1/debian/patches/prefix-utils.dpatch Tue Jun 19 20:18:12 2007
@@ -6,10 +6,10 @@
## DP: No description.
@DPATCH@
-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 @@
+diff -urNad xen-3.1.0-src~/Config.mk xen-3.1.0-src/Config.mk
+--- xen-3.1.0-src~/Config.mk 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/Config.mk 2007-06-19 21:50:09.205477427 +0200
+@@ -26,6 +26,10 @@
include $(XEN_ROOT)/config/$(XEN_OS).mk
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
@@ -20,26 +20,26 @@
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
-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
+diff -urNad xen-3.1.0-src~/config/ia64.mk xen-3.1.0-src/config/ia64.mk
+--- xen-3.1.0-src~/config/ia64.mk 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/config/ia64.mk 2007-06-19 21:50:09.205477427 +0200
@@ -3,5 +3,3 @@
CONFIG_IOEMU := y
CONFIG_XCUTILS := y
-
-LIBDIR := lib
-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
+diff -urNad xen-3.1.0-src~/config/powerpc64.mk
xen-3.1.0-src/config/powerpc64.mk
+--- xen-3.1.0-src~/config/powerpc64.mk 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/config/powerpc64.mk 2007-06-19 21:50:09.205477427 +0200
@@ -4,4 +4,3 @@
CONFIG_XENCOMM := y
CFLAGS += -DELFSIZE=64
-LIBDIR := lib
-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
+diff -urNad xen-3.1.0-src~/config/x86_32.mk xen-3.1.0-src/config/x86_32.mk
+--- xen-3.1.0-src~/config/x86_32.mk 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/config/x86_32.mk 2007-06-19 21:50:09.205477427 +0200
@@ -8,7 +8,6 @@
CONFIG_IOEMU := y
@@ -48,10 +48,10 @@
# 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 @@
+diff -urNad xen-3.1.0-src~/config/x86_64.mk xen-3.1.0-src/config/x86_64.mk
+--- xen-3.1.0-src~/config/x86_64.mk 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/config/x86_64.mk 2007-06-19 21:50:09.209477785 +0200
+@@ -9,7 +9,6 @@
CONFIG_IOEMU := y
CFLAGS += -m64
@@ -59,9 +59,9 @@
# 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
+diff -urNad xen-3.1.0-src~/tools/Rules.mk xen-3.1.0-src/tools/Rules.mk
+--- xen-3.1.0-src~/tools/Rules.mk 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/Rules.mk 2007-06-19 21:50:09.209477785 +0200
@@ -10,6 +10,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -72,15 +72,15 @@
X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
CFLAGS += -D__XEN_TOOLS__
-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
+diff -urNad xen-3.1.0-src~/tools/blktap/drivers/Makefile
xen-3.1.0-src/tools/blktap/drivers/Makefile
+--- xen-3.1.0-src~/tools/blktap/drivers/Makefile 2007-05-18 16:45:21.000000000
+0200
++++ xen-3.1.0-src/tools/blktap/drivers/Makefile 2007-06-19 21:50:09.209477785
+0200
@@ -5,7 +5,7 @@
IBIN = blktapctrl tapdisk
QCOW_UTIL = img2qcow qcow2raw qcow-create
--INST_DIR = /usr/sbin
-+INST_DIR = /usr/$(BINDIR)
+-INST_DIR = /usr/sbin
++INST_DIR = /usr/$(BINDIR)
LIBAIO_DIR = ../../libaio/src
CFLAGS += -Werror
@@ -98,9 +98,9 @@
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
-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
+diff -urNad xen-3.1.0-src~/tools/console/Makefile
xen-3.1.0-src/tools/console/Makefile
+--- xen-3.1.0-src~/tools/console/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/console/Makefile 2007-06-19 21:50:09.209477785 +0200
@@ -2,8 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -126,26 +126,26 @@
.PHONY: install
install: $(BIN)
-- $(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+- $(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
- $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
-- $(INSTALL_DIR) -p $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+- $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
- $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
-+ $(INSTALL_DIR) -p $(DESTDIR)/$(DIR)
++ $(INSTALL_DIR) $(DESTDIR)/$(DIR)
+ $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DIR)
+ $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR)
-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
+diff -urNad xen-3.1.0-src~/tools/misc/Makefile
xen-3.1.0-src/tools/misc/Makefile
+--- xen-3.1.0-src~/tools/misc/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/misc/Makefile 2007-06-19 21:50:09.209477785 +0200
+@@ -14,7 +14,7 @@
+ TARGETS := $(TARGETS-y)
INSTALL_BIN = $(TARGETS) xencons
--INSTALL_SBIN = netfix xm xen-bugtool xend xenperf
-+INSTALL_BIN += netfix xm xen-bugtool xend
+-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
-@@ -24,10 +24,7 @@
+@@ -26,10 +26,7 @@
.PHONY: install
install: build
@@ -157,15 +157,15 @@
$(MAKE) -C lomount install
# No sense in installing miniterm on the Xen box.
# $(MAKE) -C miniterm install
-@@ -42,4 +39,4 @@
+@@ -44,4 +41,4 @@
$(CC) -c $(CFLAGS) -o $@ $<
- $(TARGETS): %: %.o Makefile
+ xenperf: %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
-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
+diff -urNad xen-3.1.0-src~/tools/misc/lomount/Makefile
xen-3.1.0-src/tools/misc/lomount/Makefile
+--- xen-3.1.0-src~/tools/misc/lomount/Makefile 2007-05-18 16:45:21.000000000
+0200
++++ xen-3.1.0-src/tools/misc/lomount/Makefile 2007-06-19 21:50:09.209477785
+0200
@@ -16,7 +16,7 @@
.PHONY: install
@@ -175,43 +175,46 @@
.PHONY: clean
clean:
-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
+diff -urNad xen-3.1.0-src~/tools/pygrub/Makefile
xen-3.1.0-src/tools/pygrub/Makefile
+--- xen-3.1.0-src~/tools/pygrub/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/pygrub/Makefile 2007-06-19 21:50:09.209477785 +0200
+@@ -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=""
-+ 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
+- 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
-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 @@
+diff -urNad xen-3.1.0-src~/tools/python/Makefile
xen-3.1.0-src/tools/python/Makefile
+--- xen-3.1.0-src~/tools/python/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/python/Makefile 2007-06-19 21:50:09.209477785 +0200
+@@ -16,7 +16,7 @@
- .PHONY: build
- build:
+ .PHONY: build buildpy
+ buildpy:
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
+ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py build
- .PHONY: install
+ build: buildpy refresh-pot refresh-po $(CATALOGS)
+
+@@ -57,10 +57,10 @@
ifndef XEN_PYTHON_NATIVE_INSTALL
- install: all
-- 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
+ 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: all
+ 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
- .PHONY: test
-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
+ install-dtd: all
+diff -urNad xen-3.1.0-src~/tools/python/setup.py
xen-3.1.0-src/tools/python/setup.py
+--- xen-3.1.0-src~/tools/python/setup.py 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/python/setup.py 2007-06-19 21:50:09.209477785 +0200
@@ -5,6 +5,7 @@
XEN_ROOT = "../.."
@@ -238,15 +241,31 @@
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,
-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
+@@ -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,
+diff -urNad xen-3.1.0-src~/tools/xcutils/Makefile
xen-3.1.0-src/tools/xcutils/Makefile
+--- xen-3.1.0-src~/tools/xcutils/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/xcutils/Makefile 2007-06-19 21:50:59.489985541 +0200
@@ -11,7 +11,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -254,11 +273,20 @@
-PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+PROGRAMS_INSTALL_DIR = /usr/$(BINDIR)
- INCLUDES += -I $(XEN_LIBXC)
+ INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
+
+@@ -33,7 +33,7 @@
+ build: $(PROGRAMS)
+
+ $(PROGRAMS): %: %.o
+- $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
-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
+ .PHONY: install
+ install: build
+diff -urNad xen-3.1.0-src~/tools/xenmon/Makefile
xen-3.1.0-src/tools/xenmon/Makefile
+--- xen-3.1.0-src~/tools/xenmon/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/xenmon/Makefile 2007-06-19 21:50:09.209477785 +0200
@@ -13,8 +13,6 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -283,9 +311,9 @@
.PHONY: clean
clean:
-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
+diff -urNad xen-3.1.0-src~/tools/xenstat/xentop/Makefile
xen-3.1.0-src/tools/xenstat/xentop/Makefile
+--- xen-3.1.0-src~/tools/xenstat/xentop/Makefile 2007-05-18 16:45:21.000000000
+0200
++++ xen-3.1.0-src/tools/xenstat/xentop/Makefile 2007-06-19 21:50:09.209477785
+0200
@@ -21,7 +21,6 @@
prefix=/usr
mandir=$(prefix)/share/man
@@ -294,7 +322,7 @@
CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
-@@ -32,7 +31,7 @@
+@@ -33,7 +32,7 @@
.PHONY: install
install: xentop xentop.1
@@ -303,17 +331,17 @@
$(INSTALL_DIR) $(DESTDIR)$(man1dir)
$(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
-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
+diff -urNad xen-3.1.0-src~/tools/xenstore/Makefile
xen-3.1.0-src/tools/xenstore/Makefile
+--- xen-3.1.0-src~/tools/xenstore/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/xenstore/Makefile 2007-06-19 21:50:09.209477785 +0200
@@ -170,13 +170,12 @@
install: all
- $(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
- $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
-- $(INSTALL_DIR) -p $(DESTDIR)/usr/bin
-- $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
-+ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(BINDIR)
- $(INSTALL_DIR) -p $(DESTDIR)/usr/include
+ $(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
@@ -322,12 +350,12 @@
+ $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
- $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+ $(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)
-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
+diff -urNad xen-3.1.0-src~/tools/xentrace/Makefile
xen-3.1.0-src/tools/xentrace/Makefile
+--- xen-3.1.0-src~/tools/xentrace/Makefile 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/xentrace/Makefile 2007-06-19 21:50:09.209477785 +0200
@@ -10,21 +10,20 @@
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
Added: trunk/xen-3.1/debian/patches/pygrub-fix.dpatch
=============================================================================---
(empty file)
+++ trunk/xen-3.1/debian/patches/pygrub-fix.dpatch Tue Jun 19 20:18:12 2007
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pygrub-fix by Peter Siering <ps at ctmagazin.de>
+## fixes pygrub''s path to python modules as suggested by Joey Hess in
#404533
+## changes python prefixes while building pygrub
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad xen-3.1.0-src~/tools/pygrub/Makefile
xen-3.1.0-src/tools/pygrub/Makefile
+--- xen-3.1.0-src~/tools/pygrub/Makefile 2007-06-19 21:53:37.804168521 +0200
++++ xen-3.1.0-src/tools/pygrub/Makefile 2007-06-19 21:56:07.597507884 +0200
+@@ -6,7 +6,7 @@
+ all: build
+ .PHONY: build
+ 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
+@@ -16,7 +16,7 @@
+ $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ else
+ install: all
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)"
++ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py install
--root="$(DESTDIR)"
+ $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ endif
+
+diff -urNad xen-3.1.0-src~/tools/pygrub/setup.py
xen-3.1.0-src/tools/pygrub/setup.py
+--- xen-3.1.0-src~/tools/pygrub/setup.py 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/pygrub/setup.py 2007-06-19 21:53:38.344216876 +0200
+@@ -4,11 +4,13 @@
+ import sys
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
++extra_link_args = [ "-Wl,-rpath,/usr/%s" %
os.environ[''LIBDIR''] ]
+
+ XEN_ROOT = "../.."
+
+ fsimage = Extension("fsimage",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ libraries = ["fsimage"],
+diff -urNad xen-3.1.0-src~/tools/pygrub/src/pygrub
xen-3.1.0-src/tools/pygrub/src/pygrub
+--- xen-3.1.0-src~/tools/pygrub/src/pygrub 2007-05-18 16:45:21.000000000 +0200
++++ xen-3.1.0-src/tools/pygrub/src/pygrub 2007-06-19 21:53:38.344216876 +0200
+@@ -21,7 +21,7 @@
+ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
+ import getopt
+
+-sys.path = [ ''/usr/lib/python'' ] + sys.path
++sys.path.append(''%s/../lib/python'' % sys.path[0])
+
+ import fsimage
+ import grub.GrubConf
Modified: trunk/xen-3.1/debian/patches/qemu-config.dpatch
=============================================================================---
/trunk/xen-3.0/debian/patches/qemu-config.dpatch (original)
+++ trunk/xen-3.1/debian/patches/qemu-config.dpatch Tue Jun 19 20:18:12 2007
@@ -8,10 +8,10 @@
diff -urNad xen-unstable~/tools/ioemu/vl.c xen-unstable/tools/ioemu/vl.c
--- xen-unstable~/tools/ioemu/vl.c 2006-09-21 19:44:57.000000000 +0000
+++ xen-unstable/tools/ioemu/vl.c 2006-09-28 06:53:45.238717978 +0000
-@@ -88,7 +88,7 @@
-
+@@ -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"
Modified: trunk/xen-3.1/debian/rules.defs
=============================================================================---
/trunk/xen-3.0/debian/rules.defs (original)
+++ trunk/xen-3.1/debian/rules.defs Tue Jun 19 20:18:12 2007
@@ -1,5 +1,5 @@
-KERNELVERSION := 2.6.18-3
-MAJOR := 3.0
+KERNELVERSION := 2.6.18-4
+MAJOR := 3.1
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
TEMPLATES_DIR = debian/templates