Bastian Blank
2010-Apr-28 15:23 UTC
[Pkg-xen-changes] r746 - in trunk/xen: . debian debian/patches debian/templates
Author: waldi
Date: Wed Apr 28 15:23:37 2010
New Revision: 746
Log:
* Rename package to xen
* debian/changelog: Set version to 4.0.0-1~experimental.1.
* debian/patches: Update to new version.
* debian/templates/control.source.in: Add new build-deps.
Added:
trunk/xen/
- copied from r745, trunk/xen-3/
trunk/xen/debian/patches/tools-blktap2-disable.patch
trunk/xen/debian/patches/tools-blktap2-libs.patch
trunk/xen/debian/patches/tools-blktap2-prefix.patch
Deleted:
trunk/xen/debian/patches/tools-firmware-prefix.diff
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/patches/config-prefix.diff
trunk/xen/debian/patches/series
trunk/xen/debian/patches/tools-blktap-crypto.patch
trunk/xen/debian/patches/tools-blktap-prefix.diff
trunk/xen/debian/patches/tools-blktap-rpath.diff
trunk/xen/debian/patches/tools-flask-abiname.diff
trunk/xen/debian/patches/tools-flask-prefix.diff
trunk/xen/debian/patches/tools-libxc-abiname.diff
trunk/xen/debian/patches/tools-libxc-prefix.diff
trunk/xen/debian/patches/tools-libxc-rpath.diff
trunk/xen/debian/patches/tools-misc-prefix.diff
trunk/xen/debian/patches/tools-misc-rpath.diff
trunk/xen/debian/patches/tools-misc-xend-startup.diff
trunk/xen/debian/patches/tools-python-prefix.diff
trunk/xen/debian/patches/tools-python-rpath.diff
trunk/xen/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen/debian/patches/tools-xenstore-prefix.diff
trunk/xen/debian/patches/version.patch
trunk/xen/debian/templates/control.source.in
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen-3/debian/changelog Thu Apr 8 14:15:34 2010 (r745)
+++ trunk/xen/debian/changelog Wed Apr 28 15:23:37 2010 (r746)
@@ -1,3 +1,11 @@
+xen (4.0.0-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ * Rename package to xen.
+ * Build depend against iasl and uuid-dev.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 10 Apr 2010 22:51:21 +0200
+
xen-3 (3.4.3~rc3-2) unstable; urgency=low
* Again list the complete version in the hypervisor.
Modified: trunk/xen/debian/patches/config-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/config-prefix.diff Thu Apr 8 14:15:34 2010 (r745)
+++ trunk/xen/debian/patches/config-prefix.diff Wed Apr 28 15:23:37 2010 (r746)
@@ -1,6 +1,6 @@
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
-@@ -24,21 +24,17 @@
+@@ -26,22 +26,19 @@
PREFIX ?= /usr
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
@@ -17,15 +17,18 @@
MAN1DIR = $(MANDIR)/man1
MAN8DIR = $(MANDIR)/man8
SBINDIR = $(PREFIX)/sbin
+-XENFIRMWAREDIR = $(LIBDIR_x86_32)/xen/boot
-PRIVATE_PREFIX = $(LIBDIR)/xen
+PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
++
++XENFIRMWAREDIR = $(PRIVATE_PREFIX)/boot
+LIBEXEC = $(PRIVATE_LIBDIR)
- SOCKET_LIBS - CURSES_LIBS = -lncurses
+ ifeq ($(PREFIX),/usr)
+ CONFIG_DIR = /etc
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -10,11 +10,6 @@
@@ -42,7 +45,7 @@
LDFLAGS_DIRECT += -melf_x86_64_obsd
--- a/Config.mk
+++ b/Config.mk
-@@ -32,11 +32,11 @@
+@@ -32,14 +32,14 @@
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
@@ -50,6 +53,9 @@
+EXTRA_LIB += $(EXTRA_LIBDIR)
endif
+ BISON ?= bison
+ FLEX ?= flex
+
PYTHON ?= python
-PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
+PYTHON_PREFIX_ARG ?= --home="$(PRIVATE_PREFIX)"
Modified: trunk/xen/debian/patches/series
=============================================================================---
trunk/xen-3/debian/patches/series Thu Apr 8 14:15:34 2010 (r745)
+++ trunk/xen/debian/patches/series Wed Apr 28 15:23:37 2010 (r746)
@@ -2,8 +2,8 @@
config-prefix.diff
tools-blktap-prefix.diff
+tools-blktap2-prefix.patch
tools-console-prefix.diff
-tools-firmware-prefix.diff
tools-flask-prefix.diff
tools-libfsimage-prefix.diff
tools-libxc-prefix.diff
@@ -17,6 +17,7 @@
tools-rpath.diff
tools-blktap-rpath.diff
+tools-blktap2-libs.patch
tools-console-rpath.diff
tools-libfsimage-rpath.diff
tools-libxc-rpath.diff
@@ -38,6 +39,7 @@
tools-misc-xend-startup.diff
config-ioemu-disable.diff
+tools-blktap2-disable.patch
tools-blktap-crypto.patch
Modified: trunk/xen/debian/patches/tools-blktap-crypto.patch
=============================================================================---
trunk/xen-3/debian/patches/tools-blktap-crypto.patch Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-blktap-crypto.patch Wed Apr 28 15:23:37 2010
(r746)
@@ -1,7 +1,7 @@
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
-@@ -13,13 +13,8 @@
- CFLAGS += -I $(LIBAIO_DIR)
+@@ -15,13 +15,8 @@
+ CFLAGS += -I $(MEMSHR_DIR)
CFLAGS += -D_GNU_SOURCE
-ifeq ($(shell . ./check_gcrypt $(CC)),yes)
@@ -12,8 +12,8 @@
-$(warning === libgcrypt not installed: falling back to libcrypto ===)
-endif
- LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(call
LDFLAGS_RPATH,../lib) -L../lib -lblktap
- LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
+ MEMSHRLIBS :+ ifeq ($(CONFIG_Linux), y)
--- a/tools/blktap/drivers/block-qcow.c
+++ b/tools/blktap/drivers/block-qcow.c
@@ -33,6 +33,7 @@
Modified: trunk/xen/debian/patches/tools-blktap-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-blktap-prefix.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-blktap-prefix.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -29,7 +29,7 @@
.PHONY: clean
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
-@@ -52,7 +52,7 @@
+@@ -60,7 +60,7 @@
$(CC) $(CFLAGS) -o $* $^ $(LDFLAGS) $(LDFLAGS_img)
install: all
Modified: trunk/xen/debian/patches/tools-blktap-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-blktap-rpath.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-blktap-rpath.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -10,12 +10,12 @@
SRCS += xenbus.c blkif.c xs_api.c
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
-@@ -21,7 +21,7 @@
- $(warning === libgcrypt not installed: falling back to libcrypto ===)
+@@ -29,7 +29,7 @@
+ MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
endif
--LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib
-lblktap
-+LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(call
LDFLAGS_RPATH,../lib) -L../lib -lblktap
+-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
$(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread
++LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
$(MEMSHRLIBS) $(call LDFLAGS_RPATH,../lib) -L../lib -lblktap -lrt -lm -lpthread
LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
BLK-OBJS-y := block-aio.o
Added: trunk/xen/debian/patches/tools-blktap2-disable.patch
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-blktap2-disable.patch Wed Apr 28 15:23:37
2010 (r746)
@@ -0,0 +1,10 @@
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -23,7 +23,6 @@
+ SUBDIRS-$(CONFIG_Linux) += libaio
+ SUBDIRS-$(CONFIG_Linux) += memshr
+ SUBDIRS-$(CONFIG_Linux) += blktap
+-SUBDIRS-$(CONFIG_Linux) += blktap2
+ SUBDIRS-$(CONFIG_NetBSD) += libaio
+ SUBDIRS-$(CONFIG_NetBSD) += blktap2
+ SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
Added: trunk/xen/debian/patches/tools-blktap2-libs.patch
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-blktap2-libs.patch Wed Apr 28 15:23:37 2010
(r746)
@@ -0,0 +1,37 @@
+--- a/tools/blktap2/Makefile
++++ b/tools/blktap2/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-CFLAGS += $(CFLAGS_libxenctrl)
+-LDFLAGS += $(LDFLAGS_libxenctrl)
+-
+ SUBDIRS-y :+ SUBDIRS-y += include
+ SUBDIRS-y += lvm
+--- a/tools/blktap2/vhd/Makefile
++++ b/tools/blktap2/vhd/Makefile
+@@ -12,6 +12,7 @@
+ CFLAGS += -Wno-unused
+ CFLAGS += -I../include
+ CFLAGS += -D_GNU_SOURCE
++CFLAGS += $(CFLAGS_libxenctrl)
+
+ ifeq ($(CONFIG_X86_64),y)
+ CFLAGS += -fPIC
+--- a/tools/blktap2/vhd/lib/Makefile
++++ b/tools/blktap2/vhd/lib/Makefile
+@@ -16,10 +16,12 @@
+ CFLAGS += -D_GNU_SOURCE
+ CFLAGS += -fPIC
+ CFLAGS += -g
++CFLAGS += $(CFLAGS_libxenctrl)
+
+ ifeq ($(CONFIG_Linux),y)
+ LIBS := -luuid
+ endif
++LDFLAGS += $(LDFLAGS_libxenctrl)
+
+ # Get gcc to generate the dependencies for us.
+ CFLAGS += -Wp,-MD,.$(@F).d
Added: trunk/xen/debian/patches/tools-blktap2-prefix.patch
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-blktap2-prefix.patch Wed Apr 28 15:23:37 2010
(r746)
@@ -0,0 +1,44 @@
+--- a/tools/blktap2/vhd/lib/Makefile
++++ b/tools/blktap2/vhd/lib/Makefile
+@@ -8,9 +8,7 @@
+
+ LVM-UTIL-OBJ := $(BLKTAP_ROOT)/lvm/lvm-util.o
+
+-LIBVHD-BUILD := libvhd.a
+-
+-INST-DIR = $(LIBDIR)
++LIBVHD-BUILD := libvhd.so
+
+ CFLAGS += -Werror
+ CFLAGS += -Wno-unused
+@@ -48,24 +46,19 @@
+ LIB-OBJS = $(patsubst %.c,%.o,$(LIB-SRCS))
+ LIB-OBJS += $(LVM-UTIL-OBJ)
+
+-LIBVHD = libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
++LIBVHD = libvhd.so
+
+ all: build
+
+ build: $(LIBVHD-BUILD)
+
+-libvhd.a: $(LIB-OBJS)
+- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_CFLAGS) \
+- $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(LIBS) $^
+- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so
+- $(AR) rc $@ $^
++libvhd.so: $(LIB-OBJS)
++ $(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
++ $(LDFLAGS) -o $@ $(LIBS) $^
+
+ install: all
+- $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
+- $(INSTALL_DATA) $(LIBVHD) $(DESTDIR)$(INST-DIR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
$(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
++ $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_DATA) $(LIBVHD) $(DESTDIR)$(PRIVATE_LIBDIR)
+
+ clean:
+ rm -rf *.a *.so* *.o *~ $(DEPS) $(LIBVHD)
Modified: trunk/xen/debian/patches/tools-flask-abiname.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-flask-abiname.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-flask-abiname.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -25,7 +25,7 @@
$(INSTALL_DATA) libflask.a $(DESTDIR)$(PRIVATE_LIBDIR)
- ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so.$(MAJOR)
- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so
- $(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) include/libflask.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm
.PHONY: TAGS
@@ -53,12 +48,7 @@
Modified: trunk/xen/debian/patches/tools-flask-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-flask-prefix.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-flask-prefix.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -15,6 +15,6 @@
+ $(INSTALL_DATA) libflask.a $(DESTDIR)$(PRIVATE_LIBDIR)
+ ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so.$(MAJOR)
+ ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so
- $(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) include/libflask.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm
.PHONY: TAGS
Modified: trunk/xen/debian/patches/tools-libxc-abiname.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libxc-abiname.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-libxc-abiname.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -4,13 +4,13 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
--MAJOR = 3.4
+-MAJOR = 4.0
-MINOR = 0
-
CTRL_SRCS-y : CTRL_SRCS-y += xc_core.c
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -72,12 +69,12 @@
+@@ -77,12 +74,12 @@
LIB := libxenctrl.a
ifneq ($(stubdom),y)
@@ -25,7 +25,7 @@
endif
.PHONY: all
-@@ -94,16 +91,12 @@
+@@ -99,16 +96,12 @@
install: build
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -44,7 +44,7 @@
$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
.PHONY: TAGS
-@@ -131,24 +124,14 @@
+@@ -136,24 +129,14 @@
libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
@@ -71,7 +71,7 @@
ifeq ($(CONFIG_MiniOS),y)
zlib-options else
-@@ -167,9 +150,9 @@
+@@ -172,9 +155,9 @@
xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
@@ -79,7 +79,7 @@
-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl
$(PTHREAD_LIBS)
+libxenguest.so: LDFLAGS += $(call zlib-options,l)
-+libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
++libxenguest.so: $(GUEST_PIC_OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@
$(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
-include $(DEPS)
Modified: trunk/xen/debian/patches/tools-libxc-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libxc-prefix.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-libxc-prefix.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -1,6 +1,6 @@
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
-@@ -92,18 +92,18 @@
+@@ -97,18 +97,18 @@
.PHONY: install
install: build
Modified: trunk/xen/debian/patches/tools-libxc-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libxc-rpath.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-libxc-rpath.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -1,6 +1,6 @@
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
-@@ -137,7 +137,7 @@
+@@ -142,7 +142,7 @@
ln -sf $< $@
libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
@@ -9,7 +9,7 @@
# libxenguest
-@@ -169,7 +169,7 @@
+@@ -174,7 +174,7 @@
libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
Modified: trunk/xen/debian/patches/tools-misc-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-prefix.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-misc-prefix.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -1,6 +1,6 @@
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
-@@ -18,12 +18,10 @@
+@@ -18,13 +18,12 @@
SUBDIRS-$(CONFIG_MINITERM) += miniterm
SUBDIRS := $(SUBDIRS-y)
@@ -8,16 +8,19 @@
-INSTALL_BIN-$(CONFIG_X86) += xen-detect
-INSTALL_BIN := $(INSTALL_BIN-y)
-
--INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm
+-INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm
xen-tmem-list-parse gtraceview gtracestat xenlockprof
+-INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx
-INSTALL_SBIN := $(INSTALL_SBIN-y)
-+INSTALL_TARGETS-y := xencons
++INSTALL_TARGETS-y += xencons
+INSTALL_TARGETS-$(CONFIG_X86) += xen-detect
-+INSTALL_TARGETS-y += xm xen-bugtool xen-python-path xend xenperf xsview xenpm
++
++INSTALL_TARGETS-y += xm xen-bugtool xen-python-path xend xenperf xsview xenpm
xen-tmem-list-parse gtraceview gtracestat xenlockprof
++INSTALL_TARGETS-$(CONFIG_X86) += xen-hvmctx
+INSTALL_TARGETS := $(INSTALL_TARGETS-y)
- DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)
- PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH)
-@@ -39,10 +37,8 @@
+ .PHONY: all
+ all: build
+@@ -35,10 +34,8 @@
.PHONY: install
install: build
Modified: trunk/xen/debian/patches/tools-misc-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-rpath.diff Thu Apr 8 14:15:34 2010 (r745)
+++ trunk/xen/debian/patches/tools-misc-rpath.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -1,10 +1,11 @@
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
-@@ -50,6 +50,6 @@
+@@ -47,7 +47,7 @@
$(CC) -c $(CFLAGS) -o $@ $<
- xenperf xenpm: %: %.o Makefile
+ xen-hvmctx xenperf xenpm gtracestat xenlockprof: %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl)
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) $(call
LDFLAGS_RPATH,../lib)
- -include $(DEPS)
+ gtraceview: %: %.o Makefile
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CURSES_LIBS)
Modified: trunk/xen/debian/patches/tools-misc-xend-startup.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-xend-startup.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-misc-xend-startup.diff Wed Apr 28 15:23:37
2010 (r746)
@@ -1,6 +1,6 @@
--- a/tools/misc/xend
+++ b/tools/misc/xend
-@@ -75,40 +75,6 @@
+@@ -75,48 +75,6 @@
if os.fork() == 0:
os.execvp(daemon, (daemon,) + args)
@@ -38,21 +38,31 @@
-def start_blktapctrl():
- start_daemon("blktapctrl", "")
-
+-def start_xenbackendd():
+- XENBACKENDD_DEBUG = os.getenv("XENBACKENDD_DEBUG")
+- args = ""
+- if XENBACKENDD_DEBUG:
+- args += "-d"
+- if os.uname()[0] == ''NetBSD'':
+- start_daemon("xenbackendd", args)
+-
def main():
try:
check_logging()
-@@ -120,24 +86,14 @@
+@@ -128,27 +86,14 @@
if not sys.argv[1:]:
print ''usage: %s {start|stop|reload|restart}'' %
sys.argv[0]
elif sys.argv[1] == ''start'':
- if os.uname()[0] != "SunOS":
- start_xenstored()
- start_consoled()
+- start_xenbackendd()
- start_blktapctrl()
return daemon.start()
elif sys.argv[1] == ''trace_start'':
- start_xenstored()
- start_consoled()
+- start_xenbackendd()
- start_blktapctrl()
return daemon.start(trace=1)
elif sys.argv[1] == ''stop'':
@@ -62,6 +72,7 @@
elif sys.argv[1] == ''restart'':
- start_xenstored()
- start_consoled()
+- start_xenbackendd()
- start_blktapctrl()
return daemon.stop() or daemon.start()
elif sys.argv[1] == ''status'':
Modified: trunk/xen/debian/patches/tools-python-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-prefix.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-python-prefix.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -1,50 +1,44 @@
--- a/tools/python/xen/util/auxbin.py
+++ b/tools/python/xen/util/auxbin.py
-@@ -16,19 +16,11 @@
- #===========================================================================-
-
--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'']
--
--
+@@ -19,10 +19,24 @@
import os
import os.path
import sys
-
-+_path = sys.path[0]
-
- def execute(exe, args = None):
- exepath = pathTo(exe)
-@@ -47,20 +39,12 @@
-
-
- def path():
-- return os.path.join(libpath(), LIB_BIN_SUFFIX)
-+ return _path
+-from xen.util.path import *
++import xen.util.path
++
+
++class _Path(object):
++ def __init__(self, path=[]):
++ self._path = path
++ def __call__(self, name):
++ for dir in self.path:
++ real = os.path.join(dir, name)
++ if os.path.exists(real):
++ return real
+
-+def root():
-+ return os.path.realpath(os.path.join(path(), ''..''))
++
++path_bin = _Path([xen.util.path.PRIVATE_BINDIR,
''/usr/lib/xen/bin'', ''/usr/sbin'',
''/sbin'', ''/usr/bin'',
''/bin''])
++path_boot = _Path([xen.util.path.XENFIRMWAREDIR,
''/usr/lib/xen/boot'', ''/boot''])
+ def execute(exe, args = None):
+- exepath = pathTo(exe)
++ exepath = path_bin(exe)
+ a = [ exepath ]
+ if args:
+ a.extend(args)
+@@ -32,14 +46,6 @@
+ print exepath, ": ", exn
+ sys.exit(1)
+
+-SEARCHDIRS = [ BINDIR, SBINDIR, LIBEXEC, PRIVATE_BINDIR, XENFIRMWAREDIR ]
+-def pathTo(exebin):
+- for dir in SEARCHDIRS:
+- exe = os.path.join(dir, exebin)
+- if os.path.exists(exe):
+- return exe
+- return None
+-
+ def xen_configdir():
+ return XEN_CONFIG_DIR
- def libpath():
-- machine = os.uname()[4]
-- if sys.argv[0] != ''-c'':
-- prefix = os.path.dirname(os.path.dirname(sys.argv[0]))
-- path = os.path.join(prefix, os.path.basename(LIB_64))
-- if machine in LIB_64_ARCHS and os.path.exists(path):
-- return path
-- path = os.path.join(prefix, os.path.basename(LIB_32))
-- if os.path.exists(path):
-- return path
-- 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''))
Modified: trunk/xen/debian/patches/tools-python-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-rpath.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-python-rpath.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -56,3 +56,19 @@
include_dirs = include_dirs + [ "ptsname" ],
library_dirs = library_dirs,
libraries = libraries,
+@@ -69,6 +76,7 @@
+
+ checkpoint = Extension("checkpoint",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs,
+ library_dirs = library_dirs,
+ libraries = libraries + [ "rt" ],
+@@ -77,6 +85,7 @@
+
+ netlink = Extension("netlink",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs,
+ library_dirs = library_dirs,
+ libraries = libraries,
Modified: trunk/xen/debian/patches/tools-python-xen-xm-relative-path.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Thu Apr 8
14:15:34 2010 (r745)
+++ trunk/xen/debian/patches/tools-python-xen-xm-relative-path.diff Wed Apr 28
15:23:37 2010 (r746)
@@ -1,62 +1,82 @@
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
-@@ -639,6 +639,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.
- """
-@@ -646,11 +654,11 @@
+@@ -704,37 +704,31 @@
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 os.path.dirname(vals.kernel) != "" and
os.path.exists(vals.kernel):
+- config_image.append([ ''kernel'', vals.kernel ])
+- elif vals.kernel == ''hvmloader'':
++ t = auxbin.path_boot(vals.kernel)
++ if vals.kernel == ''hvmloader'':
+ # Keep hvmloader w/o a path and let xend find it.
+ # This allows guest migration to a Dom0 having different
+ # xen install pathes.
+ config_image.append([ ''kernel'', vals.kernel ])
+- elif os.path.exists(os.path.abspath(vals.kernel)):
+- # Keep old behaviour, if path is valid.
+- config_image.append([ ''kernel'',
os.path.abspath(vals.kernel) ])
++ elif t:
++ config_image.append([ ''kernel'', t ])
+ else:
+ raise ValueError(''Cannot find kernel
"%s"'' % vals.kernel)
if vals.ramdisk:
-- config_image.append([ ''ramdisk'',
os.path.abspath(vals.ramdisk) ])
-+ config_image.append([ ''ramdisk'',
abspath(vals.ramdisk, ''boot'') ])
+- if os.path.dirname(vals.ramdisk) != "" and
os.path.exists(vals.ramdisk):
+- config_image.append([ ''ramdisk'', vals.ramdisk ])
+- elif os.path.exists(os.path.abspath(vals.ramdisk)):
+- # Keep old behaviour, if path is valid.
+- config_image.append([ ''ramdisk'',
os.path.abspath(vals.ramdisk) ])
++ t = auxbin.path_boot(vals.ramdisk)
++ if t:
++ config_image.append([ ''ramdisk'', t ])
+ else:
+ raise ValueError(''Cannot find ramdisk
"%s"'' % vals.ramdisk)
if vals.loader:
-- config_image.append([ ''loader'',
os.path.abspath(vals.loader) ])
-+ config_image.append([ ''loader'', abspath(vals.loader,
''boot'') ])
+- if os.path.dirname(vals.loader) != "" and
os.path.exists(vals.loader):
+- config_image.append([ ''loader'', vals.loader ])
+- elif vals.loader == ''hvmloader'':
++ t = auxbin.path_boot(vals.loader)
++ if vals.loader == ''hvmloader'':
+ # Keep hvmloader w/o a path and let xend find it.
+ # This allows guest migration to a Dom0 having different
+ # xen install pathes.
+ config_image.append([ ''loader'', vals.loader ])
+- elif os.path.exists(os.path.abspath(vals.loader)):
+- # Keep old behaviour, if path is valid.
+- config_image.append([ ''loader'',
os.path.abspath(vals.loader) ])
++ elif t:
++ config_image.append([ ''loader'', t ])
+ else:
+ raise ValueError(''Cannot find loader
"%s"'' % vals.loader)
if vals.cmdline_ip:
- cmdline_ip = strip(''ip='', vals.cmdline_ip)
- config_image.append([''ip'', cmdline_ip])
-@@ -925,7 +933,7 @@
- def configure_hvm(config_image, vals):
- """Create the config for HVM devices.
- """
-- args = [ ''device_model'', ''pae'',
''vcpus'', ''boot'', ''fda'',
''fdb'', ''timer_mode'',
-+ args = [ ''pae'', ''vcpus'',
''boot'', ''fda'', ''fdb'',
''timer_mode'',
- ''localtime'', ''serial'',
''stdvga'', ''isa'',
''nographic'', ''soundhw'',
- ''vnc'', ''vncdisplay'',
''vncunused'', ''vncconsole'',
''vnclisten'',
- ''sdl'', ''display'',
''xauthority'', ''rtc_timeoffset'',
''monitor'',
-@@ -937,6 +945,8 @@
+@@ -1062,7 +1056,7 @@
+ args = [ ''acpi'', ''apic'',
+ ''boot'',
+ ''cpuid'', ''cpuid_check'',
+- ''device_model'', ''display'',
++ ''display'',
+ ''fda'', ''fdb'',
+ ''gfx_passthru'',
''guest_os_type'',
+ ''hap'', ''hpet'',
+@@ -1084,6 +1078,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([''device_model'',
auxbin.path_bin(vals.device_model)])
if vals.vncpasswd is not None:
config_image.append([''vncpasswd'', vals.vncpasswd])
-@@ -980,10 +990,7 @@
+@@ -1150,10 +1146,9 @@
config_image = configure_image(vals)
if vals.bootloader:
- if vals.bootloader == "pygrub":
-- vals.bootloader = osdep.pygrub_path
--
+- vals.bootloader = auxbin.pathTo(vals.bootloader)
++ t = auxbin.path_boot(vals.bootloader)
+
- config.append([''bootloader'', vals.bootloader])
-+ config.append([''bootloader'',
abspath(vals.bootloader, ''bin'')])
++ config.append([''bootloader'', t])
if vals.bootargs:
config.append([''bootloader_args'',
vals.bootargs])
else:
Modified: trunk/xen/debian/patches/tools-xenstore-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-xenstore-prefix.diff Thu Apr 8 14:15:34 2010
(r745)
+++ trunk/xen/debian/patches/tools-xenstore-prefix.diff Wed Apr 28 15:23:37 2010
(r746)
@@ -1,17 +1,21 @@
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
-@@ -92,14 +92,14 @@
+@@ -95,18 +95,19 @@
+
+ .PHONY: install
install: all
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ ifneq ($(CONFIG_OCAML_XENSTORED),y)
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
-- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
++ $(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR)
+ endif
+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
- $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
- $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
-+ $(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) xenstore $(DESTDIR)$(SBINDIR)
set -e ; for c in $(CLIENTS) ; do \
Modified: trunk/xen/debian/patches/version.patch
=============================================================================---
trunk/xen-3/debian/patches/version.patch Thu Apr 8 14:15:34 2010 (r745)
+++ trunk/xen/debian/patches/version.patch Wed Apr 28 15:23:37 2010 (r746)
@@ -31,7 +31,7 @@
include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
-@@ -158,8 +158,8 @@
+@@ -177,8 +177,8 @@
{
struct xen_compile_info info;
safe_strcpy(info.compiler, xen_compiler());
@@ -85,7 +85,7 @@
-}
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
-@@ -578,14 +578,11 @@
+@@ -576,14 +576,11 @@
serial_set_rx_handler(sercon_handle, serial_rx);
/* HELLO WORLD --- start-of-day banner text. */
Modified: trunk/xen/debian/templates/control.source.in
=============================================================================---
trunk/xen-3/debian/templates/control.source.in Thu Apr 8 14:15:34 2010 (r745)
+++ trunk/xen/debian/templates/control.source.in Wed Apr 28 15:23:37 2010 (r746)
@@ -8,11 +8,13 @@
bcc,
gcc-multilib,
e2fslibs-dev,
+ iasl,
libgnutls-dev, pkg-config,
libjpeg-dev,
libncurses5-dev,
libsdl1.2-dev,
libvncserver-dev,
+ uuid-dev,
zlib1g-dev
Build-Depends-Indep: graphviz, gs-common, texlive-fonts-recommended,
texlive-latex-recommended
Standards-Version: 3.8.4