Bastian Blank
2007-Sep-11 12:52 UTC
[Pkg-xen-changes] r453 - trunk/xen-unstable/debian/patches
Author: waldi
Date: Tue Sep 11 12:52:04 2007
New Revision: 453
Log:
debian/patches: Update.
Modified:
trunk/xen-unstable/debian/patches/config-prefix.diff
trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
trunk/xen-unstable/debian/patches/tools-prefix.diff
trunk/xen-unstable/debian/patches/tools-python-prefix.diff
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-unstable/debian/patches/tools-xenfb-prefix.diff
Modified: trunk/xen-unstable/debian/patches/config-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/config-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/config-prefix.diff Tue Sep 11 12:52:04
2007
@@ -1,6 +1,6 @@
---- xen-3.orig/Config.mk
-+++ xen-3/Config.mk
-@@ -26,6 +26,10 @@
+--- xen-unstable.orig/Config.mk
++++ xen-unstable/Config.mk
+@@ -30,6 +30,10 @@
include $(XEN_ROOT)/config/$(XEN_OS).mk
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
@@ -11,23 +11,23 @@
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
---- xen-3.orig/config/ia64.mk
-+++ xen-3/config/ia64.mk
-@@ -3,5 +3,3 @@
-
+--- xen-unstable.orig/config/ia64.mk
++++ xen-unstable/config/ia64.mk
+@@ -4,5 +4,3 @@
CONFIG_IOEMU := y
CONFIG_XCUTILS := y
+ CONFIG_XENCOMM := y
-
-LIBDIR := lib
---- xen-3.orig/config/powerpc64.mk
-+++ xen-3/config/powerpc64.mk
+--- xen-unstable.orig/config/powerpc64.mk
++++ xen-unstable/config/powerpc64.mk
@@ -4,4 +4,3 @@
CONFIG_XENCOMM := y
CFLAGS += -DELFSIZE=64
-LIBDIR := lib
---- xen-3.orig/config/x86_32.mk
-+++ xen-3/config/x86_32.mk
+--- xen-unstable.orig/config/x86_32.mk
++++ xen-unstable/config/x86_32.mk
@@ -8,7 +8,6 @@
CONFIG_IOEMU := y
@@ -35,9 +35,9 @@
-LIBDIR := lib
# Use only if calling $(LD) directly.
- ifeq ($(XEN_OS),OpenBSD)
---- xen-3.orig/config/x86_64.mk
-+++ xen-3/config/x86_64.mk
+ LDFLAGS_DIRECT_OpenBSD = _obsd
+--- xen-unstable.orig/config/x86_64.mk
++++ xen-unstable/config/x86_64.mk
@@ -9,7 +9,6 @@
CONFIG_IOEMU := y
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 Tue Sep 11 12:52:04
2007
@@ -1,5 +1,5 @@
---- xen-3.orig/tools/libxc/Makefile
-+++ xen-3/tools/libxc/Makefile
+--- xen-unstable.orig/tools/libxc/Makefile
++++ xen-unstable/tools/libxc/Makefile
@@ -1,9 +1,6 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -10,7 +10,7 @@
CTRL_SRCS-y : CTRL_SRCS-y += xc_core.c
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -79,10 +76,10 @@
+@@ -78,10 +75,10 @@
GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
LIB := libxenctrl.a
@@ -23,7 +23,7 @@
.PHONY: all
all: build
-@@ -104,16 +101,10 @@
+@@ -103,16 +100,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
-@@ -141,26 +132,16 @@
+@@ -140,26 +131,16 @@
libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
@@ -73,8 +73,8 @@
-include $(DEPS)
---- xen-3.orig/tools/xenstore/Makefile
-+++ xen-3/tools/xenstore/Makefile
+--- xen-unstable.orig/tools/xenstore/Makefile
++++ xen-unstable/tools/xenstore/Makefile
@@ -2,9 +2,6 @@
include $(XEN_ROOT)/tools/Rules.mk
XEN_LIBXC = $(XEN_ROOT)/tools/libxc
@@ -85,9 +85,9 @@
PROFILE=#-pg
BASECFLAGS=-Werror
# Make gcc generate dependencies.
-@@ -85,13 +82,8 @@
- talloc_test.o: talloc.c
- $(COMPILE.c) -o $@ $<
+@@ -49,13 +46,8 @@
+ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-libxenstore.so: libxenstore.so.$(MAJOR)
- ln -sf $< $@
@@ -101,9 +101,9 @@
libxenstore.a: xs.o xs_lib.o
$(AR) rcs libxenstore.a $^
-@@ -177,9 +169,7 @@
- $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
- $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
+@@ -84,9 +76,7 @@
+ $(INSTALL_DIR) $(DESTDIR)/usr/include
+ $(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS)
$(DESTDIR)/usr/$(BINDIR)
$(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)
@@ -112,8 +112,8 @@
$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
---- xen-3.orig/tools/blktap/lib/Makefile
-+++ xen-3/tools/blktap/lib/Makefile
+--- xen-unstable.orig/tools/blktap/lib/Makefile
++++ xen-unstable/tools/blktap/lib/Makefile
@@ -1,9 +1,7 @@
XEN_ROOT = ../../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -137,27 +137,28 @@
@@ -43,19 +41,15 @@
$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)/usr/include
- $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
- ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
- $(INSTALL_PROG) blktaplib.h $(DESTDIR)/usr/include
+ $(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
clean:
rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
libblktap.a: $(OBJS)
- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
-+ $(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
- -L$(XEN_XENSTORE) -l xenstore \
+- -L$(XEN_XENSTORE) -l xenstore \
- -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
- ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
- ln -sf libblktap.so.$(MAJOR) libblktap.so
++ $(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
++ -L$(XEN_XENSTORE) -lxenstore \
+ -o libblktap.so $^ $(LIBS)
$(AR) rc $@ libblktap.so
.PHONY: TAGS all build clean install libblktap
---- xen-3.orig/tools/libfsimage/common/Makefile
-+++ xen-3/tools/libfsimage/common/Makefile
+--- xen-unstable.orig/tools/libfsimage/common/Makefile
++++ xen-unstable/tools/libfsimage/common/Makefile
@@ -1,9 +1,6 @@
XEN_ROOT = ../../..
include $(XEN_ROOT)/tools/Rules.mk
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 Tue Sep 11 12:52:04 2007
@@ -1,5 +1,5 @@
---- xen-3.orig/tools/blktap/drivers/Makefile
-+++ xen-3/tools/blktap/drivers/Makefile
+--- xen-unstable.orig/tools/blktap/drivers/Makefile
++++ xen-unstable/tools/blktap/drivers/Makefile
@@ -5,7 +5,7 @@
IBIN = blktapctrl tapdisk
@@ -9,7 +9,7 @@
LIBAIO_DIR = ../../libaio/src
CFLAGS += -Werror
-@@ -55,6 +55,7 @@
+@@ -52,6 +52,7 @@
$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
install: all
@@ -17,8 +17,8 @@
$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
clean:
---- xen-3.orig/tools/console/Makefile
-+++ xen-3/tools/console/Makefile
+--- xen-unstable.orig/tools/console/Makefile
++++ xen-unstable/tools/console/Makefile
@@ -2,8 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -39,8 +39,8 @@
- $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+ $(INSTALL_DIR) $(DESTDIR)/$(DIR)
+ $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)/$(DIR)
---- xen-3.orig/tools/misc/Makefile
-+++ xen-3/tools/misc/Makefile
+--- xen-unstable.orig/tools/misc/Makefile
++++ xen-unstable/tools/misc/Makefile
@@ -13,8 +13,7 @@
TARGETS-$(CONFIG_X86) += xen-detect
TARGETS := $(TARGETS-y)
@@ -64,8 +64,8 @@
$(MAKE) -C lomount install
# No sense in installing miniterm on the Xen box.
# $(MAKE) -C miniterm install
---- xen-3.orig/tools/misc/lomount/Makefile
-+++ xen-3/tools/misc/lomount/Makefile
+--- xen-unstable.orig/tools/misc/lomount/Makefile
++++ xen-unstable/tools/misc/lomount/Makefile
@@ -16,7 +16,7 @@
.PHONY: install
@@ -75,18 +75,18 @@
.PHONY: clean
clean:
---- xen-3.orig/tools/python/Makefile
-+++ xen-3/tools/python/Makefile
-@@ -16,7 +16,7 @@
+--- xen-unstable.orig/tools/python/Makefile
++++ xen-unstable/tools/python/Makefile
+@@ -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
@@ -99,8 +99,8 @@
endif
install-dtd: all
---- xen-3.orig/tools/xcutils/Makefile
-+++ xen-3/tools/xcutils/Makefile
+--- xen-unstable.orig/tools/xcutils/Makefile
++++ xen-unstable/tools/xcutils/Makefile
@@ -11,7 +11,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -110,8 +110,8 @@
INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
---- xen-3.orig/tools/xenmon/Makefile
-+++ xen-3/tools/xenmon/Makefile
+--- xen-unstable.orig/tools/xenmon/Makefile
++++ xen-unstable/tools/xenmon/Makefile
@@ -13,8 +13,6 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -134,8 +134,8 @@
.PHONY: clean
clean:
---- xen-3.orig/tools/xenstat/xentop/Makefile
-+++ xen-3/tools/xenstat/xentop/Makefile
+--- xen-unstable.orig/tools/xenstat/xentop/Makefile
++++ xen-unstable/tools/xenstat/xentop/Makefile
@@ -21,7 +21,6 @@
prefix=/usr
mandir=$(prefix)/share/man
@@ -153,9 +153,9 @@
$(INSTALL_DIR) $(DESTDIR)$(man1dir)
$(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
---- xen-3.orig/tools/xenstore/Makefile
-+++ xen-3/tools/xenstore/Makefile
-@@ -170,13 +170,9 @@
+--- xen-unstable.orig/tools/xenstore/Makefile
++++ xen-unstable/tools/xenstore/Makefile
+@@ -80,13 +80,9 @@
install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
@@ -171,8 +171,8 @@
$(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)
---- xen-3.orig/tools/xentrace/Makefile
-+++ xen-3/tools/xentrace/Makefile
+--- xen-unstable.orig/tools/xentrace/Makefile
++++ xen-unstable/tools/xentrace/Makefile
@@ -35,15 +35,11 @@
.PHONY: install
@@ -194,9 +194,9 @@
$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
---- xen-3.orig/tools/ioemu/Makefile.target
-+++ xen-3/tools/ioemu/Makefile.target
-@@ -192,6 +192,7 @@
+--- xen-unstable.orig/tools/ioemu/Makefile.target
++++ xen-unstable/tools/ioemu/Makefile.target
+@@ -206,6 +206,7 @@
ifdef CONFIG_SOLARIS
LIBS+=-lsocket -lnsl -lresolv
endif
@@ -204,9 +204,9 @@
# profiling code
ifdef TARGET_GPROF
---- xen-3.orig/tools/ioemu/configure
-+++ xen-3/tools/ioemu/configure
-@@ -514,9 +514,9 @@
+--- xen-unstable.orig/tools/ioemu/configure
++++ xen-unstable/tools/ioemu/configure
+@@ -578,9 +578,9 @@
prefix="/usr/local"
fi
mandir="$prefix/share/man"
@@ -218,8 +218,8 @@
configdir="/etc/xen"
fi
---- xen-3.orig/tools/firmware/Makefile
-+++ xen-3/tools/firmware/Makefile
+--- xen-unstable.orig/tools/firmware/Makefile
++++ xen-unstable/tools/firmware/Makefile
@@ -4,7 +4,7 @@
# hvmloader is a 32-bit protected mode binary.
# It belongs in /usr/lib, not /usr/lib64.
@@ -229,8 +229,8 @@
SUBDIRS : SUBDIRS += rombios rombios/32bit
---- xen-3.orig/tools/blktap/lib/Makefile
-+++ xen-3/tools/blktap/lib/Makefile
+--- xen-unstable.orig/tools/blktap/lib/Makefile
++++ xen-unstable/tools/blktap/lib/Makefile
@@ -5,7 +5,7 @@
MINOR = 0
SONAME = libblktap.so.$(MAJOR)
Modified: trunk/xen-unstable/debian/patches/tools-python-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-python-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-python-prefix.diff Tue Sep 11
12:52:04 2007
@@ -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 @@
+--- xen-unstable.orig/tools/python/xen/util/auxbin.py
++++ xen-unstable/tools/python/xen/util/auxbin.py
+@@ -16,19 +16,11 @@
#===========================================================================
@@ -15,13 +15,13 @@
-
import os
import os.path
-+import sys
+ import sys
+_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-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 Tue
Sep 11 12:52:04 2007
@@ -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 @@
+--- xen-unstable.orig/tools/python/xen/xm/create.py
++++ xen-unstable/tools/python/xen/xm/create.py
+@@ -534,6 +534,14 @@
else:
return s
@@ -15,7 +15,7 @@
def configure_image(vals):
"""Create the image config.
"""
-@@ -537,9 +545,9 @@
+@@ -541,9 +549,9 @@
return None
config_image = [ vals.builder ]
if vals.kernel:
@@ -27,7 +27,7 @@
if vals.cmdline_ip:
cmdline_ip = strip(''ip='', vals.cmdline_ip)
config_image.append([''ip'', cmdline_ip])
-@@ -722,7 +730,7 @@
+@@ -717,7 +725,7 @@
def configure_hvm(config_image, vals):
"""Create the config for HVM devices.
"""
@@ -36,12 +36,12 @@
''localtime'', ''serial'',
''stdvga'', ''isa'',
''nographic'', ''soundhw'',
''vnc'', ''vncdisplay'',
''vncunused'', ''vncconsole'',
''vnclisten'',
''sdl'', ''display'',
''xauthority'', ''rtc_timeoffset'',
''monitor'',
-@@ -730,6 +738,8 @@
+@@ -725,6 +733,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:
++ if vals.device_model is not None:
+ config_image.append([ ''device_model'',
abspath(vals.device_model, ''bin'') ])
- config_image.append([''vncpasswd'', vals.vncpasswd])
-
+ if vals.vncpasswd is not None:
+ config_image.append([''vncpasswd'', vals.vncpasswd])
Modified: trunk/xen-unstable/debian/patches/tools-xenfb-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-xenfb-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-xenfb-prefix.diff Tue Sep 11
12:52:04 2007
@@ -1,9 +1,9 @@
---- xen-3.orig/tools/xenfb/Makefile
-+++ xen-3/tools/xenfb/Makefile
+--- xen-unstable.orig/tools/xenfb/Makefile
++++ xen-unstable/tools/xenfb/Makefile
@@ -3,6 +3,7 @@
CFLAGS += -I$(XEN_LIBXC) -I$(XEN_XENSTORE)
- CFLAGS += -I$(XEN_ROOT)/linux-2.6-xen-sparse/include
-I$(XEN_ROOT)/tools/ioemu
+ CFLAGS += -I$(XEN_ROOT)/tools/ioemu
+CFLAGS += -DSHAREDIR="\"share/xen-$(XEN_VERSION)\""
LDFLAGS += -L$(XEN_LIBXC) -L$(XEN_XENSTORE)
@@ -21,8 +21,8 @@
sdlfb: sdlfb.o xenfb.o
---- xen-3.orig/tools/xenfb/vncfb.c
-+++ xen-3/tools/xenfb/vncfb.c
+--- xen-unstable.orig/tools/xenfb/vncfb.c
++++ xen-unstable/tools/xenfb/vncfb.c
@@ -13,7 +13,7 @@
/* Grab key translation support routines from qemu directory. */