Bastian Blank
2009-May-26 20:46 UTC
[Pkg-xen-changes] r645 - in trunk/xen-3/debian: . patches
Author: waldi
Date: Tue May 26 20:46:07 2009
New Revision: 645
Log:
* debian/changelog: Set version to 3.4.0-1.
* debian/patches: Update.
Modified:
trunk/xen-3/debian/changelog
trunk/xen-3/debian/patches/config-prefix.diff
trunk/xen-3/debian/patches/tools-blktap-crypto.patch
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-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-libfsimage-abiname.diff
trunk/xen-3/debian/patches/tools-libfsimage-prefix.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-prefix.diff
trunk/xen-3/debian/patches/tools-misc-rpath.diff
trunk/xen-3/debian/patches/tools-misc-xend-startup.diff
trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
trunk/xen-3/debian/patches/tools-python-prefix.diff
trunk/xen-3/debian/patches/tools-python-rpath.diff
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-3/debian/patches/tools-rpath.diff
trunk/xen-3/debian/patches/tools-xcutils-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/version.patch
Modified: trunk/xen-3/debian/changelog
=============================================================================---
trunk/xen-3/debian/changelog Tue May 26 19:25:08 2009 (r644)
+++ trunk/xen-3/debian/changelog Tue May 26 20:46:07 2009 (r645)
@@ -1,4 +1,4 @@
-xen-3 (3.3.1-1) UNRELEASED; urgency=low
+xen-3 (3.4.0-1) UNRELEASED; urgency=low
[ Bastian Blank ]
* New upstream version.
Modified: trunk/xen-3/debian/patches/config-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/config-prefix.diff Tue May 26 19:25:08 2009 (r644)
+++ trunk/xen-3/debian/patches/config-prefix.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,13 +1,19 @@
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
-@@ -25,16 +25,15 @@
+@@ -24,21 +24,17 @@
+ PREFIX ?= /usr
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
- LIBLEAFDIR = lib
+-LIBLEAFDIR = lib
+-LIBLEAFDIR_x86_32 = lib
-LIBLEAFDIR_x86_64 = lib64
- LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
+-LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
+-LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32)
-LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64)
- MANDIR = $(PREFIX)/share/man
+-LIBEXEC = $(LIBDIR_x86_32)/xen/bin
++LIBDIR = $(PREFIX)/lib
+ SHAREDIR = $(PREFIX)/share
+ MANDIR = $(SHAREDIR)/man
MAN1DIR = $(MANDIR)/man1
MAN8DIR = $(MANDIR)/man8
SBINDIR = $(PREFIX)/sbin
@@ -16,6 +22,7 @@
+PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
++LIBEXEC = $(PRIVATE_LIBDIR)
SOCKET_LIBS CURSES_LIBS = -lncurses
@@ -33,3 +40,19 @@
# Use only if calling $(LD) directly.
ifeq ($(XEN_OS),OpenBSD)
LDFLAGS_DIRECT += -melf_x86_64_obsd
+--- a/Config.mk
++++ b/Config.mk
+@@ -32,11 +32,11 @@
+
+ ifneq ($(EXTRA_PREFIX),)
+ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
+-EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR)
++EXTRA_LIB += $(EXTRA_LIBDIR)
+ endif
+
+ PYTHON ?= python
+-PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
++PYTHON_PREFIX_ARG ?= --home="$(PRIVATE_PREFIX)"
+ # The above requires that PREFIX contains *no spaces*. This variable is here
+ # to permit the user to set PYTHON_PREFIX_ARG to '''' to
workaround this bug:
+ # https://bugs.launchpad.net/ubuntu/+bug/362570
Modified: trunk/xen-3/debian/patches/tools-blktap-crypto.patch
=============================================================================---
trunk/xen-3/debian/patches/tools-blktap-crypto.patch Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-blktap-crypto.patch Tue May 26 20:46:07
2009 (r645)
@@ -1,27 +1,21 @@
-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
+--- a/tools/blktap/drivers/Makefile
++++ b/tools/blktap/drivers/Makefile
+@@ -13,13 +13,8 @@
+ CFLAGS += -I $(LIBAIO_DIR)
+ CFLAGS += -D_GNU_SOURCE
+
+-ifeq ($(shell . ./check_gcrypt $(CC)),yes)
+ CFLAGS += -DUSE_GCRYPT
+ CRYPT_LIB := -lgcrypt
-else
-CRYPT_LIB := -lcrypto
--$(warning *** libgcrypt not installed: falling back to libcrypto ***)
+-$(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
+ LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(call
LDFLAGS_RPATH,../lib) -L../lib -lblktap
+ LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
+--- a/tools/blktap/drivers/block-qcow.c
++++ b/tools/blktap/drivers/block-qcow.c
@@ -33,6 +33,7 @@
#include <zlib.h>
#include <inttypes.h>
@@ -30,7 +24,7 @@
#include "bswap.h"
#include "aes.h"
#include "tapdisk.h"
-@@ -145,10 +146,6 @@ struct tdqcow_state {
+@@ -145,10 +146,6 @@
static int decompress_cluster(struct tdqcow_state *s, uint64_t
cluster_offset);
@@ -41,11 +35,10 @@
static uint32_t gen_cksum(char *ptr, int len)
{
int i;
-@@ -169,41 +166,6 @@ static uint32_t gen_cksum(char *ptr, int
-
+@@ -170,41 +167,6 @@
return md[0];
}
--
+
-#else /* use libcrypto */
-
-#include <openssl/md5.h>
@@ -80,12 +73,12 @@
-}
-
-#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
+ int fd;
+--- a/tools/blktap/drivers/check_gcrypt
++++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
@@ -101,9 +94,8 @@
-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
+--- a/tools/check/check_crypto_lib
++++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# CHECK-BUILD CHECK-INSTALL
@@ -116,9 +108,8 @@
-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
+--- a/tools/check/check_openssl_devel
++++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# CHECK-BUILD
Modified: trunk/xen-3/debian/patches/tools-blktap-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-blktap-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-blktap-prefix.diff Tue May 26 20:46:07 2009
(r645)
@@ -18,7 +18,7 @@
.PHONY: clean
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
-@@ -56,7 +56,7 @@
+@@ -52,7 +52,7 @@
$(CC) $(CFLAGS) -o $* $^ $(LDFLAGS) $(LDFLAGS_img)
install: all
Modified: trunk/xen-3/debian/patches/tools-blktap-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-blktap-rpath.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-blktap-rpath.diff Tue May 26 20:46:07 2009
(r645)
@@ -10,8 +10,8 @@
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 ***)
+@@ -21,7 +21,7 @@
+ $(warning === libgcrypt not installed: falling back to libcrypto ===)
endif
-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib
-lblktap
Modified: trunk/xen-3/debian/patches/tools-console-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-console-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-console-prefix.diff Tue May 26 20:46:07
2009 (r645)
@@ -1,6 +1,6 @@
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
-@@ -29,7 +29,5 @@
+@@ -29,9 +29,7 @@
.PHONY: install
install: $(BIN)
@@ -9,3 +9,5 @@
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- $(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)$(PRIVATE_BINDIR)
+
+ -include $(DEPS)
Modified: trunk/xen-3/debian/patches/tools-firmware-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-firmware-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-firmware-prefix.diff Tue May 26 20:46:07
2009 (r645)
@@ -1,10 +1,10 @@
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
-@@ -4,7 +4,7 @@
+@@ -3,7 +3,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)$(LIBDIR_x86_32)/xen/boot
+INST_DIR := $(DESTDIR)$(PRIVATE_PREFIX)/boot
SUBDIRS :
Modified: trunk/xen-3/debian/patches/tools-flask-abiname.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-flask-abiname.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-flask-abiname.diff Tue May 26 20:46:07 2009
(r645)
@@ -7,7 +7,7 @@
XEN_ROOT = ../../..
include $(XEN_ROOT)/tools/Rules.mk
-@@ -22,7 +19,7 @@
+@@ -21,7 +18,7 @@
PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
LIB := libflask.a
@@ -16,7 +16,7 @@
.PHONY: all
all: build
-@@ -35,10 +32,8 @@
+@@ -34,10 +31,8 @@
install: build
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -28,7 +28,7 @@
$(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
.PHONY: TAGS
-@@ -54,12 +49,7 @@
+@@ -53,12 +48,7 @@
libflask.a: $(LIB_OBJS)
$(AR) rc $@ $^
Modified: trunk/xen-3/debian/patches/tools-flask-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-flask-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-flask-prefix.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,6 +1,6 @@
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
-@@ -33,12 +33,12 @@
+@@ -32,12 +32,12 @@
.PHONY: install
install: build
Modified: trunk/xen-3/debian/patches/tools-libfsimage-abiname.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libfsimage-abiname.diff Tue May 26 19:25:08
2009 (r644)
+++ trunk/xen-3/debian/patches/tools-libfsimage-abiname.diff Tue May 26 20:46:07
2009 (r645)
@@ -7,10 +7,10 @@
-MAJOR = 1.0
-MINOR = 0
-
- CFLAGS += -Werror -Wp,-MD,.$(@F).d
-DLIBDIR="\"$(LIBDIR)\""
- DEPS = .*.d
+ CFLAGS += -DLIBDIR="\"$(LIBDIR)\""
-@@ -15,7 +12,7 @@
+ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
+@@ -14,7 +11,7 @@
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
@@ -19,7 +19,7 @@
.PHONY: all
all: $(LIB)
-@@ -24,9 +21,7 @@
+@@ -23,9 +20,7 @@
install: all
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -30,7 +30,7 @@
$(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
-@@ -34,13 +29,8 @@
+@@ -33,13 +28,8 @@
clean distclean:
rm -f $(PIC_OBJS) $(LIB) $(DEPS)
Modified: trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff Tue May 26 20:46:07
2009 (r645)
@@ -1,6 +1,6 @@
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
-@@ -7,12 +7,7 @@
+@@ -5,12 +5,7 @@
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
@@ -16,16 +16,16 @@
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
-@@ -4,7 +4,7 @@
+@@ -4,6 +4,8 @@
MAJOR = 1.0
MINOR = 0
--CFLAGS += -Werror -Wp,-MD,.$(@F).d
-+CFLAGS += -Werror -Wp,-MD,.$(@F).d
-DLIBDIR="\"$(LIBDIR)\""
- DEPS = .*.d
-
++CFLAGS += -DLIBDIR="\"$(LIBDIR)\""
++
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
-@@ -22,11 +22,11 @@
+ LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
+ LDFLAGS = $(LDFLAGS-y)
+@@ -19,11 +21,11 @@
.PHONY: install
install: all
Modified: trunk/xen-3/debian/patches/tools-libfsimage-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libfsimage-rpath.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-libfsimage-rpath.diff Tue May 26 20:46:07
2009 (r645)
@@ -1,8 +1,8 @@
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
-@@ -4,6 +4,7 @@
+@@ -2,6 +2,7 @@
- CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -Wp,-MD,.$(@F).d
+ CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror
LDFLAGS += -L../common/
+LDFLAGS += $(call LDFLAGS_RPATH,../..)
Modified: trunk/xen-3/debian/patches/tools-libxc-abiname.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libxc-abiname.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-libxc-abiname.diff Tue May 26 20:46:07 2009
(r645)
@@ -4,13 +4,13 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
--MAJOR = 3.2
+-MAJOR = 3.4
-MINOR = 0
-
CTRL_SRCS-y : CTRL_SRCS-y += xc_core.c
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -74,12 +71,12 @@
+@@ -72,12 +69,12 @@
LIB := libxenctrl.a
ifneq ($(stubdom),y)
@@ -25,7 +25,7 @@
endif
.PHONY: all
-@@ -96,16 +93,12 @@
+@@ -94,16 +91,12 @@
install: build
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -44,7 +44,7 @@
$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
.PHONY: TAGS
-@@ -133,26 +126,16 @@
+@@ -131,26 +124,16 @@
libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
Modified: trunk/xen-3/debian/patches/tools-libxc-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libxc-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-libxc-prefix.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,6 +1,6 @@
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
-@@ -94,18 +94,18 @@
+@@ -92,18 +92,18 @@
.PHONY: install
install: build
Modified: trunk/xen-3/debian/patches/tools-libxc-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libxc-rpath.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-libxc-rpath.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,6 +1,6 @@
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
-@@ -139,7 +139,7 @@
+@@ -137,7 +137,7 @@
ln -sf $< $@
libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
@@ -9,7 +9,7 @@
# libxenguest
-@@ -152,7 +152,7 @@
+@@ -150,7 +150,7 @@
ln -sf $< $@
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
Modified: trunk/xen-3/debian/patches/tools-misc-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-misc-prefix.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,6 +1,6 @@
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
-@@ -18,13 +18,10 @@
+@@ -18,12 +18,10 @@
SUBDIRS-$(CONFIG_MINITERM) += miniterm
SUBDIRS := $(SUBDIRS-y)
@@ -8,17 +8,16 @@
-INSTALL_BIN-$(CONFIG_X86) += xen-detect
-INSTALL_BIN := $(INSTALL_BIN-y)
-
--INSTALL_SBIN-y := netfix xm xen-bugtool xen-python-path xend xenperf xsview
--INSTALL_SBIN-$(CONFIG_X86) += xenpm
+-INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview 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-$(CONFIG_X86) += xen-detect
++INSTALL_TARGETS-y += xm xen-bugtool xen-python-path xend xenperf xsview 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 @@
+@@ -39,10 +37,8 @@
.PHONY: install
install: build
@@ -44,35 +43,22 @@
clean:
--- a/tools/misc/xend
+++ b/tools/misc/xend
-@@ -33,15 +33,10 @@
+@@ -33,6 +33,8 @@
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
--- a/tools/misc/xm
+++ b/tools/misc/xm
-@@ -1,10 +1,7 @@
+@@ -1,6 +1,7 @@
#!/usr/bin/env python
# -*- mode: python; -*-
import sys
--
--# 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
- main.main(sys.argv)
Modified: trunk/xen-3/debian/patches/tools-misc-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-rpath.diff Tue May 26 19:25:08 2009 (r644)
+++ trunk/xen-3/debian/patches/tools-misc-rpath.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,8 +1,10 @@
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
-@@ -50,4 +50,4 @@
+@@ -50,6 +50,6 @@
$(CC) -c $(CFLAGS) -o $@ $<
xenperf xenpm: %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl)
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) $(call
LDFLAGS_RPATH,../lib)
+
+ -include $(DEPS)
Modified: trunk/xen-3/debian/patches/tools-misc-xend-startup.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-xend-startup.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-misc-xend-startup.diff Tue May 26 20:46:07
2009 (r645)
@@ -1,6 +1,6 @@
--- a/tools/misc/xend
+++ b/tools/misc/xend
-@@ -76,40 +76,6 @@
+@@ -75,40 +75,6 @@
if os.fork() == 0:
os.execvp(daemon, (daemon,) + args)
@@ -41,7 +41,7 @@
def main():
try:
check_logging()
-@@ -121,24 +87,14 @@
+@@ -120,24 +86,14 @@
if not sys.argv[1:]:
print ''usage: %s {start|stop|reload|restart}'' %
sys.argv[0]
elif sys.argv[1] == ''start'':
Modified: trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-pygrub-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-pygrub-prefix.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,29 +1,11 @@
---- a/tools/pygrub/Makefile
-+++ b/tools/pygrub/Makefile
-@@ -6,13 +6,12 @@
- all: build
- .PHONY: build
- build:
-- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
-+ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR=$(LIBDIR) python
setup.py build
-
- .PHONY: install
- ifndef XEN_PYTHON_NATIVE_INSTALL
--install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import
auxbin; print auxbin.libpath()")
- install: all
-- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix=""
--install-lib="$(DESTDIR)$(LIBPATH)/python"
-+ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR=$(LIBDIR) python
setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)"
--prefix="" --install-lib="$(DESTDIR)/usr/$(LIBDIR)/python"
--install-scripts=$(DESTDIR)/usr/$(BINDIR)
- $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
- else
- install: all
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
-@@ -21,7 +21,7 @@
+@@ -21,6 +21,8 @@
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
--sys.path = [ ''/usr/lib/python'',
''/usr/lib64/python'' ] + sys.path
+sys.path.insert(1, sys.path[0] + ''/../lib/python'')
-
++
import fsimage
import grub.GrubConf
+ import grub.LiloConf
Modified: trunk/xen-3/debian/patches/tools-python-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-python-prefix.diff Tue May 26 20:46:07 2009
(r645)
@@ -21,7 +21,7 @@
def execute(exe, args = None):
exepath = pathTo(exe)
-@@ -43,20 +35,12 @@
+@@ -47,20 +39,12 @@
def path():
@@ -48,20 +48,3 @@
- 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
Modified: trunk/xen-3/debian/patches/tools-python-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-rpath.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-python-rpath.diff Tue May 26 20:46:07 2009
(r645)
@@ -32,15 +32,15 @@
include_dirs = include_dirs + [
"xen/lowlevel/scf" ],
library_dirs = library_dirs,
libraries = libraries,
-@@ -40,6 +44,7 @@
-
+@@ -47,6 +51,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 @@
+@@ -54,6 +59,7 @@
flask = Extension("flask",
extra_compile_args = extra_compile_args,
@@ -48,7 +48,7 @@
include_dirs = include_dirs + [
"xen/lowlevel/flask" ] +
[
"../flask/libflask/include" ],
library_dirs = library_dirs + [
"../flask/libflask" ],
-@@ -55,6 +61,7 @@
+@@ -62,6 +68,7 @@
ptsname = Extension("ptsname",
extra_compile_args = extra_compile_args,
Modified: trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Tue May 26
19:25:08 2009 (r644)
+++ trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Tue May 26
20:46:07 2009 (r645)
@@ -1,6 +1,6 @@
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
-@@ -603,6 +603,14 @@
+@@ -639,6 +639,14 @@
else:
return s
@@ -15,7 +15,7 @@
def configure_image(vals):
"""Create the image config.
"""
-@@ -610,11 +618,11 @@
+@@ -646,11 +654,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])
-@@ -858,7 +866,7 @@
+@@ -925,7 +933,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'',
-@@ -868,6 +876,8 @@
+@@ -937,6 +945,8 @@
for a in args:
if a in vals.__dict__ and vals.__dict__[a] is not None:
config_image.append([a, vals.__dict__[a]])
Modified: trunk/xen-3/debian/patches/tools-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-rpath.diff Tue May 26 19:25:08 2009 (r644)
+++ trunk/xen-3/debian/patches/tools-rpath.diff Tue May 26 20:46:07 2009 (r645)
@@ -1,8 +1,8 @@
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
-@@ -5,6 +5,8 @@
-
- include $(XEN_ROOT)/Config.mk
+@@ -8,6 +8,8 @@
+ export _INSTALL := $(INSTALL)
+ INSTALL = $(XEN_ROOT)/tools/cross-install
+LDFLAGS_RPATH = -Wl,-rpath,''$${ORIGIN}$(if $(1),/$(1))''
+
Modified: trunk/xen-3/debian/patches/tools-xcutils-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-xcutils-rpath.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-xcutils-rpath.diff Tue May 26 20:46:07 2009
(r645)
@@ -1,6 +1,6 @@
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
-@@ -20,7 +20,7 @@
+@@ -16,7 +16,7 @@
PROGRAMS = xc_restore xc_save readnotes lsevtchn
Modified: trunk/xen-3/debian/patches/tools-xenstore-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-xenstore-prefix.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-xenstore-prefix.diff Tue May 26 20:46:07
2009 (r645)
@@ -1,6 +1,6 @@
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
-@@ -96,14 +96,14 @@
+@@ -92,14 +92,14 @@
install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
@@ -10,12 +10,12 @@
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
- $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
-- $(INSTALL_PROG) xenstore $(DESTDIR)/usr/bin
+- $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
+ $(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 $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
+ ln -f xenstore $(DESTDIR)$(SBINDIR)/$${c} ; \
done
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
Modified: trunk/xen-3/debian/patches/tools-xenstore-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-xenstore-rpath.diff Tue May 26 19:25:08 2009
(r644)
+++ trunk/xen-3/debian/patches/tools-xenstore-rpath.diff Tue May 26 20:46:07
2009 (r645)
@@ -1,8 +1,8 @@
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
-@@ -12,6 +12,8 @@
- CFLAGS += -Wp,-MD,.$(@F).d
- DEP = .*.d
+@@ -8,6 +8,8 @@
+ CFLAGS += -I.
+ CFLAGS += $(CFLAGS_libxenctrl)
+LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib)
+
Modified: trunk/xen-3/debian/patches/version.patch
=============================================================================---
trunk/xen-3/debian/patches/version.patch Tue May 26 19:25:08 2009 (r644)
+++ trunk/xen-3/debian/patches/version.patch Tue May 26 20:46:07 2009 (r645)
@@ -7,7 +7,7 @@
@DPATCH@
--- a/xen/Makefile
+++ b/xen/Makefile
-@@ -84,17 +84,16 @@
+@@ -85,17 +85,16 @@
include/xen/compile.h: include/xen/compile.h.in .banner
@sed -e ''s/@@date@@/$(shell LC_ALL=C date)/g'' \
-e ''s/@@time@@/$(shell LC_ALL=C date +%T)/g'' \
@@ -85,7 +85,7 @@
-}
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
-@@ -560,14 +560,11 @@
+@@ -578,14 +578,11 @@
serial_set_rx_handler(sercon_handle, serial_rx);
/* HELLO WORLD --- start-of-day banner text. */