Bastian Blank
2007-Nov-24 16:35 UTC
[Pkg-xen-changes] r478 - in trunk/xen-unstable/debian: . patches
Author: waldi
Date: Sat Nov 24 16:35:13 2007
New Revision: 478
Log:
* debian/changelog: Set version to 3.0-unstable+hg16439-1.
* debian/patches: Update.
Removed:
trunk/xen-unstable/debian/patches/tools-xenfb-prefix.diff
Modified:
trunk/xen-unstable/debian/changelog
trunk/xen-unstable/debian/patches/series
trunk/xen-unstable/debian/patches/tools-ioemu-config.diff
trunk/xen-unstable/debian/patches/tools-ldflags.diff
trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
trunk/xen-unstable/debian/patches/tools-misc-prefix.diff
trunk/xen-unstable/debian/patches/tools-prefix.diff
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-unstable/debian/patches/tools-rpath.diff
trunk/xen-unstable/debian/patches/version.patch
Modified: trunk/xen-unstable/debian/changelog
=============================================================================---
trunk/xen-unstable/debian/changelog (original)
+++ trunk/xen-unstable/debian/changelog Sat Nov 24 16:35:13 2007
@@ -1,4 +1,4 @@
-xen-unstable (3.0-unstable+hg15880-1) UNRELEASED; urgency=low
+xen-unstable (3.0-unstable+hg16439-1) UNRELEASED; urgency=low
* New upstream snapshot.
* Don''t longer try to maintain binary compatibility between unstable
Modified: trunk/xen-unstable/debian/patches/series
=============================================================================---
trunk/xen-unstable/debian/patches/series (original)
+++ trunk/xen-unstable/debian/patches/series Sat Nov 24 16:35:13 2007
@@ -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-unstable/debian/patches/tools-ioemu-config.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-ioemu-config.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-ioemu-config.diff Sat Nov 24
16:35:13 2007
@@ -1,11 +1,11 @@
---- xen-3.orig/tools/ioemu/vl.c
-+++ xen-3/tools/ioemu/vl.c
-@@ -89,7 +89,7 @@
+--- xen-unstable.orig/tools/ioemu/vl.c
++++ xen-unstable/tools/ioemu/vl.c
+@@ -96,7 +96,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-unstable/debian/patches/tools-ldflags.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-ldflags.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-ldflags.diff Sat Nov 24 16:35:13
2007
@@ -1,7 +1,7 @@
---- xen-3.orig/tools/blktap/drivers/Makefile
-+++ xen-3/tools/blktap/drivers/Makefile
-@@ -42,11 +42,11 @@
-
+--- xen-unstable.orig/tools/blktap/drivers/Makefile
++++ xen-unstable/tools/blktap/drivers/Makefile
+@@ -39,11 +39,11 @@
+ all: $(IBIN) qcow-util
blktapctrl: blktapctrl.c
- $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
@@ -14,32 +14,32 @@
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
---- xen-3.orig/tools/console/Makefile
-+++ xen-3/tools/console/Makefile
+--- xen-unstable.orig/tools/console/Makefile
++++ xen-unstable/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
+ $(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
-+++ xen-3/tools/misc/Makefile
+--- xen-unstable.orig/tools/misc/Makefile
++++ xen-unstable/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
+--- xen-unstable.orig/tools/xcutils/Makefile
++++ xen-unstable/tools/xcutils/Makefile
@@ -33,7 +33,7 @@
build: $(PROGRAMS)
Modified: trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-lib-abiname.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-lib-abiname.diff Sat Nov 24 16:35:13
2007
@@ -10,7 +10,7 @@
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 @@
+@@ -142,26 +133,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)
@@ -232,7 +232,7 @@
$(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
- ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
- $(INSTALL_DATA) include/flask_op.h $(DESTDIR)/usr/include
+ $(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
.PHONY: TAGS
@@ -54,12 +49,7 @@
@@ -245,8 +245,8 @@
- ln -sf $< $@
-
-libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libflask.so.$(MAJOR) -shared -o $@
$^
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^
+libflask.so: $(PIC_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^
-include $(DEPS)
Modified: trunk/xen-unstable/debian/patches/tools-misc-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-misc-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-misc-prefix.diff Sat Nov 24 16:35:13
2007
@@ -1,16 +1,16 @@
---- xen-3.orig/tools/misc/xend
-+++ xen-3/tools/misc/xend
-@@ -31,15 +31,10 @@
+--- xen-unstable.orig/tools/misc/xend
++++ xen-unstable/tools/misc/xend
+@@ -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,19 +90,19 @@
+ f.close()
+ except:
+ pass
- XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
- cmd = "xenstored --pid-file /var/run/xenstore.pid"
- if XENSTORED_TRACE:
@@ -45,8 +45,8 @@
def main():
try:
---- xen-3.orig/tools/misc/xm
-+++ xen-3/tools/misc/xm
+--- xen-unstable.orig/tools/misc/xm
++++ xen-unstable/tools/misc/xm
@@ -1,10 +1,7 @@
#!/usr/bin/env python
# -*- mode: python; -*-
Modified: trunk/xen-unstable/debian/patches/tools-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-prefix.diff Sat Nov 24 16:35:13 2007
@@ -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 xend xsview
.PHONY: all
all: build
@@ -155,7 +155,7 @@
--- xen-unstable.orig/tools/xenstore/Makefile
+++ xen-unstable/tools/xenstore/Makefile
-@@ -80,13 +80,9 @@
+@@ -81,13 +81,9 @@
install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
@@ -206,7 +206,7 @@
ifdef TARGET_GPROF
--- xen-unstable.orig/tools/ioemu/configure
+++ xen-unstable/tools/ioemu/configure
-@@ -578,9 +578,9 @@
+@@ -594,9 +594,9 @@
prefix="/usr/local"
fi
mandir="$prefix/share/man"
Modified:
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
(original)
+++ trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff Sat
Nov 24 16:35:13 2007
@@ -1,6 +1,6 @@
--- xen-unstable.orig/tools/python/xen/xm/create.py
+++ xen-unstable/tools/python/xen/xm/create.py
-@@ -534,6 +534,14 @@
+@@ -543,6 +543,14 @@
else:
return s
@@ -15,7 +15,7 @@
def configure_image(vals):
"""Create the image config.
"""
-@@ -541,9 +549,9 @@
+@@ -550,9 +558,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])
-@@ -717,7 +725,7 @@
+@@ -729,7 +737,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'',
-@@ -725,6 +733,8 @@
+@@ -737,6 +745,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-unstable/debian/patches/tools-rpath.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-rpath.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-rpath.diff Sat Nov 24 16:35:13 2007
@@ -1,5 +1,5 @@
---- xen-3.orig/tools/Rules.mk
-+++ xen-3/tools/Rules.mk
+--- xen-unstable.orig/tools/Rules.mk
++++ xen-unstable/tools/Rules.mk
@@ -10,6 +10,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -10,8 +10,8 @@
X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
CFLAGS += -D__XEN_TOOLS__
---- xen-3.orig/tools/python/setup.py
-+++ xen-3/tools/python/setup.py
+--- xen-unstable.orig/tools/python/setup.py
++++ xen-unstable/tools/python/setup.py
@@ -5,6 +5,7 @@
XEN_ROOT = "../.."
@@ -52,7 +52,7 @@
include_dirs = include_dirs + [
"xen/lowlevel/acm" ],
library_dirs = library_dirs,
libraries = libraries,
-@@ -46,6 +51,7 @@
+@@ -54,6 +59,7 @@
ptsname = Extension("ptsname",
extra_compile_args = extra_compile_args,
@@ -60,3 +60,14 @@
include_dirs = include_dirs + [ "ptsname" ],
library_dirs = library_dirs,
libraries = libraries,
+--- xen-unstable.orig/tools/xentrace/Makefile
++++ xen-unstable/tools/xentrace/Makefile
+@@ -52,6 +52,6 @@
+ $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
+
+ %: %.c $(HDRS) Makefile
+- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(RPATH_ARG) -lxenctrl
+ xentrace_%: %.c $(HDRS) Makefile
+- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(RPATH_ARG) -lxenctrl
Modified: trunk/xen-unstable/debian/patches/version.patch
=============================================================================---
trunk/xen-unstable/debian/patches/version.patch (original)
+++ trunk/xen-unstable/debian/patches/version.patch Sat Nov 24 16:35:13 2007
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
---- xen-3.orig/xen/Makefile
-+++ xen-3/xen/Makefile
-@@ -105,16 +105,16 @@
+--- xen-unstable.orig/xen/Makefile
++++ xen-unstable/xen/Makefile
+@@ -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'' \
@@ -28,9 +28,9 @@
@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 @@
+--- xen-unstable.orig/xen/arch/powerpc/boot_of.c
++++ xen-unstable/xen/arch/powerpc/boot_of.c
+@@ -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"
---- xen-3.orig/xen/common/kernel.c
-+++ xen-3/xen/common/kernel.c
-@@ -151,8 +151,8 @@
+ boot_of_fix_maple();
+--- xen-unstable.orig/xen/common/kernel.c
++++ xen-unstable/xen/common/kernel.c
+@@ -159,8 +159,8 @@
{
struct xen_compile_info info;
safe_strcpy(info.compiler, xen_compiler());
@@ -56,8 +56,8 @@
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
+--- xen-unstable.orig/xen/common/version.c
++++ xen-unstable/xen/common/version.c
@@ -10,19 +10,24 @@
return XEN_COMPILE_TIME;
}
@@ -97,26 +97,26 @@
-{
- return XEN_BANNER;
-}
---- xen-3.orig/xen/drivers/char/console.c
-+++ xen-3/xen/drivers/char/console.c
-@@ -522,12 +522,10 @@
+--- xen-unstable.orig/xen/drivers/char/console.c
++++ xen-unstable/xen/drivers/char/console.c
+@@ -552,12 +552,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",
+- 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) ");
---- xen-3.orig/xen/include/xen/compile.h.in
-+++ xen-3/xen/include/xen/compile.h.in
+ printk("Latest ChangeSet: %s\n", xen_changeset());
+
+--- xen-unstable.orig/xen/include/xen/compile.h.in
++++ xen-unstable/xen/include/xen/compile.h.in
@@ -1,8 +1,9 @@
#define XEN_COMPILE_DATE "@@date@@"
#define XEN_COMPILE_TIME "@@time@@"
@@ -135,8 +135,8 @@
#define XEN_CHANGESET "@@changeset@@"
-#define XEN_BANNER \
---- xen-3.orig/xen/include/xen/version.h
-+++ xen-3/xen/include/xen/version.h
+--- xen-unstable.orig/xen/include/xen/version.h
++++ xen-unstable/xen/include/xen/version.h
@@ -3,14 +3,14 @@
const char *xen_compile_date(void);