Author: waldi
Date: Sun May 10 14:59:28 2009
New Revision: 625
Log:
debian/patches
- Remove merged patches.
- Split some remaining patches.
- Regenerate patches.
Added:
trunk/xen-3/debian/patches/config-ioemu-disable.diff
trunk/xen-3/debian/patches/tools-blktap-abiname.diff
trunk/xen-3/debian/patches/tools-blktap-prefix.diff
trunk/xen-3/debian/patches/tools-blktap-rpath.diff
trunk/xen-3/debian/patches/tools-console-prefix.diff
trunk/xen-3/debian/patches/tools-console-rpath.diff
trunk/xen-3/debian/patches/tools-firmware-prefix.diff
trunk/xen-3/debian/patches/tools-flask-abiname.diff
trunk/xen-3/debian/patches/tools-flask-prefix.diff
trunk/xen-3/debian/patches/tools-ioemu-prefix.diff
trunk/xen-3/debian/patches/tools-ioemu-rpath.diff
trunk/xen-3/debian/patches/tools-libfsimage-abiname.diff
trunk/xen-3/debian/patches/tools-libfsimage-rpath.diff
trunk/xen-3/debian/patches/tools-libxc-abiname.diff
trunk/xen-3/debian/patches/tools-libxc-prefix.diff
trunk/xen-3/debian/patches/tools-libxc-rpath.diff
trunk/xen-3/debian/patches/tools-misc-rpath.diff
trunk/xen-3/debian/patches/tools-pygrub-rpath.diff
trunk/xen-3/debian/patches/tools-python-rpath.diff
trunk/xen-3/debian/patches/tools-xcutils-rpath.diff
trunk/xen-3/debian/patches/tools-xenmon-prefix.diff
trunk/xen-3/debian/patches/tools-xenmon-rpath.diff
trunk/xen-3/debian/patches/tools-xenstat-prefix.diff
trunk/xen-3/debian/patches/tools-xenstat-rpath.diff
trunk/xen-3/debian/patches/tools-xenstore-prefix.diff
trunk/xen-3/debian/patches/tools-xenstore-rpath.diff
trunk/xen-3/debian/patches/tools-xentrace-prefix.diff
trunk/xen-3/debian/patches/tools-xentrace-rpath.diff
Replaced:
trunk/xen-3/debian/patches/config-prefix.diff
- copied, changed from r623,
trunk/xen-unstable/debian/patches/config-prefix.diff
trunk/xen-3/debian/patches/tools-blktap-crypto.patch
- copied unchanged from r623,
trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch
trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
- copied, changed from r623,
trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff
trunk/xen-3/debian/patches/tools-misc-prefix.diff
- copied, changed from r623,
trunk/xen-unstable/debian/patches/tools-misc-prefix.diff
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
- copied, changed from r623,
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-3/debian/patches/tools-rpath.diff
- copied, changed from r623,
trunk/xen-unstable/debian/patches/tools-rpath.diff
trunk/xen-3/debian/patches/version.patch
- copied, changed from r623,
trunk/xen-unstable/debian/patches/version.patch
Deleted:
trunk/xen-3/debian/patches/CVE-2008-1952.patch
trunk/xen-3/debian/patches/CVE-2008-2004.1.diff
trunk/xen-3/debian/patches/CVE-2008-2004.2.diff
trunk/xen-3/debian/patches/CVE-2008-2004.3.diff
trunk/xen-3/debian/patches/disable-features.diff
trunk/xen-3/debian/patches/doc-remove-unused.diff
trunk/xen-3/debian/patches/tools-lib-abiname.diff
trunk/xen-3/debian/patches/tools-libxc-loder-bzimage.patch
trunk/xen-3/debian/patches/tools-prefix.diff
Modified:
trunk/xen-3/debian/patches/series
trunk/xen-3/debian/patches/tools-ioemu-config.diff
trunk/xen-3/debian/patches/tools-ioemu-debug.diff
trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
trunk/xen-3/debian/patches/tools-python-prefix.diff
Added: trunk/xen-3/debian/patches/config-ioemu-disable.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/config-ioemu-disable.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,29 @@
+--- a/config/ia64.mk
++++ b/config/ia64.mk
+@@ -1,6 +1,5 @@
+ CONFIG_IA64 := y
+ CONFIG_IA64_$(XEN_OS) := y
+
+-CONFIG_IOEMU := y
+ CONFIG_XCUTILS := y
+ CONFIG_XENCOMM := y
+--- a/config/x86_32.mk
++++ b/config/x86_32.mk
+@@ -5,7 +5,6 @@
+ CONFIG_HVM := y
+ CONFIG_MIGRATE := y
+ CONFIG_XCUTILS := y
+-CONFIG_IOEMU := y
+
+ CFLAGS += -m32 -march=i686
+
+--- a/config/x86_64.mk
++++ b/config/x86_64.mk
+@@ -6,7 +6,6 @@
+ CONFIG_HVM := y
+ CONFIG_MIGRATE := y
+ CONFIG_XCUTILS := y
+-CONFIG_IOEMU := y
+
+ CFLAGS += -m64
+
Copied and modified: trunk/xen-3/debian/patches/config-prefix.diff (from r623,
trunk/xen-unstable/debian/patches/config-prefix.diff)
=============================================================================---
trunk/xen-unstable/debian/patches/config-prefix.diff Sun May 10 13:53:51 2009
(r623, copy source)
+++ trunk/xen-3/debian/patches/config-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -1,6 +1,6 @@
---- xen-unstable.orig/config/StdGNU.mk
-+++ xen-unstable/config/StdGNU.mk
-@@ -22,16 +22,15 @@
+--- a/config/StdGNU.mk
++++ b/config/StdGNU.mk
+@@ -25,16 +25,15 @@
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
LIBLEAFDIR = lib
@@ -19,8 +19,8 @@
SOCKET_LIBS CURSES_LIBS = -lncurses
---- xen-unstable.orig/config/x86_64.mk
-+++ xen-unstable/config/x86_64.mk
+--- a/config/x86_64.mk
++++ b/config/x86_64.mk
@@ -10,11 +10,6 @@
CFLAGS += -m64
Modified: trunk/xen-3/debian/patches/series
=============================================================================---
trunk/xen-3/debian/patches/series Sun May 10 14:44:54 2009 (r624)
+++ trunk/xen-3/debian/patches/series Sun May 10 14:59:28 2009 (r625)
@@ -1,22 +1,43 @@
-CVE-2008-1952.patch
-tools-libxc-loder-bzimage.patch
+version.patch
+
config-prefix.diff
-tools-rpath.diff
-tools-prefix.diff
+tools-blktap-prefix.diff
+tools-console-prefix.diff
+tools-firmware-prefix.diff
+tools-flask-prefix.diff
+tools-ioemu-prefix.diff
+tools-libfsimage-prefix.diff
+tools-libxc-prefix.diff
tools-misc-prefix.diff
+tools-pygrub-prefix.diff
tools-python-prefix.diff
-version.patch
-tools-lib-abiname.diff
+tools-xenmon-prefix.diff
+tools-xenstat-prefix.diff
+tools-xenstore-prefix.diff
+tools-xentrace-prefix.diff
+
+tools-rpath.diff
+tools-blktap-rpath.diff
+tools-console-rpath.diff
+tools-ioemu-rpath.diff
+tools-libfsimage-rpath.diff
+tools-libxc-rpath.diff
+tools-misc-rpath.diff
+tools-pygrub-rpath.diff
+tools-python-rpath.diff
+tools-xcutils-rpath.diff
+tools-xenmon-rpath.diff
+tools-xenstat-rpath.diff
+tools-xenstore-rpath.diff
+tools-xentrace-rpath.diff
+
+tools-blktap-abiname.diff
+tools-flask-abiname.diff
+tools-libfsimage-abiname.diff
+tools-libxc-abiname.diff
+
tools-python-xen-xm-relative-path.diff
-tools-ioemu-arch.diff
-tools-ioemu-config.diff
-tools-pygrub-prefix.diff
-tools-libfsimage-prefix.diff
-disable-features.diff
-tools-misc-xend-race.diff
-doc-remove-unused.diff
+
+config-ioemu-disable.diff
+
tools-blktap-crypto.patch
-tools-ioemu-debug.diff
-CVE-2008-2004.1.diff
-CVE-2008-2004.2.diff
-CVE-2008-2004.3.diff
Added: trunk/xen-3/debian/patches/tools-blktap-abiname.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-blktap-abiname.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,44 @@
+--- a/tools/blktap/lib/Makefile
++++ b/tools/blktap/lib/Makefile
+@@ -1,9 +1,7 @@
+ XEN_ROOT = ../../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 3.0
+-MINOR = 0
+-SONAME = libblktap.so.$(MAJOR)
++SONAME = libblktap.so
+
+ CFLAGS += -I.
+ CFLAGS += $(CFLAGS_libxenctrl)
+@@ -28,7 +26,7 @@
+ OBJS_PIC = $(SRCS:.c=.opic)
+ IBINS :+
+-LIB = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
++LIB = libblktap.a libblktap.so
+
+ .PHONY: all
+ all: $(LIB)
+@@ -38,19 +36,15 @@
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
+- ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so.$(MAJOR)
+- ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
+ $(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
+
+ .PHONY: clean
+ clean:
+ 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) \
++libblktap.so: $(OBJS_PIC)
++ $(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
+ $(LDFLAGS) -o $@ $^
+- ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
+- ln -sf libblktap.so.$(MAJOR) libblktap.so
+
+ libblktap.a: $(OBJS)
+ $(AR) rc $@ $^
Copied: trunk/xen-3/debian/patches/tools-blktap-crypto.patch (from r623,
trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch)
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-blktap-crypto.patch Sun May 10 14:59:28
2009 (r625, copy of r623,
trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch)
@@ -0,0 +1,128 @@
+diff -r 9cf72db44ee9 tools/blktap/drivers/Makefile
+--- a/tools/blktap/drivers/Makefile Fri Jul 04 11:54:21 2008 +0100
++++ b/tools/blktap/drivers/Makefile Fri Jul 04 20:03:59 2008 +0200
+@@ -17,16 +17,8 @@ CFLAGS += -Wp,-MD,.$(@F).d
+ CFLAGS += -Wp,-MD,.$(@F).d
+ DEPS = .*.d
+
+-ifeq ($(shell . ./check_gcrypt),"yes")
+-CFLAGS += -DUSE_GCRYPT
+-CRYPT_LIB := -lgcrypt
+-else
+-CRYPT_LIB := -lcrypto
+-$(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
++LDFLAGS_img := $(LIBAIO_DIR)/libaio.a -lgcrypt -lpthread -lz
+
+ BLK-OBJS-y := block-aio.o
+ BLK-OBJS-y += block-sync.o
+diff -r 9cf72db44ee9 tools/blktap/drivers/block-qcow.c
+--- a/tools/blktap/drivers/block-qcow.c Fri Jul 04 11:54:21 2008 +0100
++++ b/tools/blktap/drivers/block-qcow.c Fri Jul 04 20:03:59 2008 +0200
+@@ -33,6 +33,7 @@
+ #include <zlib.h>
+ #include <inttypes.h>
+ #include <libaio.h>
++#include <gcrypt.h>
+ #include "bswap.h"
+ #include "aes.h"
+ #include "tapdisk.h"
+@@ -145,10 +146,6 @@ struct tdqcow_state {
+
+ static int decompress_cluster(struct tdqcow_state *s, uint64_t
cluster_offset);
+
+-#ifdef USE_GCRYPT
+-
+-#include <gcrypt.h>
+-
+ static uint32_t gen_cksum(char *ptr, int len)
+ {
+ int i;
+@@ -169,41 +166,6 @@ static uint32_t gen_cksum(char *ptr, int
+
+ return md[0];
+ }
+-
+-#else /* use libcrypto */
+-
+-#include <openssl/md5.h>
+-
+-static uint32_t gen_cksum(char *ptr, int len)
+-{
+- int i;
+- unsigned char *md;
+- uint32_t ret;
+-
+- md = malloc(MD5_DIGEST_LENGTH);
+- if(!md) return 0;
+-
+- /* Convert L1 table to big endian */
+- for(i = 0; i < len / sizeof(uint64_t); i++) {
+- cpu_to_be64s(&((uint64_t*) ptr)[i]);
+- }
+-
+- /* Generate checksum */
+- if (MD5((unsigned char *)ptr, len, md) != md)
+- ret = 0;
+- else
+- memcpy(&ret, md, sizeof(uint32_t));
+-
+- /* Convert L1 table back to native endianess */
+- for(i = 0; i < len / sizeof(uint64_t); i++) {
+- be64_to_cpus(&((uint64_t*) ptr)[i]);
+- }
+-
+- free(md);
+- return ret;
+-}
+-
+-#endif
+
+ static int get_filesize(char *filename, uint64_t *size, struct stat *st)
+ {
+diff -r 9cf72db44ee9 tools/blktap/drivers/check_gcrypt
+--- a/tools/blktap/drivers/check_gcrypt Fri Jul 04 11:54:21 2008 +0100
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,14 +0,0 @@
+-#!/bin/sh
+-
+-cat > .gcrypt.c << EOF
+-#include <gcrypt.h>
+-int main(void) { return 0; }
+-EOF
+-
+-if $1 -o .gcrypt .gcrypt.c -lgcrypt 2>/dev/null ; then
+- echo "yes"
+-else
+- echo "no"
+-fi
+-
+-rm -f .gcrypt*
+diff -r 9cf72db44ee9 tools/check/check_crypto_lib
+--- a/tools/check/check_crypto_lib Fri Jul 04 11:54:21 2008 +0100
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,11 +0,0 @@
+-#!/bin/sh
+-# CHECK-BUILD CHECK-INSTALL
+-
+-. ./funcs.sh
+-
+-case $OS in
+-FreeBSD|NetBSD|OpenBSD)
+- exit 0 ;;
+-esac
+-
+-has_lib libcrypto.so || fail "missing libcrypto.so"
+diff -r 9cf72db44ee9 tools/check/check_openssl_devel
+--- a/tools/check/check_openssl_devel Fri Jul 04 11:54:21 2008 +0100
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,6 +0,0 @@
+-#!/bin/sh
+-# CHECK-BUILD
+-
+-. ./funcs.sh
+-
+-has_header openssl/md5.h || fail "missing openssl headers"
Added: trunk/xen-3/debian/patches/tools-blktap-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-blktap-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,29 @@
+--- a/tools/blktap/lib/Makefile
++++ b/tools/blktap/lib/Makefile
+@@ -34,11 +34,11 @@
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
+- ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
+- ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
++ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
++ ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so.$(MAJOR)
++ ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
+ $(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
+
+ .PHONY: clean
+--- a/tools/blktap/drivers/Makefile
++++ b/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)
Added: trunk/xen-3/debian/patches/tools-blktap-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-blktap-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,21 @@
+--- a/tools/blktap/lib/Makefile
++++ b/tools/blktap/lib/Makefile
+@@ -9,6 +9,7 @@
+ CFLAGS += $(CFLAGS_libxenctrl)
+ CFLAGS += $(CFLAGS_libxenstore)
+ LDFLAGS += $(LDFLAGS_libxenstore)
++LDFLAGS += $(call LDFLAGS_RPATH)
+
+ SRCS :+ SRCS += xenbus.c blkif.c xs_api.c
+--- a/tools/blktap/drivers/Makefile
++++ b/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
Added: trunk/xen-3/debian/patches/tools-console-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-console-prefix.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,11 @@
+--- a/tools/console/Makefile
++++ b/tools/console/Makefile
+@@ -29,7 +29,5 @@
+
+ .PHONY: install
+ install: $(BIN)
+- $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
+- $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+- $(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)$(PRIVATE_BINDIR)
Added: trunk/xen-3/debian/patches/tools-console-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-console-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,10 @@
+--- a/tools/console/Makefile
++++ b/tools/console/Makefile
+@@ -8,6 +8,7 @@
+ CFLAGS += $(CFLAGS_libxenstore)
+ LDFLAGS += $(LDFLAGS_libxenctrl)
+ LDFLAGS += $(LDFLAGS_libxenstore)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ BIN = xenconsoled xenconsole
+
Added: trunk/xen-3/debian/patches/tools-firmware-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-firmware-prefix.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,11 @@
+--- a/tools/firmware/Makefile
++++ b/tools/firmware/Makefile
+@@ -4,7 +4,7 @@
+ # hvmloader is a 32-bit protected mode binary.
+ # It belongs in /usr/lib, not /usr/lib64.
+ TARGET := hvmloader/hvmloader
+-INST_DIR := $(DESTDIR)/usr/lib/xen/boot
++INST_DIR := $(DESTDIR)$(PRIVATE_PREFIX)/boot
+
+ SUBDIRS :+ SUBDIRS += rombios
Added: trunk/xen-3/debian/patches/tools-flask-abiname.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-flask-abiname.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,45 @@
+--- a/tools/flask/libflask/Makefile
++++ b/tools/flask/libflask/Makefile
+@@ -1,6 +1,3 @@
+-MAJOR = 1.0
+-MINOR = 0
+-
+ XEN_ROOT = ../../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+@@ -22,7 +19,7 @@
+ PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
+
+ LIB := libflask.a
+-LIB += libflask.so libflask.so.$(MAJOR) libflask.so.$(MAJOR).$(MINOR)
++LIB += libflask.so
+
+ .PHONY: all
+ all: build
+@@ -35,10 +32,8 @@
+ install: build
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_PROG) libflask.so $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(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)
+
+ .PHONY: TAGS
+@@ -54,12 +49,7 @@
+ libflask.a: $(LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libflask.so: libflask.so.$(MAJOR)
+- ln -sf $< $@
+-libflask.so.$(MAJOR): libflask.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^
++libflask.so: $(PIC_OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^
+
+ -include $(DEPS)
Added: trunk/xen-3/debian/patches/tools-flask-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-flask-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,20 @@
+--- a/tools/flask/libflask/Makefile
++++ b/tools/flask/libflask/Makefile
+@@ -33,12 +33,12 @@
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
+- ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
+- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
++ $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(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)
+
+ .PHONY: TAGS
Modified: trunk/xen-3/debian/patches/tools-ioemu-config.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-ioemu-config.diff Sun May 10 14:44:54 2009
(r624)
+++ trunk/xen-3/debian/patches/tools-ioemu-config.diff Sun May 10 14:59:28 2009
(r625)
@@ -1,6 +1,6 @@
---- xen-3.orig/tools/ioemu/vl.c
-+++ xen-3/tools/ioemu/vl.c
-@@ -99,7 +99,7 @@
+--- a/tools/ioemu/vl.c
++++ b/tools/ioemu/vl.c
+@@ -108,7 +108,7 @@
#include "exec-all.h"
Modified: trunk/xen-3/debian/patches/tools-ioemu-debug.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-ioemu-debug.diff Sun May 10 14:44:54 2009
(r624)
+++ trunk/xen-3/debian/patches/tools-ioemu-debug.diff Sun May 10 14:59:28 2009
(r625)
@@ -1,6 +1,6 @@
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
-@@ -632,7 +632,6 @@
+@@ -666,7 +666,6 @@
ifneq ($(PROGS),)
$(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)"
endif
Added: trunk/xen-3/debian/patches/tools-ioemu-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-ioemu-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,14 @@
+--- a/tools/ioemu/configure
++++ b/tools/ioemu/configure
+@@ -598,9 +598,9 @@
+ prefix="/usr/local"
+ fi
+ mandir="$prefix/share/man"
+-datadir="$prefix/share/xen/qemu"
++datadir="$prefix/share/xen-$XEN_VERSION/qemu"
+ docdir="$prefix/share/doc/qemu"
+-bindir="$prefix/$libdir/xen/bin"
++bindir="$prefix/lib/xen-$XEN_VERSION/bin"
+ configdir="/etc/xen"
+ fi
+
Added: trunk/xen-3/debian/patches/tools-ioemu-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-ioemu-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,11 @@
+--- a/tools/ioemu/Makefile.target
++++ b/tools/ioemu/Makefile.target
+@@ -536,6 +536,8 @@
+ VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld
+ endif
+
++VL_LDFLAGS+=$(call LDFLAGS_RPATH,../lib)
++
+ ifdef CONFIG_WIN32
+ SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+ endif
Added: trunk/xen-3/debian/patches/tools-libfsimage-abiname.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-libfsimage-abiname.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,48 @@
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = ../../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 1.0
+-MINOR = 0
+-
+ CFLAGS += -Werror -Wp,-MD,.$(@F).d
-DLIBDIR="\"$(LIBDIR)\""
+ DEPS = .*.d
+
+@@ -15,7 +12,7 @@
+
+ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
+
+-LIB = libfsimage.so libfsimage.so.$(MAJOR) libfsimage.so.$(MAJOR).$(MINOR)
++LIB = libfsimage.so
+
+ .PHONY: all
+ all: $(LIB)
+@@ -24,9 +21,7 @@
+ install: all
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
+- ln -sf libfsimage.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so.$(MAJOR)
+- ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so
++ $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
+@@ -34,13 +29,8 @@
+ clean distclean:
+ rm -f $(PIC_OBJS) $(LIB) $(DEPS)
+
+-libfsimage.so: libfsimage.so.$(MAJOR)
+- ln -sf $< $@
+-libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^ -lpthread
++libfsimage.so: $(PIC_OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
+
+ -include $(DEPS)
+
Copied and modified: trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
(from r623, trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff)
=============================================================================---
trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff Sun May 10
13:53:51 2009 (r623, copy source)
+++ trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff Sun May 10 14:59:28
2009 (r625)
@@ -1,6 +1,6 @@
---- xen-unstable.orig/tools/libfsimage/Rules.mk
-+++ xen-unstable/tools/libfsimage/Rules.mk
-@@ -8,12 +8,7 @@
+--- a/tools/libfsimage/Rules.mk
++++ b/tools/libfsimage/Rules.mk
+@@ -7,12 +7,7 @@
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
@@ -14,19 +14,35 @@
FSLIB = fsimage.so
---- xen-unstable.orig/tools/libfsimage/common/Makefile
-+++ xen-unstable/tools/libfsimage/common/Makefile
-@@ -1,7 +1,7 @@
- XEN_ROOT = ../../..
- include $(XEN_ROOT)/tools/Rules.mk
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
+@@ -4,7 +4,7 @@
+ MAJOR = 1.0
+ MINOR = 0
-CFLAGS += -Werror -Wp,-MD,.$(@F).d
+CFLAGS += -Werror -Wp,-MD,.$(@F).d
-DLIBDIR="\"$(LIBDIR)\""
DEPS = .*.d
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
---- xen-unstable.orig/tools/libfsimage/common/fsimage_plugin.c
-+++ xen-unstable/tools/libfsimage/common/fsimage_plugin.c
+@@ -22,11 +22,11 @@
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- ln -sf libfsimage.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
+- ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
++ $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ ln -sf libfsimage.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so.$(MAJOR)
++ ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so
+ $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
+--- a/tools/libfsimage/common/fsimage_plugin.c
++++ b/tools/libfsimage/common/fsimage_plugin.c
@@ -131,26 +131,8 @@
int err;
int ret = -1;
Added: trunk/xen-3/debian/patches/tools-libfsimage-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-libfsimage-rpath.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,10 @@
+--- a/tools/libfsimage/Rules.mk
++++ b/tools/libfsimage/Rules.mk
+@@ -4,6 +4,7 @@
+
+ CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -Wp,-MD,.$(@F).d
+ LDFLAGS += -L../common/
++LDFLAGS += $(call LDFLAGS_RPATH,../..)
+
+ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
+
Added: trunk/xen-3/debian/patches/tools-libxc-abiname.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-libxc-abiname.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,77 @@
+--- a/tools/libxc/Makefile
++++ b/tools/libxc/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 3.2
+-MINOR = 0
+-
+ CTRL_SRCS-y :+ CTRL_SRCS-y += xc_core.c
+ CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
+@@ -74,12 +71,12 @@
+
+ LIB := libxenctrl.a
+ ifneq ($(stubdom),y)
+-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
++LIB += libxenctrl.so
+ endif
+
+ LIB += libxenguest.a
+ ifneq ($(stubdom),y)
+-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
++LIB += libxenguest.so
+ endif
+
+ .PHONY: all
+@@ -96,16 +93,12 @@
+ install: build
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
+- ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so.$(MAJOR)
+- ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so
+ $(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR)
+
+- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
+- ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so.$(MAJOR)
+- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so
+ $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
+
+ .PHONY: TAGS
+@@ -133,26 +126,16 @@
+ libxenctrl.a: $(CTRL_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenctrl.so: libxenctrl.so.$(MAJOR)
+- ln -sf $< $@
+-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS)
++libxenctrl.so: $(CTRL_PIC_OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^
$(PTHREAD_LIBS)
+
+ # libxenguest
+
+ libxenguest.a: $(GUEST_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenguest.so: libxenguest.so.$(MAJOR)
+- ln -sf $< $@
+-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-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: $(GUEST_PIC_OBJS) libxenctrl.so
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@
$(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
+
+ -include $(DEPS)
+
Added: trunk/xen-3/debian/patches/tools-libxc-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-libxc-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,28 @@
+--- a/tools/libxc/Makefile
++++ b/tools/libxc/Makefile
+@@ -94,18 +94,18 @@
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
+- ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
+- ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
++ ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so.$(MAJOR)
++ ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so
+ $(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR)
+
+- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
+- ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
+- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
++ ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so.$(MAJOR)
++ ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so
+ $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
+
+ .PHONY: TAGS
Added: trunk/xen-3/debian/patches/tools-libxc-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-libxc-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,20 @@
+--- a/tools/libxc/Makefile
++++ b/tools/libxc/Makefile
+@@ -139,7 +139,7 @@
+ ln -sf $< $@
+
+ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS)
+
+ # libxenguest
+
+@@ -152,7 +152,7 @@
+ ln -sf $< $@
+
+ libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl
$(PTHREAD_LIBS)
+
+ -include $(DEPS)
+
Copied and modified: trunk/xen-3/debian/patches/tools-misc-prefix.diff (from
r623, trunk/xen-unstable/debian/patches/tools-misc-prefix.diff)
=============================================================================---
trunk/xen-unstable/debian/patches/tools-misc-prefix.diff Sun May 10 13:53:51
2009 (r623, copy source)
+++ trunk/xen-3/debian/patches/tools-misc-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -1,69 +1,44 @@
---- xen-unstable.orig/tools/misc/xend
-+++ xen-unstable/tools/misc/xend
-@@ -33,15 +33,10 @@
- import time
- import commands
-
--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
-+from xen.util.auxbin import execute
-
- class CheckError(ValueError):
- pass
-@@ -99,21 +94,23 @@
- f.close()
- except:
- pass
-- XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
-- cmd = "xenstored --pid-file /var/run/xenstore.pid"
-- if XENSTORED_TRACE:
-- cmd += " -T /var/log/xen/xenstored-trace.log"
-- s,o = commands.getstatusoutput(cmd)
-+ args = ["--pid-file", "/var/run/xenstore.pid"]
-+ if os.getenv("XENSTORED_TRACE"):
-+ args.extend(["-T",
"/var/log/xen/xenstored-trace.log"])
-+ if os.fork() == 0:
-+ execute(''xenstored'', args)
-
- def start_consoled():
-- 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():
-- start_daemon("blktapctrl", "")
-+ if os.fork() == 0:
-+ execute(''blktapctrl'')
-
- def main():
- try:
---- xen-unstable.orig/tools/misc/xm
-+++ xen-unstable/tools/misc/xm
-@@ -1,10 +1,7 @@
- #!/usr/bin/env python
- # -*- mode: python; -*-
- import sys
+--- a/tools/misc/Makefile
++++ b/tools/misc/Makefile
+@@ -18,13 +18,10 @@
+ SUBDIRS-$(CONFIG_MINITERM) += miniterm
+ SUBDIRS := $(SUBDIRS-y)
+
+-INSTALL_BIN-y := xencons
+-INSTALL_BIN-$(CONFIG_X86) += xen-detect
+-INSTALL_BIN := $(INSTALL_BIN-y)
-
--# add fallback path for non-native python path installs if needed
--sys.path.append(''/usr/lib/python'')
--sys.path.append(''/usr/lib64/python'')
-+sys.path.insert(1, sys.path[0] + ''/../lib/python'')
- from xen.xm import main
+-INSTALL_SBIN-y := netfix xm xen-bugtool xen-python-path xend xenperf xsview
+-INSTALL_SBIN-$(CONFIG_X86) += xenpm
+-INSTALL_SBIN := $(INSTALL_SBIN-y)
++INSTALL_TARGETS-y := xencons
++INSTALL_TARGETS-y := netfix xm xen-bugtool xen-python-path xend xenperf xsview
++INSTALL_TARGETS-$(CONFIG_X86) += xenpm
++INSTALL_TARGETS := $(INSTALL_TARGETS-y)
+
+ DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)
+ PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH)
+@@ -40,10 +37,8 @@
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PYTHON_PROG) $(INSTALL_TARGETS) $(DESTDIR)$(PRIVATE_BINDIR)
+ set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
+
+ .PHONY: clean
+--- a/tools/misc/lomount/Makefile
++++ b/tools/misc/lomount/Makefile
+@@ -16,7 +16,7 @@
+
+ .PHONY: install
+ install install-recurse: build
+- $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
++ $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
- main.main(sys.argv)
+ .PHONY: clean
+ clean:
Added: trunk/xen-3/debian/patches/tools-misc-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-misc-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,8 @@
+--- a/tools/misc/Makefile
++++ b/tools/misc/Makefile
+@@ -50,4 +50,4 @@
+ $(CC) -c $(CFLAGS) -o $@ $<
+
+ xenperf xenpm: %: %.o Makefile
+- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl)
++ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) $(call
LDFLAGS_RPATH,../lib)
Modified: trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-pygrub-prefix.diff Sun May 10 14:44:54 2009
(r624)
+++ trunk/xen-3/debian/patches/tools-pygrub-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -1,5 +1,5 @@
---- xen-3.orig/tools/pygrub/Makefile
-+++ xen-3/tools/pygrub/Makefile
+--- a/tools/pygrub/Makefile
++++ b/tools/pygrub/Makefile
@@ -6,13 +6,12 @@
all: build
.PHONY: build
@@ -16,13 +16,13 @@
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
else
install: all
---- xen-3.orig/tools/pygrub/src/pygrub
-+++ xen-3/tools/pygrub/src/pygrub
+--- a/tools/pygrub/src/pygrub
++++ b/tools/pygrub/src/pygrub
@@ -21,7 +21,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
Added: trunk/xen-3/debian/patches/tools-pygrub-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-pygrub-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,16 @@
+--- a/tools/pygrub/setup.py
++++ b/tools/pygrub/setup.py
+@@ -4,11 +4,13 @@
+ import sys
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/.." ]
+
+ XEN_ROOT = "../.."
+
+ fsimage = Extension("fsimage",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ libraries = ["fsimage"],
Modified: trunk/xen-3/debian/patches/tools-python-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-prefix.diff Sun May 10 14:44:54 2009
(r624)
+++ trunk/xen-3/debian/patches/tools-python-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -1,5 +1,5 @@
---- xen-3.orig/tools/python/xen/util/auxbin.py
-+++ xen-3/tools/python/xen/util/auxbin.py
+--- a/tools/python/xen/util/auxbin.py
++++ b/tools/python/xen/util/auxbin.py
@@ -16,19 +16,11 @@
#===========================================================================
@@ -48,3 +48,20 @@
- else:
- return LIB_32
+ return os.path.realpath(os.path.join(path(), ''../lib''))
+--- a/tools/python/Makefile
++++ b/tools/python/Makefile
+@@ -75,12 +75,11 @@
+
+ .PHONY: install
+ ifndef XEN_PYTHON_NATIVE_INSTALL
+-install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin;
print auxbin.libpath()")
+ install: install-messages install-dtd
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix="" --force
--install-lib="$(DESTDIR)$(LIBPATH)/python"
++ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)$(PRIVATE_PREFIX)"
+ else
+ install: install-messages install-dtd
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)" --force
++ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)"
+ endif
+
+ install-dtd: all
Added: trunk/xen-3/debian/patches/tools-python-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-python-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,58 @@
+--- a/tools/python/setup.py
++++ b/tools/python/setup.py
+@@ -5,6 +5,7 @@
+ XEN_ROOT = "../.."
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../.." ]
+
+ include_dirs = [ XEN_ROOT + "/tools/libxc",
+ XEN_ROOT + "/tools/xenstore",
+@@ -19,6 +20,7 @@
+
+ xc = Extension("xc",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [
"xen/lowlevel/xc" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -26,6 +28,7 @@
+
+ xs = Extension("xs",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [
"xen/lowlevel/xs" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -33,6 +36,7 @@
+
+ scf = Extension("scf",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [
"xen/lowlevel/scf" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -40,6 +44,7 @@
+
+ acm = Extension("acm",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [
"xen/lowlevel/acm" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -47,6 +52,7 @@
+
+ flask = Extension("flask",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [
"xen/lowlevel/flask" ] +
+ [
"../flask/libflask/include" ],
+ library_dirs = library_dirs + [
"../flask/libflask" ],
+@@ -55,6 +61,7 @@
+
+ ptsname = Extension("ptsname",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [ "ptsname" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
Copied and modified:
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff (from r623,
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff)
=============================================================================---
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff Sun May
10 13:53:51 2009 (r623, copy source)
+++ trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Sun May 10
14:59:28 2009 (r625)
@@ -1,6 +1,6 @@
---- xen-unstable.orig/tools/python/xen/xm/create.py
-+++ xen-unstable/tools/python/xen/xm/create.py
-@@ -599,6 +599,14 @@
+--- a/tools/python/xen/xm/create.py
++++ b/tools/python/xen/xm/create.py
+@@ -603,6 +603,14 @@
else:
return s
@@ -15,7 +15,7 @@
def configure_image(vals):
"""Create the image config.
"""
-@@ -606,11 +614,11 @@
+@@ -610,11 +618,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])
-@@ -851,7 +859,7 @@
+@@ -858,7 +866,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'',
-@@ -861,6 +869,8 @@
+@@ -868,6 +876,8 @@
for a in args:
if a in vals.__dict__ and vals.__dict__[a] is not None:
config_image.append([a, vals.__dict__[a]])
Copied and modified: trunk/xen-3/debian/patches/tools-rpath.diff (from r623,
trunk/xen-unstable/debian/patches/tools-rpath.diff)
=============================================================================---
trunk/xen-unstable/debian/patches/tools-rpath.diff Sun May 10 13:53:51 2009
(r623, copy source)
+++ trunk/xen-3/debian/patches/tools-rpath.diff Sun May 10 14:59:28 2009 (r625)
@@ -1,5 +1,5 @@
---- xen-unstable.orig/tools/Rules.mk
-+++ xen-unstable/tools/Rules.mk
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
@@ -5,6 +5,8 @@
include $(XEN_ROOT)/Config.mk
@@ -9,223 +9,3 @@
XEN_INCLUDE = $(XEN_ROOT)/tools/include
XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
XEN_LIBXC = $(XEN_ROOT)/tools/libxc
---- xen-unstable.orig/tools/python/setup.py
-+++ xen-unstable/tools/python/setup.py
-@@ -5,6 +5,7 @@
- XEN_ROOT = "../.."
-
- extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
-+extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../.." ]
-
- include_dirs = [ XEN_ROOT + "/tools/libxc",
- XEN_ROOT + "/tools/xenstore",
-@@ -19,6 +20,7 @@
-
- xc = Extension("xc",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/xc" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -26,6 +28,7 @@
-
- xs = Extension("xs",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/xs" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -33,6 +36,7 @@
-
- scf = Extension("scf",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/scf" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -40,6 +44,7 @@
-
- acm = Extension("acm",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/acm" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -47,6 +52,7 @@
-
- flask = Extension("flask",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/flask" ] +
- [
"../flask/libflask/include" ],
- library_dirs = library_dirs + [
"../flask/libflask" ],
-@@ -55,6 +61,7 @@
-
- ptsname = Extension("ptsname",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [ "ptsname" ],
- library_dirs = library_dirs,
- libraries = libraries,
---- xen-unstable.orig/tools/ioemu/Makefile.target
-+++ xen-unstable/tools/ioemu/Makefile.target
-@@ -536,6 +536,8 @@
- VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld
- endif
-
-+VL_LDFLAGS+=$(call LDFLAGS_RPATH,../lib)
-+
- ifdef CONFIG_WIN32
- SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
- endif
---- xen-unstable.orig/tools/libxc/Makefile
-+++ xen-unstable/tools/libxc/Makefile
-@@ -139,7 +139,7 @@
- ln -sf $< $@
-
- libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS)
-
- # libxenguest
-
-@@ -152,7 +152,7 @@
- ln -sf $< $@
-
- libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl
$(PTHREAD_LIBS)
-
- -include $(DEPS)
-
---- xen-unstable.orig/tools/xcutils/Makefile
-+++ xen-unstable/tools/xcutils/Makefile
-@@ -20,7 +20,7 @@
-
- PROGRAMS = xc_restore xc_save readnotes lsevtchn
-
--LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
-+LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
$(call LDFLAGS_RPATH,../lib)
-
- .PHONY: all
- all: build
---- xen-unstable.orig/tools/xenstat/xentop/Makefile
-+++ xen-unstable/tools/xenstat/xentop/Makefile
-@@ -20,6 +20,7 @@
-
- CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
- LDFLAGS += -L$(XEN_LIBXENSTAT)
-+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
- LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
- CFLAGS += -DHOST_$(XEN_OS)
-
---- xen-unstable.orig/tools/misc/Makefile
-+++ xen-unstable/tools/misc/Makefile
-@@ -50,4 +50,4 @@
- $(CC) -c $(CFLAGS) -o $@ $<
-
- xenperf: %: %.o Makefile
-- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl)
-+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) $(call
LDFLAGS_RPATH,../lib)
---- xen-unstable.orig/tools/xentrace/Makefile
-+++ xen-unstable/tools/xentrace/Makefile
-@@ -5,6 +5,7 @@
-
- CFLAGS += $(CFLAGS_libxenctrl)
- LDFLAGS += $(LDFLAGS_libxenctrl)
-+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
-
- HDRS = $(wildcard *.h)
- OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
---- xen-unstable.orig/tools/console/Makefile
-+++ xen-unstable/tools/console/Makefile
-@@ -8,6 +8,7 @@
- CFLAGS += $(CFLAGS_libxenstore)
- LDFLAGS += $(LDFLAGS_libxenctrl)
- LDFLAGS += $(LDFLAGS_libxenstore)
-+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
-
- BIN = xenconsoled xenconsole
-
---- xen-unstable.orig/tools/xenmon/Makefile
-+++ xen-unstable/tools/xenmon/Makefile
-@@ -17,6 +17,7 @@
- CFLAGS += -I $(XEN_XC)
- CFLAGS += $(CFLAGS_libxenctrl)
- LDFLAGS += $(LDFLAGS_libxenctrl)
-+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
-
- BIN = xentrace_setmask xenbaked
- SCRIPTS = xenmon.py
---- xen-unstable.orig/tools/libfsimage/Rules.mk
-+++ xen-unstable/tools/libfsimage/Rules.mk
-@@ -4,6 +4,7 @@
-
- CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -Wp,-MD,.$(@F).d
- LDFLAGS += -L../common/
-+LDFLAGS += $(call LDFLAGS_RPATH,../..)
-
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-
---- xen-unstable.orig/tools/xenstore/Makefile
-+++ xen-unstable/tools/xenstore/Makefile
-@@ -12,6 +12,9 @@
- CFLAGS += -Wp,-MD,.$(@F).d
- DEP = .*.d
-
-+LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib)
-+LDFLAGS_libxenstore = -L. -lxenstore $(call LDFLAGS_RPATH,../lib)
-+
- CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm
xenstore-chmod
- CLIENTS += xenstore-write xenstore-ls
-
-@@ -55,10 +58,10 @@
- ln -f xenstore $@
-
- xenstore: xenstore_client.o $(LIBXENSTORE)
-- $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $< $(LDFLAGS_libxenstore) $(SOCKET_LIBS) -o $@
-
- xenstore-control: xenstore_control.o $(LIBXENSTORE)
-- $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $< $(LDFLAGS_libxenstore) $(SOCKET_LIBS) -o $@
-
- xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
---- xen-unstable.orig/tools/pygrub/setup.py
-+++ xen-unstable/tools/pygrub/setup.py
-@@ -4,11 +4,13 @@
- import sys
-
- extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
-+extra_link_args = [ "-Wl,-rpath,${ORIGIN}/.." ]
-
- XEN_ROOT = "../.."
-
- fsimage = Extension("fsimage",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
- library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
- libraries = ["fsimage"],
---- xen-unstable.orig/tools/blktap/lib/Makefile
-+++ xen-unstable/tools/blktap/lib/Makefile
-@@ -9,6 +9,7 @@
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenstore)
- LDFLAGS += $(LDFLAGS_libxenstore)
-+LDFLAGS += $(call LDFLAGS_RPATH)
-
- 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
Added: trunk/xen-3/debian/patches/tools-xcutils-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xcutils-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,11 @@
+--- a/tools/xcutils/Makefile
++++ b/tools/xcutils/Makefile
+@@ -20,7 +20,7 @@
+
+ PROGRAMS = xc_restore xc_save readnotes lsevtchn
+
+-LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
++LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
$(call LDFLAGS_RPATH,../lib)
+
+ .PHONY: all
+ all: build
Added: trunk/xen-3/debian/patches/tools-xenmon-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xenmon-prefix.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,17 @@
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
+@@ -29,10 +29,10 @@
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked
+- $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask
+- $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(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
+
Added: trunk/xen-3/debian/patches/tools-xenmon-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xenmon-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,10 @@
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
+@@ -17,6 +17,7 @@
+ CFLAGS += -I $(XEN_XC)
+ CFLAGS += $(CFLAGS_libxenctrl)
+ LDFLAGS += $(LDFLAGS_libxenctrl)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ BIN = xentrace_setmask xenbaked
+ SCRIPTS = xenmon.py
Added: trunk/xen-3/debian/patches/tools-xenstat-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xenstat-prefix.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,13 @@
+--- a/tools/xenstat/xentop/Makefile
++++ b/tools/xenstat/xentop/Makefile
+@@ -28,8 +28,8 @@
+
+ .PHONY: install
+ install: xentop xentop.1
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PROG) xentop $(DESTDIR)$(PRIVATE_BINDIR)/xentop
+ $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+ $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1
+
Added: trunk/xen-3/debian/patches/tools-xenstat-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xenstat-rpath.diff Sun May 10 14:59:28 2009
(r625)
@@ -0,0 +1,10 @@
+--- a/tools/xenstat/xentop/Makefile
++++ b/tools/xenstat/xentop/Makefile
+@@ -20,6 +20,7 @@
+
+ CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
+ LDFLAGS += -L$(XEN_LIBXENSTAT)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+ LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
+ CFLAGS += -DHOST_$(XEN_OS)
+
Added: trunk/xen-3/debian/patches/tools-xenstore-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xenstore-prefix.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,22 @@
+--- a/tools/xenstore/Makefile
++++ b/tools/xenstore/Makefile
+@@ -96,14 +96,14 @@
+ install: all
+ $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+- $(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)/usr/bin
++ $(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 \
+- ln -f $(DESTDIR)/usr/bin/xenstore $(DESTDIR)/usr/bin/$${c} ; \
++ ln -f xenstore $(DESTDIR)$(SBINDIR)/$${c} ; \
+ done
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
Added: trunk/xen-3/debian/patches/tools-xenstore-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xenstore-rpath.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,11 @@
+--- a/tools/xenstore/Makefile
++++ b/tools/xenstore/Makefile
+@@ -12,6 +12,8 @@
+ CFLAGS += -Wp,-MD,.$(@F).d
+ DEP = .*.d
+
++LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib)
++
+ CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm
xenstore-chmod
+ CLIENTS += xenstore-write xenstore-ls
+
Added: trunk/xen-3/debian/patches/tools-xentrace-prefix.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xentrace-prefix.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,17 @@
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
+@@ -35,12 +35,10 @@
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+- [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
+- $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+- [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PROG) $(BIN) $(LIBBIN) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
+ $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
+
Added: trunk/xen-3/debian/patches/tools-xentrace-rpath.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xentrace-rpath.diff Sun May 10 14:59:28
2009 (r625)
@@ -0,0 +1,10 @@
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
+@@ -5,6 +5,7 @@
+
+ CFLAGS += $(CFLAGS_libxenctrl)
+ LDFLAGS += $(LDFLAGS_libxenctrl)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ HDRS = $(wildcard *.h)
+ OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
Copied and modified: trunk/xen-3/debian/patches/version.patch (from r623,
trunk/xen-unstable/debian/patches/version.patch)
=============================================================================---
trunk/xen-unstable/debian/patches/version.patch Sun May 10 13:53:51 2009 (r623,
copy source)
+++ trunk/xen-3/debian/patches/version.patch Sun May 10 14:59:28 2009 (r625)
@@ -5,8 +5,8 @@
## DP: No description.
@DPATCH@
---- xen-unstable.orig/xen/Makefile
-+++ xen-unstable/xen/Makefile
+--- a/xen/Makefile
++++ b/xen/Makefile
@@ -84,17 +84,16 @@
include/xen/compile.h: include/xen/compile.h.in .banner
@sed -e ''s/@@date@@/$(shell LC_ALL=C date)/g'' \
@@ -14,7 +14,7 @@
- -e ''s/@@whoami@@/$(XEN_WHOAMI)/g'' \
- -e ''s/@@domain@@/$(XEN_DOMAIN)/g'' \
- -e ''s/@@hostname@@/$(shell hostname)/g'' \
- -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep
-i "gcc.*version")!g'' \
+ -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | tail
-1)!g'' \
-e ''s/@@version@@/$(XEN_VERSION)/g'' \
-e ''s/@@subversion@@/$(XEN_SUBVERSION)/g'' \
-e ''s/@@extraversion@@/$(XEN_EXTRAVERSION)/g'' \
@@ -29,9 +29,9 @@
@mv -f $@.new $@
include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
---- xen-unstable.orig/xen/common/kernel.c
-+++ xen-unstable/xen/common/kernel.c
-@@ -159,8 +159,8 @@
+--- a/xen/common/kernel.c
++++ b/xen/common/kernel.c
+@@ -158,8 +158,8 @@
{
struct xen_compile_info info;
safe_strcpy(info.compiler, xen_compiler());
@@ -42,9 +42,9 @@
safe_strcpy(info.compile_date, xen_compile_date());
if ( copy_to_guest(arg, &info, 1) )
return -EFAULT;
---- xen-unstable.orig/xen/common/version.c
-+++ xen-unstable/xen/common/version.c
-@@ -10,19 +10,24 @@
+--- a/xen/common/version.c
++++ b/xen/common/version.c
+@@ -11,19 +11,24 @@
return XEN_COMPILE_TIME;
}
@@ -75,7 +75,7 @@
}
const char *xen_compiler(void)
-@@ -50,7 +55,3 @@
+@@ -51,7 +56,3 @@
return XEN_CHANGESET;
}
@@ -83,9 +83,9 @@
-{
- return XEN_BANNER;
-}
---- xen-unstable.orig/xen/drivers/char/console.c
-+++ xen-unstable/xen/drivers/char/console.c
-@@ -552,14 +552,11 @@
+--- a/xen/drivers/char/console.c
++++ b/xen/drivers/char/console.c
+@@ -560,14 +560,11 @@
serial_set_rx_handler(sercon_handle, serial_rx);
/* HELLO WORLD --- start-of-day banner text. */
@@ -103,8 +103,8 @@
if ( opt_sync_console )
{
---- xen-unstable.orig/xen/include/xen/compile.h.in
-+++ xen-unstable/xen/include/xen/compile.h.in
+--- a/xen/include/xen/compile.h.in
++++ b/xen/include/xen/compile.h.in
@@ -1,8 +1,9 @@
#define XEN_COMPILE_DATE "@@date@@"
#define XEN_COMPILE_TIME "@@time@@"
@@ -123,8 +123,8 @@
#define XEN_CHANGESET "@@changeset@@"
-#define XEN_BANNER \
---- xen-unstable.orig/xen/include/xen/version.h
-+++ xen-unstable/xen/include/xen/version.h
+--- a/xen/include/xen/version.h
++++ b/xen/include/xen/version.h
@@ -3,14 +3,14 @@
const char *xen_compile_date(void);