Bastian Blank
2008-Sep-11 10:05 UTC
[Pkg-xen-changes] r607 - in trunk/xen-unstable/debian: . patches
Author: waldi
Date: Thu Sep 11 10:05:38 2008
New Revision: 607
Log:
* debian/changelog: Update to 3.3-unstable+hg18357-1.
* debian/patches: Update.
Modified:
trunk/xen-unstable/debian/changelog
trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch
trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
trunk/xen-unstable/debian/patches/tools-misc-prefix.diff
trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff
trunk/xen-unstable/debian/patches/tools-prefix.diff
trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-unstable/debian/patches/tools-rpath.diff
Modified: trunk/xen-unstable/debian/changelog
=============================================================================---
trunk/xen-unstable/debian/changelog (original)
+++ trunk/xen-unstable/debian/changelog Thu Sep 11 10:05:38 2008
@@ -1,3 +1,9 @@
+xen-unstable (3.3-unstable+hg18357-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 11 Sep 2008 01:39:47 +0200
+
xen-unstable (3.3-unstable+hg17961-1) unstable; urgency=low
* New upstream snapshot.
Modified: trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch
=============================================================================---
trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch (original)
+++ trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch Thu Sep 11
10:05:38 2008
@@ -13,7 +13,7 @@
-$(warning *** libgcrypt not installed: falling back to libcrypto ***)
-endif
-
- LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib
-lblktap
+ LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(call
LDFLAGS_RPATH,../lib) -L../lib -lblktap
-LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
+LDFLAGS_img := $(LIBAIO_DIR)/libaio.a -lgcrypt -lpthread -lz
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 Thu Sep 11 10:05:38
2008
@@ -107,7 +107,7 @@
.PHONY: clean
clean:
- rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
+ rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS
-libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC)
- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
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 Thu Sep 11 10:05:38
2008
@@ -1,5 +1,5 @@
---- xen-3.orig/tools/misc/xend
-+++ xen-3/tools/misc/xend
+--- xen-unstable.orig/tools/misc/xend
++++ xen-unstable/tools/misc/xend
@@ -33,15 +33,10 @@
import time
import commands
@@ -18,7 +18,7 @@
class CheckError(ValueError):
pass
-@@ -95,20 +90,20 @@
+@@ -99,21 +94,23 @@
f.close()
except:
pass
@@ -34,21 +34,27 @@
+ execute(''xenstored'', args)
def start_consoled():
- if os.fork() == 0:
-- os.execvp(''xenconsoled'',
[''xenconsoled''])
-+ execute(''xenconsoled'')
+- XENCONSOLED_TRACE = os.getenv("XENCONSOLED_TRACE")
+- args = ""
+- if XENCONSOLED_TRACE:
+- args += "--log=" + XENCONSOLED_TRACE
+- start_daemon("xenconsoled", args)
++ trace = os.getenv("XENCONSOLED_TRACE")
++ args = []
++ if trace:
++ args.append("--log=" + trace)
++ if os.fork() == 0:
++ execute(''xenconsoled'', args)
def start_blktapctrl():
- if os.fork() == 0:
-- os.execvp(''blktapctrl'',
[''blktapctrl''])
--
+- start_daemon("blktapctrl", "")
++ if os.fork() == 0:
+ execute(''blktapctrl'')
-+
+
def main():
try:
- check_logging()
---- 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-misc-xend-race.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff Thu Sep 11
10:05:38 2008
@@ -2,12 +2,12 @@
--- xen-unstable.orig/tools/misc/xend
+++ xen-unstable/tools/misc/xend
-@@ -97,6 +97,8 @@
+@@ -101,6 +101,8 @@
execute(''xenstored'', args)
def start_consoled():
+ import time
+ time.sleep(2)
- if os.fork() == 0:
- execute(''xenconsoled'')
-
+ trace = os.getenv("XENCONSOLED_TRACE")
+ args = []
+ if trace:
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 Thu Sep 11 10:05:38 2008
@@ -141,9 +141,9 @@
+ $(INSTALL_PROG) xenbaked $(DESTDIR)$(PRIVATE_BINDIR)/xenbaked
+ $(INSTALL_PROG) xentrace_setmask
$(DESTDIR)$(PRIVATE_BINDIR)/xentrace_setmask
+ $(INSTALL_PROG) xenmon.py $(DESTDIR)$(PRIVATE_BINDIR)/xenmon.py
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
- .PHONY: clean
- clean:
--- xen-unstable.orig/tools/xentrace/Makefile
+++ xen-unstable/tools/xentrace/Makefile
@@ -36,12 +36,10 @@
@@ -253,3 +253,14 @@
$(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
.PHONY: TAGS
+--- xen-unstable.orig/tools/blktap/drivers/Makefile
++++ xen-unstable/tools/blktap/drivers/Makefile
+@@ -56,7 +56,7 @@
+ $(CC) $(CFLAGS) -o $* $^ $(LDFLAGS) $(LDFLAGS_img)
+
+ install: all
+- $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR)
++ $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(PRIVATE_BINDIR)
+
+ clean:
+ rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL) $(VHD_UTIL)
Modified: trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff Thu Sep 11
10:05:38 2008
@@ -17,7 +17,7 @@
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
--sys.path = [ ''/usr/lib/python'' ] + sys.path
+-sys.path = [ ''/usr/lib/python'',
''/usr/lib64/python'' ] + sys.path
+sys.path.insert(1, sys.path[0] + ''/../lib/python'')
import fsimage
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 Thu
Sep 11 10:05:38 2008
@@ -1,6 +1,6 @@
--- xen-unstable.orig/tools/python/xen/xm/create.py
+++ xen-unstable/tools/python/xen/xm/create.py
-@@ -578,6 +578,14 @@
+@@ -599,6 +599,14 @@
else:
return s
@@ -15,7 +15,7 @@
def configure_image(vals):
"""Create the image config.
"""
-@@ -585,11 +593,11 @@
+@@ -606,11 +614,11 @@
return None
config_image = [ vals.builder ]
if vals.kernel:
@@ -30,7 +30,7 @@
if vals.cmdline_ip:
cmdline_ip = strip(''ip='', vals.cmdline_ip)
config_image.append([''ip'', cmdline_ip])
-@@ -760,7 +768,7 @@
+@@ -851,7 +859,7 @@
def configure_hvm(config_image, vals):
"""Create the config for HVM devices.
"""
@@ -39,7 +39,7 @@
''localtime'', ''serial'',
''stdvga'', ''isa'',
''nographic'', ''soundhw'',
''vnc'', ''vncdisplay'',
''vncunused'', ''vncconsole'',
''vnclisten'',
''sdl'', ''display'',
''xauthority'', ''rtc_timeoffset'',
''monitor'',
-@@ -770,6 +778,8 @@
+@@ -861,6 +869,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 Thu Sep 11 10:05:38 2008
@@ -218,3 +218,14 @@
SRCS : SRCS += xenbus.c blkif.c xs_api.c
+--- xen-unstable.orig/tools/blktap/drivers/Makefile
++++ xen-unstable/tools/blktap/drivers/Makefile
+@@ -25,7 +25,7 @@
+ $(warning *** libgcrypt not installed: falling back to libcrypto ***)
+ endif
+
+-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib
-lblktap
++LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(call
LDFLAGS_RPATH,../lib) -L../lib -lblktap
+ LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
+
+ BLK-OBJS-y := block-aio.o