Bastian Blank
2008-Jan-18 17:44 UTC
[Pkg-xen-changes] r492 - in trunk/xen-3/debian: . patches
Author: waldi
Date: Fri Jan 18 17:44:10 2008
New Revision: 492
Log:
* debian/changelog: Update.
* debian/patches: Refresh.
* debian/patches/series: Update.
* debian/patches/tools-xenfb-prefix.diff: Remove.
Removed:
trunk/xen-3/debian/patches/tools-xenfb-prefix.diff
Modified:
trunk/xen-3/debian/changelog
trunk/xen-3/debian/patches/config-prefix.diff
trunk/xen-3/debian/patches/series
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-misc-prefix.diff
trunk/xen-3/debian/patches/tools-prefix.diff
trunk/xen-3/debian/patches/tools-python-prefix.diff
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-3/debian/patches/version.patch
Modified: trunk/xen-3/debian/changelog
=============================================================================---
trunk/xen-3/debian/changelog (original)
+++ trunk/xen-3/debian/changelog Fri Jan 18 17:44:10 2008
@@ -1,9 +1,8 @@
-xen-3 (3.1.2-3) unstable; urgency=low
+xen-3 (3.2.0-1) UNRELEASED; urgency=low
- * Ship headers to allow building libvirt (closes: #402249)
- Thanks to Guido Guenther.
+ * New upstream version.
- -- Guido Trotter <ultrotter at debian.org> Mon, 17 Dec 2007 16:19:54
+0000
+ -- Bastian Blank <waldi at debian.org> Fri, 18 Jan 2008 17:29:04 +0000
xen-3 (3.1.2-2) unstable; urgency=low
Modified: trunk/xen-3/debian/patches/config-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/config-prefix.diff (original)
+++ trunk/xen-3/debian/patches/config-prefix.diff Fri Jan 18 17:44:10 2008
@@ -1,6 +1,6 @@
--- xen-3.orig/Config.mk
+++ xen-3/Config.mk
-@@ -26,6 +26,10 @@
+@@ -31,6 +31,10 @@
include $(XEN_ROOT)/config/$(XEN_OS).mk
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
@@ -13,10 +13,10 @@
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
--- xen-3.orig/config/ia64.mk
+++ xen-3/config/ia64.mk
-@@ -3,5 +3,3 @@
-
+@@ -4,5 +4,3 @@
CONFIG_IOEMU := y
CONFIG_XCUTILS := y
+ CONFIG_XENCOMM := y
-
-LIBDIR := lib
--- xen-3.orig/config/powerpc64.mk
@@ -35,7 +35,7 @@
-LIBDIR := lib
# Use only if calling $(LD) directly.
- ifeq ($(XEN_OS),OpenBSD)
+ LDFLAGS_DIRECT_OpenBSD = _obsd
--- xen-3.orig/config/x86_64.mk
+++ xen-3/config/x86_64.mk
@@ -9,7 +9,6 @@
Modified: trunk/xen-3/debian/patches/series
=============================================================================---
trunk/xen-3/debian/patches/series (original)
+++ trunk/xen-3/debian/patches/series Fri Jan 18 17:44:10 2008
@@ -12,6 +12,5 @@
tools-pygrub-prefix.diff
tools-libfsimage-prefix.diff
disable-features.diff
-tools-xenfb-prefix.diff
tools-misc-xend-race.diff
doc-remove-unused.diff
Modified: trunk/xen-3/debian/patches/tools-ioemu-config.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-ioemu-config.diff (original)
+++ trunk/xen-3/debian/patches/tools-ioemu-config.diff Fri Jan 18 17:44:10 2008
@@ -1,11 +1,11 @@
--- xen-3.orig/tools/ioemu/vl.c
+++ xen-3/tools/ioemu/vl.c
-@@ -89,7 +89,7 @@
+@@ -99,7 +99,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
+ #ifdef _BSD
+ #define DEFAULT_BRIDGE "bridge0"
+ #else
Modified: trunk/xen-3/debian/patches/tools-ldflags.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-ldflags.diff (original)
+++ trunk/xen-3/debian/patches/tools-ldflags.diff Fri Jan 18 17:44:10 2008
@@ -1,7 +1,7 @@
--- xen-3.orig/tools/blktap/drivers/Makefile
+++ xen-3/tools/blktap/drivers/Makefile
-@@ -42,11 +42,11 @@
-
+@@ -39,11 +39,11 @@
+ all: $(IBIN) qcow-util
blktapctrl: blktapctrl.c
- $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
@@ -22,12 +22,12 @@
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
- $(SOCKET_LIBS) -lxenctrl -lxenstore
+ $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
- $(SOCKET_LIBS) -lxenctrl -lxenstore
+ $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
.PHONY: install
--- xen-3.orig/tools/misc/Makefile
Modified: trunk/xen-3/debian/patches/tools-lib-abiname.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-lib-abiname.diff (original)
+++ trunk/xen-3/debian/patches/tools-lib-abiname.diff Fri Jan 18 17:44:10 2008
@@ -4,13 +4,13 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
--MAJOR = 3.0
+-MAJOR = 3.2
-MINOR = 0
-
CTRL_SRCS-y : CTRL_SRCS-y += xc_core.c
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -78,10 +75,10 @@
+@@ -80,10 +77,10 @@
GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
LIB := libxenctrl.a
@@ -23,7 +23,7 @@
.PHONY: all
all: build
-@@ -103,16 +100,10 @@
+@@ -105,16 +102,10 @@
install: build
[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
@@ -42,7 +42,7 @@
$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
.PHONY: TAGS
-@@ -140,26 +131,16 @@
+@@ -143,26 +134,16 @@
libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
@@ -85,7 +85,7 @@
PROFILE=#-pg
BASECFLAGS=-Werror
# Make gcc generate dependencies.
-@@ -49,13 +46,8 @@
+@@ -50,13 +47,8 @@
xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
@@ -101,7 +101,7 @@
libxenstore.a: xs.o xs_lib.o
$(AR) rcs libxenstore.a $^
-@@ -84,9 +76,7 @@
+@@ -85,9 +77,7 @@
$(INSTALL_DIR) $(DESTDIR)/usr/include
$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS)
$(DESTDIR)/usr/$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
@@ -190,7 +190,7 @@
$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
@@ -34,13 +29,8 @@
clean distclean:
- rm -f $(PIC_OBJS) $(LIB)
+ rm -f $(PIC_OBJS) $(LIB) $(DEPS)
-libfsimage.so: libfsimage.so.$(MAJOR)
- ln -sf $< $@
Modified: trunk/xen-3/debian/patches/tools-misc-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-prefix.diff (original)
+++ trunk/xen-3/debian/patches/tools-misc-prefix.diff Fri Jan 18 17:44:10 2008
@@ -1,16 +1,16 @@
--- xen-3.orig/tools/misc/xend
+++ xen-3/tools/misc/xend
-@@ -31,15 +31,10 @@
+@@ -33,15 +33,10 @@
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])
+-xpp = os.path.join(os.path.dirname(sys.argv[0]),
''xen-python-path'')
+-if os.path.exists(xpp):
+- result = commands.getstatusoutput(xpp)
+- if result[0] != 0:
+- print >>sys.stderr, result[1]
+- sys.exit(1)
+- sys.path.append(result[1])
+sys.path.insert(1, sys.path[0] + ''/../lib/python'')
from xen.xend.server import SrvDaemon
@@ -18,10 +18,10 @@
class CheckError(ValueError):
pass
-@@ -76,19 +71,19 @@
- raise CheckError("invalid user")
-
- def start_xenstored():
+@@ -95,20 +90,20 @@
+ f.close()
+ except:
+ pass
- XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
- cmd = "xenstored --pid-file /var/run/xenstore.pid"
- if XENSTORED_TRACE:
@@ -41,10 +41,12 @@
def start_blktapctrl():
if os.fork() == 0:
- os.execvp(''blktapctrl'',
[''blktapctrl''])
+-
+ execute(''blktapctrl'')
-
++
def main():
try:
+ check_logging()
--- xen-3.orig/tools/misc/xm
+++ xen-3/tools/misc/xm
@@ -1,10 +1,7 @@
Modified: trunk/xen-3/debian/patches/tools-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-prefix.diff (original)
+++ trunk/xen-3/debian/patches/tools-prefix.diff Fri Jan 18 17:44:10 2008
@@ -9,8 +9,8 @@
LIBAIO_DIR = ../../libaio/src
CFLAGS += -Werror
-@@ -55,6 +55,7 @@
- $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
+@@ -52,6 +52,7 @@
+ $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
install: all
+ $(INSTALL_DIR) $(DESTDIR)$(INST_DIR)
@@ -46,8 +46,8 @@
TARGETS := $(TARGETS-y)
-INSTALL_BIN = $(TARGETS) xencons
--INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf
-+INSTALL_TARGETS = $(TARGETS) xencons netfix xm xen-bugtool xen-python-path
xend
+-INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf xsview
++INSTALL_TARGETS = $(TARGETS) xencons netfix xm xen-bugtool xen-python-path
xend xenperf xsview
.PHONY: all
all: build
@@ -77,16 +77,16 @@
clean:
--- xen-3.orig/tools/python/Makefile
+++ xen-3/tools/python/Makefile
-@@ -16,7 +16,7 @@
+@@ -24,7 +24,7 @@
.PHONY: build buildpy
- buildpy:
-- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
-+ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py build
+ buildpy: xsm.py
+- CC="$(CC)" CFLAGS="$(CFLAGS)"
XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build
++ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)"
XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build
build: buildpy refresh-pot refresh-po $(CATALOGS)
-@@ -57,10 +57,10 @@
+@@ -77,10 +77,10 @@
ifndef XEN_PYTHON_NATIVE_INSTALL
install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin;
print auxbin.libpath()")
install: install-messages install-dtd
@@ -155,7 +155,7 @@
--- xen-3.orig/tools/xenstore/Makefile
+++ xen-3/tools/xenstore/Makefile
-@@ -170,13 +170,9 @@
+@@ -81,13 +81,9 @@
install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
@@ -196,7 +196,7 @@
--- xen-3.orig/tools/ioemu/Makefile.target
+++ xen-3/tools/ioemu/Makefile.target
-@@ -192,6 +192,7 @@
+@@ -206,6 +206,7 @@
ifdef CONFIG_SOLARIS
LIBS+=-lsocket -lnsl -lresolv
endif
@@ -206,7 +206,7 @@
ifdef TARGET_GPROF
--- xen-3.orig/tools/ioemu/configure
+++ xen-3/tools/ioemu/configure
-@@ -514,9 +514,9 @@
+@@ -594,9 +594,9 @@
prefix="/usr/local"
fi
mandir="$prefix/share/man"
Modified: trunk/xen-3/debian/patches/tools-python-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-prefix.diff (original)
+++ trunk/xen-3/debian/patches/tools-python-prefix.diff Fri Jan 18 17:44:10 2008
@@ -1,6 +1,6 @@
--- xen-3.orig/tools/python/xen/util/auxbin.py
+++ xen-3/tools/python/xen/util/auxbin.py
-@@ -16,18 +16,11 @@
+@@ -16,19 +16,11 @@
#===========================================================================
@@ -15,13 +15,13 @@
-
import os
import os.path
-+import sys
+ import sys
-+_path = sys.path[0]
+++_path = sys.path[0]
def execute(exe, args = None):
exepath = pathTo(exe)
-@@ -42,12 +35,12 @@
+@@ -43,20 +35,12 @@
def path():
@@ -35,6 +35,14 @@
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:
Modified: trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff (original)
+++ trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Fri Jan 18
17:44:10 2008
@@ -1,6 +1,6 @@
--- xen-3.orig/tools/python/xen/xm/create.py
+++ xen-3/tools/python/xen/xm/create.py
-@@ -530,6 +530,14 @@
+@@ -542,6 +542,14 @@
else:
return s
@@ -15,7 +15,7 @@
def configure_image(vals):
"""Create the image config.
"""
-@@ -537,9 +545,9 @@
+@@ -549,9 +557,9 @@
return None
config_image = [ vals.builder ]
if vals.kernel:
@@ -27,16 +27,16 @@
if vals.cmdline_ip:
cmdline_ip = strip(''ip='', vals.cmdline_ip)
config_image.append([''ip'', cmdline_ip])
-@@ -722,7 +730,7 @@
+@@ -719,7 +727,7 @@
def configure_hvm(config_image, vals):
"""Create the config for HVM devices.
"""
-- args = [ ''device_model'', ''pae'',
''vcpus'', ''boot'', ''fda'',
''fdb'',
-+ args = [ ''pae'', ''vcpus'',
''boot'', ''fda'', ''fdb'',
+- args = [ ''device_model'', ''pae'',
''vcpus'', ''boot'', ''fda'',
''fdb'', ''timer_mode'',
++ args = [ ''pae'', ''vcpus'',
''boot'', ''fda'', ''fdb'',
''timer_mode'',
''localtime'', ''serial'',
''stdvga'', ''isa'',
''nographic'', ''soundhw'',
''vnc'', ''vncdisplay'',
''vncunused'', ''vncconsole'',
''vnclisten'',
''sdl'', ''display'',
''xauthority'', ''rtc_timeoffset'',
''monitor'',
-@@ -730,6 +738,8 @@
+@@ -729,6 +737,8 @@
for a in args:
if a in vals.__dict__ and vals.__dict__[a] is not None:
config_image.append([a, vals.__dict__[a]])
Modified: trunk/xen-3/debian/patches/version.patch
=============================================================================---
trunk/xen-3/debian/patches/version.patch (original)
+++ trunk/xen-3/debian/patches/version.patch Fri Jan 18 17:44:10 2008
@@ -7,7 +7,7 @@
@DPATCH@
--- xen-3.orig/xen/Makefile
+++ xen-3/xen/Makefile
-@@ -105,16 +105,16 @@
+@@ -92,16 +92,16 @@
include/xen/compile.h: include/xen/compile.h.in
@sed -e ''s/@@date@@/$(shell LC_ALL=C date)/g'' \
-e ''s/@@time@@/$(shell LC_ALL=C date +%T)/g'' \
@@ -30,7 +30,7 @@
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 @@
+@@ -1225,9 +1225,10 @@
of_getprop(bof_chosen, "stdout", &of_out, sizeof (of_out));
of_printf("%s\n",
"---------------------------------------------------");
@@ -42,10 +42,10 @@
+ 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"
+ boot_of_fix_maple();
--- xen-3.orig/xen/common/kernel.c
+++ xen-3/xen/common/kernel.c
-@@ -151,8 +151,8 @@
+@@ -159,8 +159,8 @@
{
struct xen_compile_info info;
safe_strcpy(info.compiler, xen_compiler());
@@ -99,22 +99,24 @@
-}
--- xen-3.orig/xen/drivers/char/console.c
+++ xen-3/xen/drivers/char/console.c
-@@ -522,12 +522,10 @@
+@@ -552,14 +552,11 @@
serial_set_rx_handler(sercon_handle, serial_rx);
/* HELLO WORLD --- start-of-day banner text. */
-- printk(xen_banner());
-- printk(" http://www.cl.cam.ac.uk/netos/xen\n");
-- printk(" University of Cambridge Computer Laboratory\n\n");
-- printk(" Xen version %d.%d%s (%s@%s) (%s) %s\n",
-+ printk(" Xen version %d.%d%s (%s %s) (%s@%s) (%s) %s\n",
+- spin_lock(&console_lock);
+- __putstr(xen_banner());
+- spin_unlock(&console_lock);
+- printk("Xen version %d.%d%s (%s@%s) (%s) %s\n",
++ printk("Xen version %d.%d%s (%s %s) (%s@%s) (%s) %s\n",
xen_major_version(), xen_minor_version(), xen_extra_version(),
- xen_compile_by(), xen_compile_domain(),
+ xen_compile_system_distribution(), xen_compile_system_version(),
+ xen_compile_system_maintainer_local(),
xen_compile_system_maintainer_domain(),
xen_compiler(), xen_compile_date());
- printk(" Latest ChangeSet: %s\n\n", xen_changeset());
- set_printk_prefix("(XEN) ");
+- printk("Latest ChangeSet: %s\n", xen_changeset());
+
+ if ( opt_sync_console )
+ {
--- xen-3.orig/xen/include/xen/compile.h.in
+++ xen-3/xen/include/xen/compile.h.in
@@ -1,8 +1,9 @@