[Pkg-xen-changes] [xen] 35/36: merge patched-develop into develop
Bastian Blank
waldi at moszumanska.debian.org
Sun Sep 7 09:27:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
waldi pushed a commit to branch develop
in repository xen.
commit 46928b5fc1cc5828d93ccd245342f842bd9859ca
Merge: 3de3399 2dec9f0
Author: Bastian Blank <waldi at debian.org>
Date: Sun Sep 7 11:10:27 2014 +0200
merge patched-develop into develop
Config.mk | 8 +-
MAINTAINERS | 11 +-
config.guess | 258 ++++++++-------
config.sub | 218 +++++++-----
debian/.git-dpm | 6 +-
debian/patches/0001-version.patch | 6 +-
debian/patches/0002-config-prefix.diff.patch | 24 +-
.../0003-tools-libfsimage-abiname.diff.patch | 2 +-
debian/patches/0004-tools-libxc-abiname.diff.patch | 2 +-
debian/patches/0005-tools-libxl-abiname.diff.patch | 2 +-
.../patches/0006-tools-xenstat-abiname.diff.patch | 2 +-
debian/patches/0007-tools-rpath.diff.patch | 2 +-
.../patches/0008-tools-blktap2-prefix.diff.patch | 2 +-
.../patches/0009-tools-console-prefix.diff.patch | 2 +-
.../0010-tools-libfsimage-prefix.diff.patch | 14 +-
.../patches/0011-tools-libfsimage-rpath.diff.patch | 21 --
...ff.patch => 0011-tools-libxl-prefix.diff.patch} | 2 +-
...iff.patch => 0012-tools-misc-prefix.diff.patch} | 19 +-
...f.patch => 0013-tools-pygrub-prefix.diff.patch} | 4 +-
debian/patches/0014-tools-misc-rpath.diff.patch | 22 --
...f.patch => 0014-tools-python-prefix.diff.patch} | 64 +++-
...f.patch => 0015-tools-xcutils-rpath.diff.patch} | 2 +-
debian/patches/0016-tools-python-prefix.diff.patch | 62 ----
...f.patch => 0016-tools-xenmon-prefix.diff.patch} | 18 +-
...atch => 0017-tools-xenpaging-prefix.diff.patch} | 2 +-
....patch => 0018-tools-xenstat-prefix.diff.patch} | 20 +-
...patch => 0019-tools-xenstore-prefix.diff.patch} | 21 +-
debian/patches/0020-tools-xenmon-rpath.diff.patch | 21 --
...patch => 0020-tools-xentrace-prefix.diff.patch} | 18 +-
...0021-tools-python-xen-relative-path.diff.patch} | 2 +-
...tch => 0022-tools-misc-xend-startup.diff.patch} | 2 +-
...le.diff.patch => 0023-tools-disable.diff.patch} | 2 +-
debian/patches/0023-tools-xenstat-rpath.diff.patch | 23 --
...tools-examples-xend-disable-network.diff.patch} | 2 +-
...ls-examples-xend-disable-relocation.diff.patch} | 2 +-
.../patches/0025-tools-xenstore-rpath.diff.patch | 22 --
...ols-pygrub-remove-static-solaris-support.patch} | 4 +-
...patch => 0027-tools-include-install.diff.patch} | 8 +-
.../patches/0027-tools-xentrace-rpath.diff.patch | 21 --
....patch => 0028-tools-xenmon-install.diff.patch} | 2 +-
...tch => 0029-tools-hotplug-udevrules.diff.patch} | 2 +-
....patch => 0030-tools-python-shebang.diff.patch} | 2 +-
...> 0031-tools-xenstore-compatibility.diff.patch} | 2 +-
...-send-xl-coredumps-var-lib-xen-dump-NAME.patch} | 2 +-
.../patches/0038-tools-ocaml-fix-build.diff.patch | 116 -------
...0-Set-library-path-to-multi-arch-location.patch | 36 --
debian/patches/series | 53 ++-
docs/misc/xen-command-line.markdown | 8 +
m4/ax_compare_version.m4 | 179 ++++++++++
stubdom/grub/mini-os.c | 3 +
tools/Rules.mk | 2 -
tools/blktap2/drivers/block-qcow.c | 2 +
tools/configure | 174 ++++++++++
tools/configure.ac | 7 +
tools/include/Makefile | 9 +-
tools/libxc/xc_dom.h | 8 +
tools/libxc/xc_dom_arm.c | 86 ++++-
tools/libxc/xc_dom_armzimageloader.c | 42 ++-
tools/libxc/xc_dom_core.c | 13 +-
tools/libxc/xc_private.c | 6 +-
tools/libxl/libxl.c | 3 +-
tools/libxl/libxl_arch.h | 11 +-
tools/libxl/libxl_arm.c | 72 +++-
tools/libxl/libxl_device.c | 3 +-
tools/libxl/libxl_dom.c | 8 +-
tools/libxl/libxl_fork.c | 2 +-
tools/libxl/libxl_json.c | 1 -
tools/libxl/libxl_numa.c | 5 +-
tools/libxl/libxl_save_callout.c | 6 +-
tools/libxl/libxl_utils.c | 5 +-
tools/libxl/libxl_x86.c | 13 +-
tools/ocaml/Makefile | 2 +-
tools/ocaml/Makefile.rules | 12 +-
tools/ocaml/libs/eventchn/Makefile | 1 -
tools/ocaml/libs/xc/Makefile | 1 -
tools/ocaml/xenstored/Makefile | 4 +-
tools/pygrub/examples/rhel-7-beta.grub2 | 118 +++++++
tools/pygrub/src/GrubConf.py | 4 +-
tools/pygrub/src/pygrub | 4 +-
tools/tests/x86_emulator/test_x86_emulator.c | 140 ++++----
xen/Makefile | 2 +-
xen/arch/arm/Rules.mk | 9 +
xen/arch/arm/arm32/head.S | 13 +-
xen/arch/arm/arm64/head.S | 13 +-
xen/arch/arm/domain.c | 25 +-
xen/arch/arm/domain_build.c | 23 +-
xen/arch/arm/guestcopy.c | 26 +-
xen/arch/arm/kernel.c | 2 +-
xen/arch/arm/p2m.c | 56 ++++
xen/arch/arm/psci.c | 12 +-
xen/arch/arm/time.c | 1 -
xen/arch/arm/traps.c | 366 +++++++++++++++++++--
xen/arch/arm/vgic.c | 11 +-
xen/arch/x86/acpi/boot.c | 2 +
xen/arch/x86/acpi/cpu_idle.c | 6 +
xen/arch/x86/cpu/amd.c | 5 +-
xen/arch/x86/cpu/common.c | 5 +-
xen/arch/x86/cpu/intel.c | 7 +
xen/arch/x86/cpu/mcheck/mce.c | 6 +-
xen/arch/x86/cpu/mcheck/mce_intel.c | 19 +-
xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++---
xen/arch/x86/cpu/mcheck/vmce.c | 4 +
xen/arch/x86/cpu/mwait-idle.c | 4 +-
xen/arch/x86/domain.c | 38 ++-
xen/arch/x86/domctl.c | 82 ++---
xen/arch/x86/efi/runtime.c | 9 +
xen/arch/x86/flushtlb.c | 3 +-
xen/arch/x86/hvm/hvm.c | 60 +++-
xen/arch/x86/hvm/i8254.c | 3 +-
xen/arch/x86/hvm/io.c | 2 +
xen/arch/x86/hvm/irq.c | 10 +-
xen/arch/x86/hvm/mtrr.c | 85 +++--
xen/arch/x86/hvm/rtc.c | 77 +++--
xen/arch/x86/hvm/svm/svm.c | 10 +-
xen/arch/x86/hvm/vmx/vmcs.c | 8 +-
xen/arch/x86/hvm/vmx/vmx.c | 22 +-
xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 +
xen/arch/x86/hvm/vpt.c | 40 ---
xen/arch/x86/i387.c | 17 +-
xen/arch/x86/irq.c | 4 +-
xen/arch/x86/microcode_amd.c | 2 +-
xen/arch/x86/mm.c | 4 +-
xen/arch/x86/mm/hap/hap.c | 9 +-
xen/arch/x86/mm/hap/nested_hap.c | 2 +-
xen/arch/x86/mm/mem_event.c | 32 ++
xen/arch/x86/mm/mem_sharing.c | 17 +-
xen/arch/x86/mm/p2m-pod.c | 6 +-
xen/arch/x86/mm/p2m.c | 47 ++-
xen/arch/x86/mm/shadow/common.c | 8 +-
xen/arch/x86/msi.c | 2 +-
xen/arch/x86/nmi.c | 14 +-
xen/arch/x86/time.c | 16 +-
xen/arch/x86/traps.c | 14 +-
xen/arch/x86/x86_64/compat/traps.c | 14 +-
xen/arch/x86/x86_emulate/x86_emulate.c | 33 +-
xen/common/compat/multicall.c | 2 +-
xen/common/cpupool.c | 18 +-
xen/common/device_tree.c | 9 +-
xen/common/domain.c | 67 ++--
xen/common/domctl.c | 18 +-
xen/common/event_channel.c | 4 +-
xen/common/kexec.c | 4 +-
xen/common/kimage.c | 1 +
xen/common/lz4/decompress.c | 8 +
xen/common/memory.c | 9 +-
xen/common/multicall.c | 6 +-
xen/common/page_alloc.c | 5 +
xen/common/schedule.c | 3 +-
xen/common/timer.c | 3 +-
xen/common/tmem.c | 2 -
xen/common/trace.c | 2 +-
xen/common/xmalloc_tlsf.c | 5 +-
xen/drivers/acpi/apei/Makefile | 1 +
xen/drivers/acpi/apei/erst.c | 12 +-
xen/drivers/acpi/apei/hest.c | 200 +++++++++++
xen/drivers/acpi/tables.c | 6 +
xen/drivers/char/console.c | 4 +-
xen/drivers/passthrough/amd/iommu_map.c | 5 +-
xen/drivers/passthrough/amd/pci_amd_iommu.c | 2 +-
xen/drivers/passthrough/ats.h | 3 +-
xen/drivers/passthrough/iommu.c | 10 +-
xen/drivers/passthrough/pci.c | 228 +++++++++++++
xen/drivers/passthrough/vtd/dmar.c | 10 +
xen/drivers/passthrough/vtd/extern.h | 2 +-
xen/drivers/passthrough/vtd/iommu.c | 110 ++++---
xen/drivers/passthrough/vtd/qinval.c | 2 +-
xen/drivers/passthrough/vtd/quirks.c | 124 ++++++-
xen/drivers/passthrough/vtd/x86/ats.c | 37 ++-
xen/drivers/passthrough/x86/ats.c | 3 +-
xen/drivers/pci/pci.c | 29 +-
xen/include/acpi/actbl1.h | 8 +
xen/include/acpi/apei.h | 3 +
xen/include/asm-arm/arm32/page.h | 7 +-
xen/include/asm-arm/arm64/page.h | 7 +-
xen/include/asm-arm/arm64/vfp.h | 5 +-
xen/include/asm-arm/bitops.h | 37 ++-
xen/include/asm-arm/cpregs.h | 37 ++-
xen/include/asm-arm/domain.h | 3 +
xen/include/asm-arm/mm.h | 7 +-
xen/include/asm-arm/p2m.h | 4 +
xen/include/asm-arm/page.h | 4 +
xen/include/asm-arm/processor.h | 39 ++-
xen/include/asm-arm/sysregs.h | 44 +++
xen/include/asm-x86/cpufeature.h | 1 +
xen/include/asm-x86/hvm/hvm.h | 31 +-
xen/include/asm-x86/hvm/vmx/vmcs.h | 2 +
xen/include/asm-x86/hvm/vpt.h | 6 +-
xen/include/asm-x86/i387.h | 1 +
xen/include/asm-x86/mem_event.h | 3 +
xen/include/asm-x86/p2m.h | 4 +-
xen/include/public/arch-arm.h | 3 +-
xen/include/public/xen.h | 10 +-
xen/include/xen/acpi.h | 1 +
xen/include/xen/hvm/iommu.h | 6 -
xen/include/xen/pci.h | 3 +
xen/include/xen/pci_ids.h | 9 +
xen/include/xen/pci_regs.h | 11 +-
xen/include/xen/prefetch.h | 13 +-
xen/include/xen/sched.h | 28 +-
xen/include/xen/trace.h | 2 +-
200 files changed, 3392 insertions(+), 1405 deletions(-)
diff --cc debian/.git-dpm
index 1b31912,0000000..57ffd32
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 071ee641afc48f40b8052c77c5eb1e4086297654
- 071ee641afc48f40b8052c77c5eb1e4086297654
- 960b45d65509eb156ccdac8f50a31ffa28e963a1
++2dec9f02a44a006887469c80a7649c31bb518899
++2dec9f02a44a006887469c80a7649c31bb518899
++3387be132d526263f246c24d3bbc94767a4eba76
+3387be132d526263f246c24d3bbc94767a4eba76
+xen_4.4.1.orig.tar.xz
+900ed093d14caf511fa1a22f48bbf0499bb2ee11
+3778516
diff --cc debian/patches/0001-version.patch
index 2f712fd,0000000..c9cd1bf
mode 100644,000000..100644
--- a/debian/patches/0001-version.patch
+++ b/debian/patches/0001-version.patch
@@@ -1,170 -1,0 +1,170 @@@
- From 3af76d3edaea67658163e3d1fc8c1ed3a70a31ae Mon Sep 17 00:00:00 2001
++From aef970480394e4c6da1f1299e1558c405cfc4f32 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:43 +0200
+Subject: version
+
+ at DPATCH@
+---
+ xen/Makefile | 11 +++++------
+ xen/common/kernel.c | 4 ++--
+ xen/common/version.c | 21 +++++++++++----------
+ xen/drivers/char/console.c | 9 +++------
+ xen/include/xen/compile.h.in | 8 ++++----
+ xen/include/xen/version.h | 8 ++++----
+ 6 files changed, 29 insertions(+), 32 deletions(-)
+
+diff --git a/xen/Makefile b/xen/Makefile
- index 39839a3..dc41ffe 100644
++index 134a8bd..10d1424 100644
+--- a/xen/Makefile
++++ b/xen/Makefile
+@@ -122,20 +122,19 @@ delete-unfresh-files:
+ @mv -f $@.tmp $@
+
+ # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
+-include/xen/compile.h: include/xen/compile.h.in .banner
++include/xen/compile.h: include/xen/compile.h.in
+ @sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
+ -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \
+- -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \
+- -e 's/@@domain@@/$(XEN_DOMAIN)/g' \
+- -e 's/@@hostname@@/$(shell hostname)/g' \
+ -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \
+ -e 's/@@version@@/$(XEN_VERSION)/g' \
+ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
+ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
+ -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "unavailable")!g' \
++ -e 's/@@system_distribution@@/$(shell lsb_release -is)/g' \
++ -e 's/@@system_maintainer_domain@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<[^@>]*@\([^>]*\)>,\1,p')/g' \
++ -e 's/@@system_maintainer_local@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^@>]*\)@.*>,\1,p')/g' \
++ -e 's/@@system_version@@/$(shell cd ../../../..; dpkg-parsechangelog | awk '/^Version:/ {print $$2}')/g' \
+ < include/xen/compile.h.in > $@.new
+- @cat .banner
+- @$(PYTHON) tools/fig-to-oct.py < .banner >> $@.new
+ @mv -f $@.new $@
+
+ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
+diff --git a/xen/common/kernel.c b/xen/common/kernel.c
+index b371f8f..877d461 100644
+--- a/xen/common/kernel.c
++++ b/xen/common/kernel.c
+@@ -243,8 +243,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
+ {
+ struct xen_compile_info info;
+ safe_strcpy(info.compiler, xen_compiler());
+- safe_strcpy(info.compile_by, xen_compile_by());
+- safe_strcpy(info.compile_domain, xen_compile_domain());
++ safe_strcpy(info.compile_by, xen_compile_system_maintainer_local());
++ safe_strcpy(info.compile_domain, xen_compile_system_maintainer_domain());
+ safe_strcpy(info.compile_date, xen_compile_date());
+ if ( copy_to_guest(arg, &info, 1) )
+ return -EFAULT;
+diff --git a/xen/common/version.c b/xen/common/version.c
+index b152e27..7b5af55 100644
+--- a/xen/common/version.c
++++ b/xen/common/version.c
+@@ -11,19 +11,24 @@ const char *xen_compile_time(void)
+ return XEN_COMPILE_TIME;
+ }
+
+-const char *xen_compile_by(void)
++const char *xen_compile_system_distribution(void)
+ {
+- return XEN_COMPILE_BY;
++ return XEN_COMPILE_SYSTEM_DISTRIBUTION;
+ }
+
+-const char *xen_compile_domain(void)
++const char *xen_compile_system_maintainer_local(void)
+ {
+- return XEN_COMPILE_DOMAIN;
++ return XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL;
+ }
+
+-const char *xen_compile_host(void)
++const char *xen_compile_system_maintainer_domain(void)
+ {
+- return XEN_COMPILE_HOST;
++ return XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN;
++}
++
++const char *xen_compile_system_version(void)
++{
++ return XEN_COMPILE_SYSTEM_VERSION;
+ }
+
+ const char *xen_compiler(void)
+@@ -51,7 +56,3 @@ const char *xen_changeset(void)
+ return XEN_CHANGESET;
+ }
+
+-const char *xen_banner(void)
+-{
+- return XEN_BANNER;
+-}
+diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
- index 532c426..c561a91 100644
++index 89ffe64..07af8d6 100644
+--- a/xen/drivers/char/console.c
++++ b/xen/drivers/char/console.c
+@@ -667,14 +667,11 @@ void __init console_init_preirq(void)
+ serial_set_rx_handler(sercon_handle, serial_rx);
+
+ /* HELLO WORLD --- start-of-day banner text. */
+- spin_lock(&console_lock);
+- __putstr(xen_banner());
+- spin_unlock(&console_lock);
+- printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c %s\n",
++ printk("Xen version %d.%d%s (%s %s) (%s@%s) (%s) debug=%c %s\n",
+ xen_major_version(), xen_minor_version(), xen_extra_version(),
+- xen_compile_by(), xen_compile_domain(),
++ xen_compile_system_distribution(), xen_compile_system_version(),
++ xen_compile_system_maintainer_local(), xen_compile_system_maintainer_domain(),
+ xen_compiler(), debug_build() ? 'y' : 'n', xen_compile_date());
+- printk("Latest ChangeSet: %s\n", xen_changeset());
+
+ if ( opt_sync_console )
+ {
+diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in
+index 440ecb2..0c3ca58 100644
+--- 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@@"
+-#define XEN_COMPILE_BY "@@whoami@@"
+-#define XEN_COMPILE_DOMAIN "@@domain@@"
+-#define XEN_COMPILE_HOST "@@hostname@@"
++#define XEN_COMPILE_SYSTEM_DISTRIBUTION "@@system_distribution@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN "@@system_maintainer_domain@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL "@@system_maintainer_local@@"
++#define XEN_COMPILE_SYSTEM_VERSION "@@system_version@@"
+ #define XEN_COMPILER "@@compiler@@"
+
+ #define XEN_VERSION @@version@@
+@@ -10,4 +11,3 @@
+ #define XEN_EXTRAVERSION "@@extraversion@@"
+
+ #define XEN_CHANGESET "@@changeset@@"
+-#define XEN_BANNER \
+diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h
+index 81a3c7d..c25937e 100644
+--- a/xen/include/xen/version.h
++++ b/xen/include/xen/version.h
+@@ -3,14 +3,14 @@
+
+ const char *xen_compile_date(void);
+ const char *xen_compile_time(void);
+-const char *xen_compile_by(void);
+-const char *xen_compile_domain(void);
+-const char *xen_compile_host(void);
++const char *xen_compile_system_distribution(void);
++const char *xen_compile_system_maintainer_domain(void);
++const char *xen_compile_system_maintainer_local(void);
++const char *xen_compile_system_version(void);
+ const char *xen_compiler(void);
+ unsigned int xen_major_version(void);
+ unsigned int xen_minor_version(void);
+ const char *xen_extra_version(void);
+ const char *xen_changeset(void);
+-const char *xen_banner(void);
+
+ #endif /* __XEN_VERSION_H__ */
diff --cc debian/patches/0002-config-prefix.diff.patch
index 57d0c8e,0000000..a55f45e
mode 100644,000000..100644
--- a/debian/patches/0002-config-prefix.diff.patch
+++ b/debian/patches/0002-config-prefix.diff.patch
@@@ -1,50 -1,0 +1,56 @@@
- From 8b0bf3ad05a7e948baa42a05f65fa5ff7c7cc5be Mon Sep 17 00:00:00 2001
++From 537b771695548faab29f414a6c2a78f7851af7f8 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:45 +0200
+Subject: config-prefix.diff
+
+---
- Config.mk | 2 +-
- config/StdGNU.mk | 9 ++++++---
- 2 files changed, 7 insertions(+), 4 deletions(-)
++ Config.mk | 2 +-
++ config/StdGNU.mk | 11 ++++++++---
++ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/Config.mk b/Config.mk
- index eb2c192..953122b 100644
++index c44853f..df3a853 100644
+--- a/Config.mk
++++ b/Config.mk
+@@ -84,7 +84,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib
+ 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
+diff --git a/config/StdGNU.mk b/config/StdGNU.mk
- index 25fc594..b566b5c 100644
++index 25fc594..0f1776d 100644
+--- a/config/StdGNU.mk
++++ b/config/StdGNU.mk
- @@ -30,16 +30,19 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
++@@ -1,3 +1,5 @@
+++include /usr/share/dpkg/architecture.mk
+++
++ AS = $(CROSS_COMPILE)as
++ LD = $(CROSS_COMPILE)ld
++ ifeq ($(clang),y)
++@@ -30,16 +32,19 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
+ PREFIX ?= /usr
+ BINDIR = $(PREFIX)/bin
+ INCLUDEDIR = $(PREFIX)/include
+-LIBEXEC = $(PREFIX)/lib/xen/bin
- +LIBDIR = $(PREFIX)/lib
+++LIBDIR = $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+ SHAREDIR = $(PREFIX)/share
+ MANDIR = $(SHAREDIR)/man
+ MAN1DIR = $(MANDIR)/man1
+ MAN8DIR = $(MANDIR)/man8
+ SBINDIR = $(PREFIX)/sbin
+-XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot
+
+-PRIVATE_PREFIX = $(LIBDIR)/xen
- +PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
+++PRIVATE_PREFIX = $(PREFIX)/lib/xen-$(XEN_VERSION)
+ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
++PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
++
++LIBEXEC = $(PRIVATE_BINDIR)
++XENFIRMWAREDIR = $(PRIVATE_PREFIX)/boot
+
+ CONFIG_DIR = /etc
+ XEN_LOCK_DIR = /var/lock
diff --cc debian/patches/0003-tools-libfsimage-abiname.diff.patch
index 770281f,0000000..dc5e4ea
mode 100644,000000..100644
--- a/debian/patches/0003-tools-libfsimage-abiname.diff.patch
+++ b/debian/patches/0003-tools-libfsimage-abiname.diff.patch
@@@ -1,59 -1,0 +1,59 @@@
- From f2203c717c8e26d6c203bf96199343c74163badb Mon Sep 17 00:00:00 2001
++From 4a7370d08f7bffe4ceb57151ac95af99ae3cde11 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:47 +0200
+Subject: tools-libfsimage-abiname.diff
+
+---
+ tools/libfsimage/common/Makefile | 18 ++++--------------
+ 1 file changed, 4 insertions(+), 14 deletions(-)
+
+diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
+index cbd60b4..4202cc1 100644
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = $(CURDIR)/../../..
+ include $(XEN_ROOT)/tools/libfsimage/Rules.mk
+
+-MAJOR = 1.0
+-MINOR = 0
+-
+ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
+ LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
+ LDFLAGS = $(LDFLAGS-y)
+@@ -15,7 +12,7 @@ LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c
+
+ 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 @@ all: $(LIB)
+ install: all
+ $(INSTALL_DIR) $(DESTDIR)$(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 $(DESTDIR)$(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 @@ install: all
+ clean distclean::
+ rm -f $(LIB)
+
+-libfsimage.so: libfsimage.so.$(MAJOR)
+- ln -sf $< $@
+-libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
++libfsimage.so: $(PIC_OBJS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
+
+ -include $(DEPS)
+
diff --cc debian/patches/0004-tools-libxc-abiname.diff.patch
index a22f003,0000000..c112985
mode 100644,000000..100644
--- a/debian/patches/0004-tools-libxc-abiname.diff.patch
+++ b/debian/patches/0004-tools-libxc-abiname.diff.patch
@@@ -1,98 -1,0 +1,98 @@@
- From ccabc6a4e41371130dbe94853d1e6066ae8ddab2 Mon Sep 17 00:00:00 2001
++From 77d66b22c6a95a0413c984d2b56799619eaeff5a Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:48 +0200
+Subject: tools-libxc-abiname.diff
+
+---
+ tools/libxc/Makefile | 35 +++++++++++++----------------------
+ 1 file changed, 13 insertions(+), 22 deletions(-)
+
+diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
+index 2cca2b2..b171f91 100644
+--- a/tools/libxc/Makefile
++++ b/tools/libxc/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = $(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 4.4
+-MINOR = 0
+-
+ CTRL_SRCS-y :=
+ CTRL_SRCS-y += xc_core.c
+ CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
+@@ -110,12 +107,12 @@ OSDEP_PIC_OBJS := $(patsubst %.c,%.opic,$(OSDEP_SRCS-y))
+
+ LIB := libxenctrl.a
+ ifneq ($(stubdom),y)
+-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
++LIB += libxenctrl.so libxenctrl-$(XEN_VERSION).so
+ endif
+
+ LIB += libxenguest.a
+ ifneq ($(stubdom),y)
+-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
++LIB += libxenguest.so libxenguest-$(XEN_VERSION).so
+ endif
+
+ ifneq ($(stubdom),y)
+@@ -136,15 +133,13 @@ libs: $(LIB)
+ install: build
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) libxenctrl-$(XEN_VERSION).so $(DESTDIR)$(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-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenctrl.so
+ $(INSTALL_DATA) xenctrl.h xenctrlosdep.h xentoollog.h $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) libxenguest-$(XEN_VERSION).so $(DESTDIR)$(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-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenguest.so
+ $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
+
+ .PHONY: TAGS
+@@ -173,22 +168,18 @@ rpm: build
+ libxenctrl.a: $(CTRL_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenctrl.so: libxenctrl.so.$(MAJOR)
+- ln -sf $< $@
+-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
++libxenctrl.so: libxenctrl-$(XEN_VERSION).so
+ ln -sf $< $@
+
+-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
+- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
++libxenctrl-$(XEN_VERSION).so: $(CTRL_PIC_OBJS)
++ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+
+ # libxenguest
+
+ libxenguest.a: $(GUEST_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenguest.so: libxenguest.so.$(MAJOR)
+- ln -sf $< $@
+-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
++libxenguest.so: libxenguest-$(XEN_VERSION).so
+ ln -sf $< $@
+
+ ifeq ($(CONFIG_MiniOS),y)
+@@ -200,9 +191,9 @@ endif
+ xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
+ xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
+
+-libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
+-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
++libxenguest-$(XEN_VERSION).so: COMPRESSION_LIBS = $(call zlib-options,l)
++libxenguest-$(XEN_VERSION).so: $(GUEST_PIC_OBJS) libxenctrl-$(XEN_VERSION).so
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+
+ xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
+ $(CC) -g $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
diff --cc debian/patches/0005-tools-libxl-abiname.diff.patch
index 40a9766,0000000..c186a4c
mode 100644,000000..100644
--- a/debian/patches/0005-tools-libxl-abiname.diff.patch
+++ b/debian/patches/0005-tools-libxl-abiname.diff.patch
@@@ -1,80 -1,0 +1,80 @@@
- From 0764e612e4b46dab9adad7106aab901bf0896ef3 Mon Sep 17 00:00:00 2001
++From bd104cd974cc0997028f7c1209ca3ee96fda7db6 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:49 +0200
+Subject: tools-libxl-abiname.diff
+
+---
+ tools/libxl/Makefile | 34 ++++++++++------------------------
+ 1 file changed, 10 insertions(+), 24 deletions(-)
+
+diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
+index 755b666..b002c54 100644
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
+@@ -5,12 +5,6 @@
+ XEN_ROOT = $(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 4.4
+-MINOR = 0
+-
+-XLUMAJOR = 4.3
+-XLUMINOR = 0
+-
+ CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
+ -Wno-declaration-after-statement -Wformat-nonliteral
+ CFLAGS += -I. -fPIC
+@@ -185,14 +179,11 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py i
+ $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h)
+ $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c)
+
+-libxenlight.so: libxenlight.so.$(MAJOR)
++libxenlight.so: libxenlight-$(XEN_VERSION).so
+ ln -sf $< $@
+
+-libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
++libxenlight-$(XEN_VERSION).so: $(LIBXL_OBJS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+
+ libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+@@ -200,14 +191,11 @@ libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
+ libxenlight.a: $(LIBXL_OBJS)
+ $(AR) rcs libxenlight.a $^
+
+-libxlutil.so: libxlutil.so.$(XLUMAJOR)
+- ln -sf $< $@
+-
+-libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR)
++libxlutil.so: libxlutil-$(XEN_VERSION).so
+ ln -sf $< $@
+
+-libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS)
++libxlutil-$(XEN_VERSION).so: $(LIBXLU_OBJS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS)
+
+ libxlutil.a: $(LIBXLU_OBJS)
+ $(AR) rcs libxlutil.a $^
+@@ -234,13 +222,11 @@ install: all
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
+ $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
+- $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
+- ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
++ $(INSTALL_PROG) libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
++ ln -sf libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenlight.so
+ $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
+- $(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)
+- ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR)
+- ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so
++ $(INSTALL_PROG) libxlutil-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
++ ln -sf libxlutil-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxlutil.so
+ $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
diff --cc debian/patches/0006-tools-xenstat-abiname.diff.patch
index 85f7ad7,0000000..d5a5d07
mode 100644,000000..100644
--- a/debian/patches/0006-tools-xenstat-abiname.diff.patch
+++ b/debian/patches/0006-tools-xenstat-abiname.diff.patch
@@@ -1,63 -1,0 +1,63 @@@
- From 51579fa479c4afbc5c677725c73baf854360f1b8 Mon Sep 17 00:00:00 2001
++From 4494f78e0764b88bb38b360c421ce3a6d0847a7b Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:50 +0200
+Subject: tools-xenstat-abiname.diff
+
+---
+ tools/xenstat/libxenstat/Makefile | 20 ++++----------------
+ 1 file changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
+index 21aad89..669bb1f 100644
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
+@@ -22,17 +22,13 @@ libdir=$(prefix)/lib
+ LDCONFIG=ldconfig
+ MAKE_LINK=ln -sf
+
+-MAJOR=0
+-MINOR=0
+-
+ LIB=src/libxenstat.a
+-SHLIB=src/libxenstat.so.$(MAJOR).$(MINOR)
+-SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so
++SHLIB=src/libxenstat.so
+ OBJECTS-y=src/xenstat.o
+ OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
+ OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
+ OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
+-SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
++SONAME_FLAGS=-Wl,$(SONAME_LDFLAG),libxenstat.so
+
+ WARN_FLAGS=-Wall -Werror
+
+@@ -43,7 +39,7 @@ LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl)
+ LDLIBS-$(CONFIG_SunOS) += -lkstat
+
+ .PHONY: all
+-all: $(LIB) $(SHLIB) $(SHLIB_LINKS)
++all: $(LIB) $(SHLIB)
+
+ $(LIB): $(OBJECTS-y)
+ $(AR) rc $@ $^
+@@ -53,19 +49,11 @@ $(SHLIB): $(OBJECTS-y)
+ $(CC) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \
+ $(OBJECTS-y) $(LDLIBS-y) $(APPEND_LDFLAGS)
+
+-src/libxenstat.so.$(MAJOR): $(SHLIB)
+- $(MAKE_LINK) $(<F) $@
+-
+-src/libxenstat.so: src/libxenstat.so.$(MAJOR)
+- $(MAKE_LINK) $(<F) $@
+-
+ .PHONY: install
+ install: all
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
+- $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR)
+- ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstat.so
++ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBDIR)
+
+ PYLIB=bindings/swig/python/_xenstat.so
+ PYMOD=bindings/swig/python/xenstat.py
diff --cc debian/patches/0007-tools-rpath.diff.patch
index d51f240,0000000..a7bfaaa
mode 100644,000000..100644
--- a/debian/patches/0007-tools-rpath.diff.patch
+++ b/debian/patches/0007-tools-rpath.diff.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 479d90ee22e4a370a65f3fb90476884ff1e2629d Mon Sep 17 00:00:00 2001
++From 95a24141c687055133b46b179b4a3eb72a2c6c13 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:51 +0200
+Subject: tools-rpath.diff
+
+---
+ tools/Rules.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/Rules.mk b/tools/Rules.mk
+index 13d8fc1..0d9d98c 100644
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
+@@ -9,6 +9,8 @@ include $(XEN_ROOT)/Config.mk
+ export _INSTALL := $(INSTALL)
+ INSTALL = $(XEN_ROOT)/tools/cross-install
+
++LDFLAGS_RPATH = -Wl,-rpath,'$${ORIGIN}$(if $(1),/$(1))'
++
+ XEN_INCLUDE = $(XEN_ROOT)/tools/include
+ XEN_LIBXC = $(XEN_ROOT)/tools/libxc
+ XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl
diff --cc debian/patches/0008-tools-blktap2-prefix.diff.patch
index 02ce3d7,0000000..4acf597
mode 100644,000000..100644
--- a/debian/patches/0008-tools-blktap2-prefix.diff.patch
+++ b/debian/patches/0008-tools-blktap2-prefix.diff.patch
@@@ -1,154 -1,0 +1,154 @@@
- From eef276f7bc0ea0355ee0fb4a65797675fbaff6db Mon Sep 17 00:00:00 2001
++From ab12c7f81d723d235033dc391a645ee10d134278 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:53 +0200
+Subject: tools-blktap2-prefix.diff
+
+---
+ tools/blktap2/control/Makefile | 26 ++++++++------------------
+ tools/blktap2/vhd/Makefile | 1 +
+ tools/blktap2/vhd/lib/Makefile | 29 +++++++++--------------------
+ 3 files changed, 18 insertions(+), 38 deletions(-)
+
+diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
+index 86a433c..f3a7a6e 100644
+--- a/tools/blktap2/control/Makefile
++++ b/tools/blktap2/control/Makefile
+@@ -1,10 +1,7 @@
+ XEN_ROOT := $(CURDIR)/../../../
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 1.0
+-MINOR = 0
+ LIBNAME = libblktapctl
+-LIBSONAME = $(LIBNAME).so.$(MAJOR)
+
+ IBIN = tap-ctl
+
+@@ -38,39 +35,32 @@ OBJS = $(CTL_OBJS) tap-ctl.o
+ PICS = $(CTL_PICS)
+
+ LIB_STATIC = $(LIBNAME).a
+-LIB_SHARED = $(LIBSONAME).$(MINOR)
++LIB_SHARED = $(LIBNAME).so
+ IBIN = tap-ctl
+
+ all: build
+
+ build: $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+
+-$(LIBNAME).so: $(LIBSONAME)
+- ln -sf $< $@
+-
+-$(LIBSONAME): $(LIB_SHARED)
+- ln -sf $< $@
+-
+ tap-ctl: tap-ctl.o $(LIBNAME).so
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) $(call LDFLAGS_RPATH,../lib) -o $@ $^
+
+ $(LIB_STATIC): $(CTL_OBJS)
+ $(AR) r $@ $^
+
+ $(LIB_SHARED): $(CTL_PICS)
+- $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@
++ $(CC) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@
+
+ install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+- $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(IBDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_SBINDIR)
++ $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR)
+- $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR)
+- ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
+- ln -sf $(LIB_SHARED) $(DESTDIR)$(LIBDIR)/$(LIBSONAME)
++ $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(PRIVATE_LIBDIR)
+
+ clean:
+ rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+- rm -f $(LIBNAME).so $(LIBSONAME)
+ rm -f *~
+
+ .PHONY: all build clean install
+diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
+index c5019de..e55c73c 100644
+--- a/tools/blktap2/vhd/Makefile
++++ b/tools/blktap2/vhd/Makefile
+@@ -12,6 +12,7 @@ CFLAGS += -Werror
+ CFLAGS += -Wno-unused
+ CFLAGS += -I../include
+ CFLAGS += -D_GNU_SOURCE
++CFLAGS += $(CFLAGS_libxenctrl)
+
+ ifeq ($(CONFIG_X86_64),y)
+ CFLAGS += -fPIC
+diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
+index cdbb86c..0ab9885 100644
+--- a/tools/blktap2/vhd/lib/Makefile
++++ b/tools/blktap2/vhd/lib/Makefile
+@@ -2,26 +2,20 @@ XEN_ROOT=$(CURDIR)/../../../..
+ BLKTAP_ROOT := ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-LIBVHD-MAJOR = 1.0
+-LIBVHD-MINOR = 0
+-LIBVHD-SONAME = libvhd.so.$(LIBVHD-MAJOR)
+-
+ LVM-UTIL-OBJ := $(BLKTAP_ROOT)/lvm/lvm-util.o
+
+-LIBVHD-BUILD := libvhd.a
+-
+-INST-DIR = $(LIBDIR)
+-
+ CFLAGS += -Werror
+ CFLAGS += -Wno-unused
+ CFLAGS += -I../../include
+ CFLAGS += -D_GNU_SOURCE
+ CFLAGS += -fPIC
+ CFLAGS += -g
++CFLAGS += $(CFLAGS_libxenctrl)
+
+ ifeq ($(CONFIG_Linux),y)
+ LIBS := -luuid
+ endif
++LDFLAGS += $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH)
+
+ ifeq ($(CONFIG_LIBICONV),y)
+ LIBS += -liconv
+@@ -51,27 +45,22 @@ LIB-OBJS += $(LVM-UTIL-OBJ)
+
+ LIB-PICOBJS = $(patsubst %.o,%.opic,$(LIB-OBJS))
+
+-LIBVHD = libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
++LIBVHD = libvhd.a libvhd.so
+
+ all: build
+
+-build: libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
++build: libvhd.a libvhd.so
+
+ libvhd.a: $(LIB-OBJS)
+ $(AR) rc $@ $^
+
+-libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR): $(LIB-PICOBJS)
+- $(CC) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \
+- $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $^ $(LIBS)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so
++libvhd.so: $(LIB-PICOBJS)
++ $(CC) $(SHLIB_LDFLAGS) $(LDFLAGS) -o libvhd.so $^ $(LIBS)
+
+ install: all
+- $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
+- $(INSTALL_DATA) libvhd.a $(DESTDIR)$(INST-DIR)
+- $(INSTALL_PROG) libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
++ $(INSTALL_DIR) -p $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DATA) libvhd.a $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) libvhd.so $(DESTDIR)$(LIBDIR)
+
+ clean:
+ rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
diff --cc debian/patches/0009-tools-console-prefix.diff.patch
index e3ff7e3,0000000..e176545
mode 100644,000000..100644
--- a/debian/patches/0009-tools-console-prefix.diff.patch
+++ b/debian/patches/0009-tools-console-prefix.diff.patch
@@@ -1,32 -1,0 +1,32 @@@
- From e4f9e8c63dd2ea84a9484537850fcaf20596c418 Mon Sep 17 00:00:00 2001
++From bd93072208e5ddfc026059c811b2eacd8fdd6883 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:54 +0200
+Subject: tools-console-prefix.diff
+
+---
+ tools/console/Makefile | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tools/console/Makefile b/tools/console/Makefile
+index 3e38252..b69f674 100644
+--- a/tools/console/Makefile
++++ b/tools/console/Makefile
+@@ -8,6 +8,7 @@ CFLAGS += $(CFLAGS_libxenstore)
+ LDLIBS += $(LDLIBS_libxenctrl)
+ LDLIBS += $(LDLIBS_libxenstore)
+ LDLIBS += $(SOCKET_LIBS)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ LDLIBS_xenconsoled += $(UTIL_LIBS)
+ LDLIBS_xenconsoled += -lrt
+@@ -30,9 +31,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
+
+ .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)
+
+ -include $(DEPS)
diff --cc debian/patches/0010-tools-libfsimage-prefix.diff.patch
index 2650491,0000000..1642f9b
mode 100644,000000..100644
--- a/debian/patches/0010-tools-libfsimage-prefix.diff.patch
+++ b/debian/patches/0010-tools-libfsimage-prefix.diff.patch
@@@ -1,48 -1,0 +1,52 @@@
- From 6ea03d7a26b3ef4f0e97c9f75a227850e68b4c22 Mon Sep 17 00:00:00 2001
++From fc454a556a6877b0aecc560bd2abefc87eef45f5 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:55 +0200
+Subject: tools-libfsimage-prefix.diff
+
+---
- tools/libfsimage/Rules.mk | 2 +-
++ tools/libfsimage/Rules.mk | 3 ++-
+ tools/libfsimage/common/Makefile | 6 ++++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
++ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
- index 8a23655..9aedcc7 100644
++index 8a23655..2750f4f 100644
+--- a/tools/libfsimage/Rules.mk
++++ b/tools/libfsimage/Rules.mk
- @@ -6,7 +6,7 @@ LDFLAGS += -L../common/
++@@ -3,10 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
++ CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
++ CFLAGS += -Werror -D_GNU_SOURCE
++ LDFLAGS += -L../common/
+++LDFLAGS += $(call LDFLAGS_RPATH,../..)
+
+ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
+
+-FSDIR = $(LIBDIR)/fs
++FSDIR = $(PRIVATE_LIBDIR)/fs
+
+ FSLIB = fsimage.so
+
+diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
+index 4202cc1..85f3d29 100644
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
+@@ -1,6 +1,8 @@
+ XEN_ROOT = $(CURDIR)/../../..
+ include $(XEN_ROOT)/tools/libfsimage/Rules.mk
+
++CFLAGS += -DFSDIR="\"$(PRIVATE_LIBDIR)/fs\""
++
+ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
+ LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
+ LDFLAGS = $(LDFLAGS-y)
+@@ -19,9 +21,9 @@ all: $(LIB)
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBDIR)
++ $(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)
diff --cc debian/patches/0011-tools-libxl-prefix.diff.patch
index 251b412,0000000..cad08ec
mode 100644,000000..100644
--- a/debian/patches/0011-tools-libxl-prefix.diff.patch
+++ b/debian/patches/0011-tools-libxl-prefix.diff.patch
@@@ -1,69 -1,0 +1,69 @@@
- From 115e1e09532eaa3c48f29cd8fea6043decafef3b Mon Sep 17 00:00:00 2001
++From 27d21e69f7e9766c61ea44c8662907dbadd8f86d Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:57 +0200
+Subject: tools-libxl-prefix.diff
+
+---
+ tools/libxl/Makefile | 9 +++++----
+ tools/xenstat/libxenstat/Makefile | 2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
+index b002c54..39e20ad 100644
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
+@@ -12,6 +12,8 @@ CFLAGS += -I. -fPIC
+ ifeq ($(CONFIG_Linux),y)
+ LIBUUID_LIBS += -luuid
+ endif
++LDFLAGS_XL = $(call LDFLAGS_RPATH,../lib)
++LDFLAGS_LIBXL = $(call LDFLAGS_RPATH)
+
+ LIBXL_LIBS =
+ LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS)
+@@ -183,7 +185,7 @@ libxenlight.so: libxenlight-$(XEN_VERSION).so
+ ln -sf $< $@
+
+ libxenlight-$(XEN_VERSION).so: $(LIBXL_OBJS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(LDFLAGS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+
+ libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+@@ -201,7 +203,7 @@ libxlutil.a: $(LIBXLU_OBJS)
+ $(AR) rcs libxlutil.a $^
+
+ xl: $(XL_OBJS) libxlutil.so libxenlight.so
+- $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
+
+ test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so
+ $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
+@@ -214,13 +216,12 @@ testidl: testidl.o libxlutil.so libxenlight.so
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+- $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
++ $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
+ ln -sf libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenlight.so
+diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
+index 669bb1f..6089755 100644
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
+@@ -53,7 +53,7 @@ $(SHLIB): $(OBJECTS-y)
+ install: all
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
+- $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(PRIVATE_LIBDIR)
+
+ PYLIB=bindings/swig/python/_xenstat.so
+ PYMOD=bindings/swig/python/xenstat.py
diff --cc debian/patches/0012-tools-misc-prefix.diff.patch
index 267fab2,0000000..c26c8b6
mode 100644,000000..100644
--- a/debian/patches/0012-tools-misc-prefix.diff.patch
+++ b/debian/patches/0012-tools-misc-prefix.diff.patch
@@@ -1,41 -1,0 +1,50 @@@
- From 63986546e43197e064de938e8c99baec0214a8cc Mon Sep 17 00:00:00 2001
++From fd88c7796ab07d79cfe0c6cd1c4bb2ad6e6907fe Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:59 +0200
+Subject: tools-misc-prefix.diff
+
+---
- tools/misc/Makefile | 6 +-----
++ tools/misc/Makefile | 8 +++-----
+ tools/python/xen/xend/xend | 2 ++
- 2 files changed, 3 insertions(+), 5 deletions(-)
++ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tools/misc/Makefile b/tools/misc/Makefile
- index 17aeda5..fbc20cf 100644
++index 17aeda5..56d4b82 100644
+--- a/tools/misc/Makefile
++++ b/tools/misc/Makefile
- @@ -41,12 +41,8 @@ build: $(TARGETS)
++@@ -32,6 +32,8 @@ INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y)
++ # Include configure output (config.h) to headers search path
++ CFLAGS += -I$(XEN_ROOT)/tools
++
+++APPEND_LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+++
++ .PHONY: all
++ all: build
++
++@@ -41,12 +43,8 @@ build: $(TARGETS)
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
+ set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
+
+ .PHONY: clean
+diff --git a/tools/python/xen/xend/xend b/tools/python/xen/xend/xend
+index 9ef0210..3446c8e 100644
+--- a/tools/python/xen/xend/xend
++++ b/tools/python/xen/xend/xend
+@@ -33,6 +33,8 @@ import signal
+ import time
+ import commands
+
++sys.path.insert(1, sys.path[0] + '/../lib/python')
++
+ from xen.xend.server import SrvDaemon
+
+ class CheckError(ValueError):
diff --cc debian/patches/0013-tools-pygrub-prefix.diff.patch
index 8d48153,0000000..0745ed9
mode 100644,000000..100644
--- a/debian/patches/0013-tools-pygrub-prefix.diff.patch
+++ b/debian/patches/0013-tools-pygrub-prefix.diff.patch
@@@ -1,41 -1,0 +1,41 @@@
- From 6ec7b50ff252a9933fff45c784670c0841b598b5 Mon Sep 17 00:00:00 2001
++From 603adc9defeb0a07fbffbea2233f7579decce861 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:01 +0200
+Subject: tools-pygrub-prefix.diff
+
+---
+ tools/pygrub/setup.py | 2 ++
+ tools/pygrub/src/pygrub | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py
+index 52dcf57..8a1be9a 100644
+--- a/tools/pygrub/setup.py
++++ b/tools/pygrub/setup.py
+@@ -4,11 +4,13 @@ import os
+ 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"],
+diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
- index ee4e741..111750b 100644
++index 45a7290..1e3e3ba 100644
+--- a/tools/pygrub/src/pygrub
++++ b/tools/pygrub/src/pygrub
+@@ -22,6 +22,8 @@ import xen.lowlevel.xc
+ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
+ import getopt
+
++sys.path.insert(1, sys.path[0] + '/../lib/python')
++
+ import fsimage
+ import grub.GrubConf
+ import grub.LiloConf
diff --cc debian/patches/0014-tools-python-prefix.diff.patch
index dfcc2c2,0000000..545fd2a
mode 100644,000000..100644
--- a/debian/patches/0014-tools-python-prefix.diff.patch
+++ b/debian/patches/0014-tools-python-prefix.diff.patch
@@@ -1,93 -1,0 +1,147 @@@
- From a2a35eed745082415d89f2ef5893708d3247abf6 Mon Sep 17 00:00:00 2001
++From 98e7698ea7ca4bcde5d9160e9b03cb3ffaea0fdb Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
- Date: Sat, 5 Jul 2014 11:47:03 +0200
- Subject: tools-python-rpath.diff
++Date: Sat, 5 Jul 2014 11:47:02 +0200
++Subject: tools-python-prefix.diff
+
+---
- tools/python/setup.py | 10 ++++++++++
- 1 file changed, 10 insertions(+)
++ tools/python/setup.py | 10 ++++++++++
++ tools/python/xen/util/auxbin.py | 36 +++++++++++++++++++-----------------
++ 2 files changed, 29 insertions(+), 17 deletions(-)
+
+diff --git a/tools/python/setup.py b/tools/python/setup.py
+index 8127b21..702a383 100644
+--- a/tools/python/setup.py
++++ b/tools/python/setup.py
+@@ -5,6 +5,7 @@ import os, sys
+ XEN_ROOT = "../.."
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../.." ]
+
+ PATH_XEN = XEN_ROOT + "/tools/include"
+ PATH_LIBXC = XEN_ROOT + "/tools/libxc"
+@@ -13,6 +14,7 @@ PATH_XENSTORE = XEN_ROOT + "/tools/xenstore"
+
+ xc = Extension("xc",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ PATH_XEN, PATH_LIBXC, "xen/lowlevel/xc" ],
+ library_dirs = [ PATH_LIBXC ],
+ libraries = [ "xenctrl", "xenguest" ],
+@@ -21,6 +23,7 @@ xc = Extension("xc",
+
+ xs = Extension("xs",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ PATH_XEN, PATH_XENSTORE, "xen/lowlevel/xs" ],
+ library_dirs = [ PATH_XENSTORE ],
+ libraries = [ "xenstore" ],
+@@ -29,6 +32,7 @@ xs = Extension("xs",
+
+ scf = Extension("scf",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ "xen/lowlevel/scf" ],
+ library_dirs = [ ],
+ libraries = [ ],
+@@ -37,6 +41,7 @@ scf = Extension("scf",
+
+ process = Extension("process",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ "xen/lowlevel/process" ],
+ library_dirs = [ ],
+ libraries = [ "contract" ],
+@@ -45,6 +50,7 @@ process = Extension("process",
+
+ flask = Extension("flask",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ PATH_XEN, PATH_LIBXC, "xen/lowlevel/flask" ],
+ library_dirs = [ PATH_LIBXC ],
+ libraries = [ "xenctrl" ],
+@@ -53,6 +59,7 @@ flask = Extension("flask",
+
+ ptsname = Extension("ptsname",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ "ptsname" ],
+ library_dirs = [ ],
+ libraries = [ ],
+@@ -61,6 +68,7 @@ ptsname = Extension("ptsname",
+
+ checkpoint = Extension("checkpoint",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ PATH_XEN, PATH_LIBXC, PATH_XENSTORE ],
+ library_dirs = [ PATH_LIBXC, PATH_XENSTORE ],
+ libraries = [ "xenctrl", "xenguest", "xenstore", "rt" ],
+@@ -72,6 +80,7 @@ checkpoint = Extension("checkpoint",
+
+ netlink = Extension("netlink",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ ],
+ library_dirs = [ ],
+ libraries = [ ],
+@@ -81,6 +90,7 @@ netlink = Extension("netlink",
+
+ xl = Extension("xl",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ PATH_XEN, PATH_LIBXL, PATH_LIBXC, "xen/lowlevel/xl" ],
+ library_dirs = [ PATH_LIBXL ],
+ libraries = [ "xenlight" ],
++diff --git a/tools/python/xen/util/auxbin.py b/tools/python/xen/util/auxbin.py
++index a690ad9..b1bd191 100644
++--- a/tools/python/xen/util/auxbin.py
+++++ b/tools/python/xen/util/auxbin.py
++@@ -19,29 +19,31 @@
++ import os
++ import os.path
++ import sys
++-from xen.util.path import *
+++import xen.util.path
+++
+++
+++class _Path(object):
+++ def __init__(self, path=[]):
+++ self._path = path
+++ def __call__(self, name):
+++ for dir in self._path:
+++ real = os.path.join(dir, name)
+++ if os.path.exists(real):
+++ return real
+++
+++
+++path_bin = _Path([xen.util.path.PRIVATE_BINDIR, '/usr/lib/xen/bin', '/usr/sbin', '/sbin', '/usr/bin', '/bin'])
+++path_boot = _Path([xen.util.path.XENFIRMWAREDIR, '/usr/lib/xen/boot', '/boot'])
++
++ def execute(exe, args = None):
++- exepath = pathTo(exe)
+++ exepath = path_bin(exe)
++ a = [ exepath ]
++ if args:
++ a.extend(args)
++- try:
++- os.execv(exepath, a)
++- except (OSError, TypeError), exn:
++- print exepath, ": ", exn
++- sys.exit(1)
++-
++-SEARCHDIRS = [ BINDIR, SBINDIR, LIBEXEC, PRIVATE_BINDIR, XENFIRMWAREDIR ]
++-def pathTo(exebin):
++- for dir in SEARCHDIRS:
++- exe = os.path.join(dir, exebin)
++- if os.path.exists(exe):
++- return exe
++- return None
+++ os.execv(exepath, a)
++
++ def xen_configdir():
++- return XEN_CONFIG_DIR
+++ return xen.util.path.XEN_CONFIG_DIR
++
++ def scripts_dir():
++- return XEN_SCRIPT_DIR
+++ return xen.util.path.XEN_SCRIPT_DIR
diff --cc debian/patches/0015-tools-xcutils-rpath.diff.patch
index 25b54ad,0000000..54bb4ec
mode 100644,000000..100644
--- a/debian/patches/0015-tools-xcutils-rpath.diff.patch
+++ b/debian/patches/0015-tools-xcutils-rpath.diff.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 90fe4cf21df373149af41da2b85ea9eee941f1f3 Mon Sep 17 00:00:00 2001
++From 58f609cdbadd9eabc4da18fd71d4d0affee24bbc Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:05 +0200
+Subject: tools-xcutils-rpath.diff
+
+---
+ tools/xcutils/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
+index 6c502f1..d0d20d6 100644
+--- a/tools/xcutils/Makefile
++++ b/tools/xcutils/Makefile
+@@ -20,6 +20,8 @@ CFLAGS_xc_save.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxe
+ CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+ CFLAGS_lsevtchn.o := $(CFLAGS_libxenctrl)
+
++APPEND_LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++
+ .PHONY: all
+ all: build
+
diff --cc debian/patches/0016-tools-xenmon-prefix.diff.patch
index d3a97fa,0000000..a32faec
mode 100644,000000..100644
--- a/debian/patches/0016-tools-xenmon-prefix.diff.patch
+++ b/debian/patches/0016-tools-xenmon-prefix.diff.patch
@@@ -1,28 -1,0 +1,36 @@@
- From 0c76747bca83b242b069196e534a7f3675466a8e Mon Sep 17 00:00:00 2001
++From ef86f13850569fe145993fe826344f5ff013d80e Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:06 +0200
+Subject: tools-xenmon-prefix.diff
+
+---
- tools/xenmon/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
++ tools/xenmon/Makefile | 9 +++++----
++ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
- index 3fe87ba..76383e0 100644
++index 3fe87ba..dab5415 100644
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
- @@ -27,10 +27,10 @@ build: xentrace_setmask xenbaked
++@@ -16,6 +16,7 @@ include $(XEN_ROOT)/tools/Rules.mk
++ CFLAGS += -Werror
++ CFLAGS += $(CFLAGS_libxenctrl)
++ LDLIBS += $(LDLIBS_libxenctrl)
+++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++
++ SCRIPTS = xenmon.py
++
++@@ -27,10 +28,10 @@ build: xentrace_setmask xenbaked
+
+ .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
+
diff --cc debian/patches/0017-tools-xenpaging-prefix.diff.patch
index 43da9d7,0000000..90ef4c5
mode 100644,000000..100644
--- a/debian/patches/0017-tools-xenpaging-prefix.diff.patch
+++ b/debian/patches/0017-tools-xenpaging-prefix.diff.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 2127da1d6784fa1f0cc88e67bba409ac19ec364e Mon Sep 17 00:00:00 2001
++From 2abffe26cec8e35e374148277125599ba8ba5b36 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:08 +0200
+Subject: tools-xenpaging-prefix.diff
+
+---
+ tools/xenpaging/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
+index 548d9dd..b5147da 100644
+--- a/tools/xenpaging/Makefile
++++ b/tools/xenpaging/Makefile
+@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
+
+ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS)
+ LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS)
+-LDFLAGS += $(PTHREAD_LDFLAGS)
++LDFLAGS += $(PTHREAD_LDFLAGS) $(call LDFLAGS_RPATH,../lib)
+
+ POLICY = default
+
+@@ -25,8 +25,8 @@ xenpaging: $(OBJS)
+
+ install: all
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_PAGING_DIR)
+- $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
+- $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(PRIVATE_BINDIR)
+
+ clean:
+ rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)
diff --cc debian/patches/0018-tools-xenstat-prefix.diff.patch
index 057d496,0000000..bf5a57e
mode 100644,000000..100644
--- a/debian/patches/0018-tools-xenstat-prefix.diff.patch
+++ b/debian/patches/0018-tools-xenstat-prefix.diff.patch
@@@ -1,37 -1,0 +1,47 @@@
- From aa64e1364605a735b0ec993619efe91b219870c7 Mon Sep 17 00:00:00 2001
++From bf25355bf2aed4c667220f2d889981578c0a7329 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:09 +0200
+Subject: tools-xenstat-prefix.diff
+
+---
+ tools/xenstat/libxenstat/Makefile | 1 +
- tools/xenstat/xentop/Makefile | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
++ tools/xenstat/xentop/Makefile | 6 ++++--
++ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
+index 6089755..eaf40b4 100644
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
+@@ -51,6 +51,7 @@ $(SHLIB): $(OBJECTS-y)
+
+ .PHONY: install
+ install: all
++ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
+ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(PRIVATE_LIBDIR)
+diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
- index afed0d1..6146491 100644
++index afed0d1..61f1c7d 100644
+--- a/tools/xenstat/xentop/Makefile
++++ b/tools/xenstat/xentop/Makefile
- @@ -30,8 +30,8 @@ all: xentop
++@@ -19,7 +19,9 @@ all install xentop:
++ else
++
++ CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
+++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++ LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
+++LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore)
++ CFLAGS += -DHOST_$(XEN_OS)
++
++ # Include configure output (config.h) to headers search path
++@@ -30,8 +32,8 @@ all: xentop
+
+ .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
+
diff --cc debian/patches/0019-tools-xenstore-prefix.diff.patch
index 3b12564,0000000..0a37ceb
mode 100644,000000..100644
--- a/debian/patches/0019-tools-xenstore-prefix.diff.patch
+++ b/debian/patches/0019-tools-xenstore-prefix.diff.patch
@@@ -1,49 -1,0 +1,58 @@@
- From 02ab630bf4b056fd3e042be3fa76536d9c2164c6 Mon Sep 17 00:00:00 2001
++From 46661fdde15627db208e3f28c61f96a50ee27165 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:12 +0200
+Subject: tools-xenstore-prefix.diff
+
+---
- tools/xenstore/Makefile | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
++ tools/xenstore/Makefile | 16 +++++++++-------
++ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
- index 262f401..f8237ed 100644
++index 262f401..153c36f 100644
+--- a/tools/xenstore/Makefile
++++ b/tools/xenstore/Makefile
- @@ -58,10 +58,10 @@ endif
++@@ -8,6 +8,8 @@ CFLAGS += -Werror
++ CFLAGS += -I.
++ CFLAGS += $(CFLAGS_libxenctrl)
++
+++LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib)
+++
++ CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
++ CLIENTS += xenstore-write xenstore-ls xenstore-watch
++
++@@ -58,10 +60,10 @@ endif
+ init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest)
+
+ init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE)
+- $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
+
+ xenstored: $(XENSTORED_OBJS)
+- $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
+
+ xenstored.a: $(XENSTORED_OBJS)
+ $(AR) cr $@ $^
- @@ -109,17 +109,17 @@ tarball: clean
++@@ -109,17 +111,17 @@ tarball: clean
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat
+ $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
+- $(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)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
++ ln -f xenstore $(DESTDIR)$(SBINDIR)/$${c} ; \
+ done
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
diff --cc debian/patches/0020-tools-xentrace-prefix.diff.patch
index 43efbd7,0000000..d239430
mode 100644,000000..100644
--- a/debian/patches/0020-tools-xentrace-prefix.diff.patch
+++ b/debian/patches/0020-tools-xentrace-prefix.diff.patch
@@@ -1,30 -1,0 +1,38 @@@
- From 6cfdf1c164beaec90d7d5edfe7b65a6f0f0389a0 Mon Sep 17 00:00:00 2001
++From 114369c0e83424814962f0cd5784d54d5ec63813 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:14 +0200
+Subject: tools-xentrace-prefix.diff
+
+---
- tools/xentrace/Makefile | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
++ tools/xentrace/Makefile | 9 ++++-----
++ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
- index 63b09c0..a559110 100644
++index 63b09c0..fcc578a 100644
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
- @@ -20,13 +20,11 @@ build: $(BIN) $(LIBBIN)
++@@ -5,6 +5,7 @@ CFLAGS += -Werror
++
++ CFLAGS += $(CFLAGS_libxenctrl)
++ LDLIBS += $(LDLIBS_libxenctrl)
+++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++
++ BIN = xentrace xentrace_setsize
++ LIBBIN = xenctx
++@@ -20,13 +21,11 @@ build: $(BIN) $(LIBBIN)
+
+ .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) $(DESTDIR)$(BINDIR)
+- $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+- [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PROG) $(BIN) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
+ $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
+
diff --cc debian/patches/0021-tools-python-xen-relative-path.diff.patch
index 89c42b3,0000000..1c0daaa
mode 100644,000000..100644
--- a/debian/patches/0021-tools-python-xen-relative-path.diff.patch
+++ b/debian/patches/0021-tools-python-xen-relative-path.diff.patch
@@@ -1,183 -1,0 +1,183 @@@
- From 304ab83d71fd0e5070b81a36d5fa220083a84e09 Mon Sep 17 00:00:00 2001
++From bf9eda5579d44877c9dfe76d4d1a63f2b42d11fc Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:19 +0200
+Subject: tools-python-xen-relative-path.diff
+
+---
+ tools/python/xen/xend/XendCheckpoint.py | 4 ++--
+ tools/python/xen/xend/XendConfig.py | 12 +++++------
+ tools/python/xen/xend/XendDomainInfo.py | 2 +-
+ tools/python/xen/xm/create.py | 35 ++++++++++++++-------------------
+ 4 files changed, 24 insertions(+), 29 deletions(-)
+
+diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py
+index a433ffa..940c9bf 100644
+--- a/tools/python/xen/xend/XendCheckpoint.py
++++ b/tools/python/xen/xend/XendCheckpoint.py
+@@ -118,7 +118,7 @@ def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1,sock=None):
+ # enabled. Passing "0" simply uses the defaults compiled into
+ # libxenguest; see the comments and/or code in xc_linux_save() for
+ # more information.
+- cmd = [xen.util.auxbin.pathTo(XC_SAVE), str(fd),
++ cmd = [xen.util.auxbin.path_bin(XC_SAVE), str(fd),
+ str(dominfo.getDomid()), "0", "0",
+ str(int(live) | (int(hvm) << 2)) ]
+ log.debug("[xc_save]: %s", string.join(cmd))
+@@ -299,7 +299,7 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False):
+
+ superpages = restore_image.superpages
+
+- cmd = map(str, [xen.util.auxbin.pathTo(XC_RESTORE),
++ cmd = map(str, [xen.util.auxbin.path_bin(XC_RESTORE),
+ fd, dominfo.getDomid(),
+ store_port, console_port, int(is_hvm), pae, apic, superpages, 1])
+ log.debug("[xc_restore]: %s", string.join(cmd))
+diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
+index 4a226a7..42406f3 100644
+--- a/tools/python/xen/xend/XendConfig.py
++++ b/tools/python/xen/xend/XendConfig.py
+@@ -493,11 +493,11 @@ class XendConfig(dict):
+
+ if self.is_hvm() or self.has_rfb():
+ if 'device_model' not in self['platform']:
+- self['platform']['device_model'] = auxbin.pathTo("qemu-dm")
++ self['platform']['device_model'] = auxbin.path_bin("qemu-dm")
+ # device_model may be set to 'qemu-dm' or 'stubdom-dm' w/o a path
+ if os.path.dirname(self['platform']['device_model']) == "":
+ self['platform']['device_model'] = \
+- auxbin.pathTo(self['platform']['device_model'])
++ auxbin.path_bin(self['platform']['device_model'])
+ # If the device_model is not set the os.path.exists() would raise
+ # an exception so we return our error message instead if applicable
+ if not self['platform']['device_model']:
+@@ -528,14 +528,14 @@ class XendConfig(dict):
+ # Old configs may have hvmloader set as PV_kernel param
+ if self.has_key('PV_kernel') and self['PV_kernel'] != '':
+ if self['PV_kernel'] == 'hvmloader':
+- self['PV_kernel'] = auxbin.pathTo("hvmloader")
++ self['PV_kernel'] = auxbin.path_boot("hvmloader")
+ self['platform']['loader'] = self['PV_kernel']
+ self['PV_kernel'] = ''
+ else:
+- self['platform']['loader'] = auxbin.pathTo("hvmloader")
++ self['platform']['loader'] = auxbin.path_boot("hvmloader")
+ log.debug("Loader is %s" % str(self['platform']['loader']))
+ elif self['platform']['loader'] == 'hvmloader':
+- self['platform']['loader'] = auxbin.pathTo("hvmloader")
++ self['platform']['loader'] = auxbin.path_boot("hvmloader")
+ if not os.path.exists(self['platform']['loader']):
+ raise VmError("kernel '%s' not found" % str(self['platform']['loader']))
+
+@@ -1653,7 +1653,7 @@ class XendConfig(dict):
+ # is invoked for pvfb services
+ if 'device_model' not in target['platform']:
+ target['platform']['device_model'] = \
+- auxbin.pathTo("qemu-dm")
++ auxbin.path_bin("qemu-dm")
+
+ # Finally, if we are a pvfb, we need to make a vkbd
+ # as well that is not really exposed to Xen API
+diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
+index 8d4ff5c..cb2d36d 100644
+--- a/tools/python/xen/xend/XendDomainInfo.py
++++ b/tools/python/xen/xend/XendDomainInfo.py
+@@ -3244,7 +3244,7 @@ class XendDomainInfo:
+ else:
+ # Boot using bootloader
+ if not blexec or blexec == 'pygrub':
+- blexec = auxbin.pathTo('pygrub')
++ blexec = auxbin.path_bin('pygrub')
+
+ blcfg = None
+ disks = [x for x in self.info['vbd_refs']
+diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
+index 22841aa..2ddf71b 100644
+--- a/tools/python/xen/xm/create.py
++++ b/tools/python/xen/xm/create.py
+@@ -695,45 +695,39 @@ def configure_image(vals):
+ return None
+ config_image = [ vals.builder ]
+ if vals.kernel:
++ t = auxbin.path_boot(vals.kernel)
+ if vals.bootloader:
+ # If bootloader is specified, vals.kernel will be used
+ # by bootloader when boots DomU. So it is needless to
+ # check the path is existent or not.
+ config_image.append([ 'kernel', vals.kernel ])
+- elif os.path.dirname(vals.kernel) != "" and os.path.exists(vals.kernel):
+- config_image.append([ 'kernel', vals.kernel ])
+ elif vals.kernel == 'hvmloader':
+ # Keep hvmloader w/o a path and let xend find it.
+ # This allows guest migration to a Dom0 having different
+ # xen install pathes.
+ config_image.append([ 'kernel', vals.kernel ])
+- elif os.path.exists(os.path.abspath(vals.kernel)):
+- # Keep old behaviour, if path is valid.
+- config_image.append([ 'kernel', os.path.abspath(vals.kernel) ])
++ elif t:
++ config_image.append([ 'kernel', t ])
+ else:
+ raise ValueError('Cannot find kernel "%s"' % vals.kernel)
+ if vals.ramdisk:
++ t = auxbin.path_boot(vals.ramdisk)
+ if vals.bootloader:
+ # Same with 'kernel' above
+ config_image.append([ 'ramdisk', vals.ramdisk ])
+- elif os.path.dirname(vals.ramdisk) != "" and os.path.exists(vals.ramdisk):
+- config_image.append([ 'ramdisk', vals.ramdisk ])
+- elif os.path.exists(os.path.abspath(vals.ramdisk)):
+- # Keep old behaviour, if path is valid.
+- config_image.append([ 'ramdisk', os.path.abspath(vals.ramdisk) ])
++ elif t:
++ config_image.append([ 'ramdisk', t ])
+ else:
+ raise ValueError('Cannot find ramdisk "%s"' % vals.ramdisk)
+ if vals.loader:
+- if os.path.dirname(vals.loader) != "" and os.path.exists(vals.loader):
+- config_image.append([ 'loader', vals.loader ])
+- elif vals.loader == 'hvmloader':
++ t = auxbin.path_boot(vals.loader)
++ if vals.loader == 'hvmloader':
+ # Keep hvmloader w/o a path and let xend find it.
+ # This allows guest migration to a Dom0 having different
+ # xen install pathes.
+ config_image.append([ 'loader', vals.loader ])
+- elif os.path.exists(os.path.abspath(vals.loader)):
+- # Keep old behaviour, if path is valid.
+- config_image.append([ 'loader', os.path.abspath(vals.loader) ])
++ elif t:
++ config_image.append([ 'loader', t ])
+ else:
+ raise ValueError('Cannot find loader "%s"' % vals.loader)
+ if vals.cmdline_ip:
+@@ -1032,7 +1026,7 @@ def configure_hvm(config_image, vals):
+ args = [ 'acpi', 'apic',
+ 'boot',
+ 'cpuid', 'cpuid_check',
+- 'device_model', 'display',
++ 'display',
+ 'fda', 'fdb',
+ 'gfx_passthru', 'guest_os_type',
+ 'hap', 'hpet',
+@@ -1054,6 +1048,8 @@ def configure_hvm(config_image, vals):
+ 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:
++ config_image.append(['device_model', auxbin.path_bin(vals.device_model)])
+ if vals.vncpasswd is not None:
+ config_image.append(['vncpasswd', vals.vncpasswd])
+
+@@ -1120,10 +1116,9 @@ def make_config(vals):
+
+ config_image = configure_image(vals)
+ if vals.bootloader:
+- if vals.bootloader == "pygrub":
+- vals.bootloader = auxbin.pathTo(vals.bootloader)
++ t = auxbin.path_boot(vals.bootloader)
+
+- config.append(['bootloader', vals.bootloader])
++ config.append(['bootloader', t])
+ if vals.bootargs:
+ config.append(['bootloader_args', vals.bootargs])
+ else:
diff --cc debian/patches/0022-tools-misc-xend-startup.diff.patch
index a58c77b,0000000..2738bf1
mode 100644,000000..100644
--- a/debian/patches/0022-tools-misc-xend-startup.diff.patch
+++ b/debian/patches/0022-tools-misc-xend-startup.diff.patch
@@@ -1,46 -1,0 +1,46 @@@
- From 1037430905680efb485a1ddc2eb4f28f8f703404 Mon Sep 17 00:00:00 2001
++From 1e805409ebe5a177993adb4b4693a2e11c0c1c43 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:20 +0200
+Subject: tools-misc-xend-startup.diff
+
+---
+ tools/python/xen/xend/xend | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/tools/python/xen/xend/xend b/tools/python/xen/xend/xend
+index 3446c8e..5495189 100644
+--- a/tools/python/xen/xend/xend
++++ b/tools/python/xen/xend/xend
+@@ -71,13 +71,6 @@ def check_user():
+ hline()
+ raise CheckError("invalid user")
+
+-def start_daemon(daemon, *args):
+- if os.fork() == 0:
+- os.execvp(daemon, (daemon,) + args)
+-
+-def start_blktapctrl():
+- start_daemon("blktapctrl", "")
+-
+ def main():
+ try:
+ check_logging()
+@@ -89,18 +82,14 @@ def main():
+ if not sys.argv[1:]:
+ print 'usage: %s {start|stop|reload|restart}' % sys.argv[0]
+ elif sys.argv[1] == 'start':
+- if os.uname()[0] != "SunOS":
+- start_blktapctrl()
+ return daemon.start()
+ elif sys.argv[1] == 'trace_start':
+- start_blktapctrl()
+ return daemon.start(trace=1)
+ elif sys.argv[1] == 'stop':
+ return daemon.stop()
+ elif sys.argv[1] == 'reload':
+ return daemon.reloadConfig()
+ elif sys.argv[1] == 'restart':
+- start_blktapctrl()
+ return daemon.stop() or daemon.start()
+ elif sys.argv[1] == 'status':
+ return daemon.status()
diff --cc debian/patches/0023-tools-disable.diff.patch
index a280fbc,0000000..659752e
mode 100644,000000..100644
--- a/debian/patches/0023-tools-disable.diff.patch
+++ b/debian/patches/0023-tools-disable.diff.patch
@@@ -1,39 -1,0 +1,39 @@@
- From 0f2567c76adb8217d3bce54772458334e8f1ff1b Mon Sep 17 00:00:00 2001
++From 45bf35fd25ad6a4a87fd812b07703f88d384e2ed Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:23 +0200
+Subject: tools-disable.diff
+
+---
+ tools/Makefile | 2 --
+ tools/Rules.mk | 4 ----
+ 2 files changed, 6 deletions(-)
+
+diff --git a/tools/Makefile b/tools/Makefile
+index 00c69ee..2fca717 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -19,8 +19,6 @@ SUBDIRS-$(CONFIG_Linux) += memshr
+ ifeq ($(CONFIG_X86)$(CONFIG_Linux),yy)
+ SUBDIRS-$(CONFIG_BLKTAP1) += blktap
+ endif
+-SUBDIRS-$(CONFIG_Linux) += blktap2
+-SUBDIRS-$(CONFIG_NetBSD) += blktap2
+ SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
+ SUBDIRS-y += libfsimage
+ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
+diff --git a/tools/Rules.mk b/tools/Rules.mk
+index 0d9d98c..74ce6bc 100644
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
+@@ -41,11 +41,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
+ LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan
+ SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN)
+
+-ifeq ($(CONFIG_Linux),y)
+-LIBXL_BLKTAP ?= y
+-else
+ LIBXL_BLKTAP ?= n
+-endif
+
+ ifeq ($(LIBXL_BLKTAP),y)
+ CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)
diff --cc debian/patches/0024-tools-examples-xend-disable-network.diff.patch
index 1e787c1,0000000..6d110f7
mode 100644,000000..100644
--- a/debian/patches/0024-tools-examples-xend-disable-network.diff.patch
+++ b/debian/patches/0024-tools-examples-xend-disable-network.diff.patch
@@@ -1,33 -1,0 +1,33 @@@
- From ccd27b88d14fb9b8450c776bbb768d9068ef6f41 Mon Sep 17 00:00:00 2001
++From e2119763be1aae854466139f452fbdd46afcf4c0 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:24 +0200
+Subject: tools-examples-xend-disable-network.diff
+
+---
+ tools/examples/xend-config.sxp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
+index 0896a27..f0cc520 100644
+--- a/tools/examples/xend-config.sxp
++++ b/tools/examples/xend-config.sxp
+@@ -132,6 +132,11 @@
+ #(console-limit 1024)
+
+ ##
++# NOTE:
++# Please read /usr/share/doc/xen-utils-common/README.Debian for Debian specific
++# informations about the network setup.
++
++##
+ # To bridge network traffic, like this:
+ #
+ # dom0: ----------------- bridge -> real eth0 -> the network
+@@ -170,7 +175,6 @@
+ # two fake interfaces per guest domain. To do things like this, write
+ # yourself a wrapper script, and call network-bridge from it, as appropriate.
+ #
+-(network-script network-bridge)
+
+ # The script used to control virtual interfaces. This can be overridden on a
+ # per-vif basis when creating a domain or a configuring a new vif. The
diff --cc debian/patches/0025-tools-examples-xend-disable-relocation.diff.patch
index ca5281c,0000000..fd67527
mode 100644,000000..100644
--- a/debian/patches/0025-tools-examples-xend-disable-relocation.diff.patch
+++ b/debian/patches/0025-tools-examples-xend-disable-relocation.diff.patch
@@@ -1,29 -1,0 +1,29 @@@
- From c7ed987e69ab06c4c2241de1e2c885e3485209c1 Mon Sep 17 00:00:00 2001
++From cb3723cc9efd29f3dc96b21d0448a2ba1b7a7898 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:25 +0200
+Subject: tools-examples-xend-disable-relocation.diff
+
+---
+ tools/examples/xend-config.sxp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
+index f0cc520..93a24fd 100644
+--- a/tools/examples/xend-config.sxp
++++ b/tools/examples/xend-config.sxp
+@@ -62,7 +62,6 @@
+ #(xend-tcp-xmlrpc-server no)
+ #(xend-unix-xmlrpc-server yes)
+ #(xend-relocation-server no)
+-(xend-relocation-server yes)
+ #(xend-relocation-ssl-server no)
+ #(xend-udev-event-server no)
+
+@@ -126,7 +125,6 @@
+ # (xend-relocation-hosts-allow '^localhost$ ^.*\\.example\\.org$')
+ #
+ #(xend-relocation-hosts-allow '')
+-(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$')
+
+ # The limit (in kilobytes) on the size of the console buffer
+ #(console-limit 1024)
diff --cc debian/patches/0026-tools-pygrub-remove-static-solaris-support.patch
index c5833fb,0000000..0701702
mode 100644,000000..100644
--- a/debian/patches/0026-tools-pygrub-remove-static-solaris-support.patch
+++ b/debian/patches/0026-tools-pygrub-remove-static-solaris-support.patch
@@@ -1,85 -1,0 +1,85 @@@
- From 3ac76cd474a0df61206685ea32f7d606edcd0eab Mon Sep 17 00:00:00 2001
++From e201b0c3404d104e6dda72eb498440110bf2f1f9 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:29 +0200
+Subject: tools-pygrub-remove-static-solaris-support
+
+---
+ tools/pygrub/src/pygrub | 51 +------------------------------------------------
+ 1 file changed, 1 insertion(+), 50 deletions(-)
+
+diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
- index 111750b..cd493b7 100644
++index 1e3e3ba..2964140 100644
+--- a/tools/pygrub/src/pygrub
++++ b/tools/pygrub/src/pygrub
+@@ -17,7 +17,6 @@ import os, sys, string, struct, tempfile, re, traceback
+ import copy
+ import logging
+ import platform
+-import xen.lowlevel.xc
+
+ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
+ import getopt
+@@ -640,51 +639,6 @@ def run_grub(file, entry, fs, cfg_args):
+
+ return grubcfg
+
+-def supports64bitPVguest():
+- xc = xen.lowlevel.xc.xc()
+- caps = xc.xeninfo()['xen_caps'].split(" ")
+- for cap in caps:
+- if cap == "xen-3.0-x86_64":
+- return True
+- return False
+-
+-# If nothing has been specified, look for a Solaris domU. If found, perform the
+-# necessary tweaks.
+-def sniff_solaris(fs, cfg):
+- if not fs.file_exists("/platform/i86xpv/kernel/unix") and \
+- not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
+- return cfg
+-
+- if not cfg["kernel"]:
+- if supports64bitPVguest() and \
+- fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
+- cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix"
+- cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive"
+- elif fs.file_exists("/platform/i86xpv/kernel/unix"):
+- cfg["kernel"] = "/platform/i86xpv/kernel/unix"
+- cfg["ramdisk"] = "/platform/i86pc/boot_archive"
+- else:
+- return cfg
+-
+- # Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k',
+- # and we need to maintain Xen properties (root= and ip=) and the kernel
+- # before any user args.
+-
+- xenargs = ""
+- userargs = ""
+-
+- if not cfg["args"]:
+- cfg["args"] = cfg["kernel"]
+- else:
+- for arg in cfg["args"].split():
+- if re.match("^root=", arg) or re.match("^ip=", arg):
+- xenargs += arg + " "
+- elif arg != cfg["kernel"]:
+- userargs += arg + " "
+- cfg["args"] = xenargs + " " + cfg["kernel"] + " " + userargs
+-
+- return cfg
+-
+ def sniff_netware(fs, cfg):
+ if not fs.file_exists("/nwserver/xnloader.sys"):
+ return cfg
+@@ -858,10 +812,7 @@ if __name__ == "__main__":
+ try:
+ fs = fsimage.open(file, offset, bootfsoptions)
+
+- chosencfg = sniff_solaris(fs, incfg)
+-
+- if not chosencfg["kernel"]:
+- chosencfg = sniff_netware(fs, incfg)
++ chosencfg = sniff_netware(fs, incfg)
+
+ if not chosencfg["kernel"]:
+ chosencfg = run_grub(file, entry, fs, incfg["args"])
diff --cc debian/patches/0027-tools-include-install.diff.patch
index 9be7a99,0000000..617c6f7
mode 100644,000000..100644
--- a/debian/patches/0027-tools-include-install.diff.patch
+++ b/debian/patches/0027-tools-include-install.diff.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 3e76f694f4a8707e5c9d6cd115a4bd1b45ead0ad Mon Sep 17 00:00:00 2001
++From 086940c4bfe38ecb88d2c9b6db069e1319ed6796 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:30 +0200
+Subject: tools-include-install.diff
+
+---
+ tools/include/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tools/include/Makefile b/tools/include/Makefile
- index 9ed41f1..8f1546c 100644
++index f7a6256..615f5bb 100644
+--- a/tools/include/Makefile
++++ b/tools/include/Makefile
+@@ -11,7 +11,6 @@ xen-foreign:
+ xen/.dir:
+ @rm -rf xen
+ mkdir -p xen/libelf
+- ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen
+ ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen
- ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) xen
++ ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm io xsm) xen
+ ln -sf ../xen-sys/$(XEN_OS) xen/sys
- @@ -28,7 +27,6 @@ install: all
++@@ -30,7 +29,6 @@ install: all
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/sys
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm
+- $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(INCLUDEDIR)/xen
+ $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen
+ $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86
+ $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm
diff --cc debian/patches/0028-tools-xenmon-install.diff.patch
index ba973f9,0000000..1c75ebd
mode 100644,000000..100644
--- a/debian/patches/0028-tools-xenmon-install.diff.patch
+++ b/debian/patches/0028-tools-xenmon-install.diff.patch
@@@ -1,33 -1,0 +1,33 @@@
- From e16bd9e6d1442a765debb612b4294bdce01a0202 Mon Sep 17 00:00:00 2001
++From 30ea99f928f36b916868e9eeb0f91160fdf0ddec Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:31 +0200
+Subject: tools-xenmon-install.diff
+
+---
+ tools/xenmon/Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
+index dab5415..7f7f99d 100644
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
+@@ -13,6 +13,10 @@
+ XEN_ROOT=$(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
++DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)
++PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH)
++INSTALL_PYTHON_PROG = $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
++
+ CFLAGS += -Werror
+ CFLAGS += $(CFLAGS_libxenctrl)
+ LDLIBS += $(LDLIBS_libxenctrl)
+@@ -31,7 +35,7 @@ install: build
+ $(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_PYTHON_PROG) xenmon.py $(DESTDIR)$(PRIVATE_BINDIR)/xenmon
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
+
diff --cc debian/patches/0029-tools-hotplug-udevrules.diff.patch
index 5519500,0000000..ad6c600
mode 100644,000000..100644
--- a/debian/patches/0029-tools-hotplug-udevrules.diff.patch
+++ b/debian/patches/0029-tools-hotplug-udevrules.diff.patch
@@@ -1,25 -1,0 +1,25 @@@
- From d1c768ea46c9b5ba443651a0ab58221a879bd198 Mon Sep 17 00:00:00 2001
++From f8e9bfff4a0b504fbd509dc87f053e90a4593064 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:32 +0200
+Subject: tools-hotplug-udevrules.diff
+
+---
+ tools/hotplug/Linux/xen-backend.rules | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules
+index a0d409e..f0d9901 100644
+--- a/tools/hotplug/Linux/xen-backend.rules
++++ b/tools/hotplug/Linux/xen-backend.rules
+@@ -5,11 +5,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online",
+ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif"
+ SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}"
+ SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
+-KERNEL=="evtchn", NAME="xen/%k"
+-SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600"
+-SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600"
+-KERNEL=="blktap-control", NAME="xen/blktap-2/control", MODE="0600"
+-KERNEL=="gntdev", NAME="xen/%k", MODE="0600"
+-KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
+-KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600"
+ SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
diff --cc debian/patches/0030-tools-python-shebang.diff.patch
index 44de22c,0000000..a87193e
mode 100644,000000..100644
--- a/debian/patches/0030-tools-python-shebang.diff.patch
+++ b/debian/patches/0030-tools-python-shebang.diff.patch
@@@ -1,175 -1,0 +1,175 @@@
- From c244013161c4bd79b28d1d605dfc70df2efc8471 Mon Sep 17 00:00:00 2001
++From cb11364de999703c102ef2fd798a8f361783c002 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:33 +0200
+Subject: tools-python-shebang.diff
+
+---
+ tools/python/xen/remus/save.py | 2 --
+ tools/python/xen/remus/vm.py | 2 --
+ tools/python/xen/util/bugtool.py | 2 --
+ tools/python/xen/util/pci.py | 2 --
+ tools/python/xen/util/vscsi_util.py | 1 -
+ tools/python/xen/xend/XendBase.py | 1 -
+ tools/python/xen/xend/XendClient.py | 1 -
+ tools/python/xen/xend/XendLocalStorageRepo.py | 1 -
+ tools/python/xen/xend/XendQCoWStorageRepo.py | 1 -
+ tools/python/xen/xend/XendSXPDev.py | 2 --
+ tools/python/xen/xend/XendStorageRepository.py | 1 -
+ tools/python/xen/xend/XendVDI.py | 1 -
+ tools/python/xen/xend/arch.py | 2 --
+ tools/python/xen/xend/osdep.py | 2 --
+ tools/python/xen/xend/sxp.py | 1 -
+ tools/python/xen/xm/xenapi_create.py | 1 -
+ 16 files changed, 23 deletions(-)
+
+diff --git a/tools/python/xen/remus/save.py b/tools/python/xen/remus/save.py
+index 2193061..fdf78aa 100644
+--- a/tools/python/xen/remus/save.py
++++ b/tools/python/xen/remus/save.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ import os, select, socket, threading, time, signal, xmlrpclib
+
+ from xen.xend.XendClient import server
+diff --git a/tools/python/xen/remus/vm.py b/tools/python/xen/remus/vm.py
+index 90002e3..b9d1263 100644
+--- a/tools/python/xen/remus/vm.py
++++ b/tools/python/xen/remus/vm.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ import xmlrpclib
+
+ from xen.xend.XendClient import server
+diff --git a/tools/python/xen/util/bugtool.py b/tools/python/xen/util/bugtool.py
+index 2abcc86..43aede8 100644
+--- a/tools/python/xen/util/bugtool.py
++++ b/tools/python/xen/util/bugtool.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+ # License as published by the Free Software Foundation.
+diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py
+index adeca4b..bfd7c22 100644
+--- a/tools/python/xen/util/pci.py
++++ b/tools/python/xen/util/pci.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-#
+ # PCI Device Information Class
+ # - Helps obtain information about which I/O resources a PCI device needs
+ #
+diff --git a/tools/python/xen/util/vscsi_util.py b/tools/python/xen/util/vscsi_util.py
+index 5872e65..6630527 100644
+--- a/tools/python/xen/util/vscsi_util.py
++++ b/tools/python/xen/util/vscsi_util.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- mode: python; -*-
+
+ #============================================================================
+diff --git a/tools/python/xen/xend/XendBase.py b/tools/python/xen/xend/XendBase.py
+index 9244776..96b7720 100644
+--- a/tools/python/xen/xend/XendBase.py
++++ b/tools/python/xen/xend/XendBase.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py
+index ef16699..2eb5095 100644
+--- a/tools/python/xen/xend/XendClient.py
++++ b/tools/python/xen/xend/XendClient.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+diff --git a/tools/python/xen/xend/XendLocalStorageRepo.py b/tools/python/xen/xend/XendLocalStorageRepo.py
+index 31b86f6..272f3a1 100644
+--- a/tools/python/xen/xend/XendLocalStorageRepo.py
++++ b/tools/python/xen/xend/XendLocalStorageRepo.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+diff --git a/tools/python/xen/xend/XendQCoWStorageRepo.py b/tools/python/xen/xend/XendQCoWStorageRepo.py
+index 726df0b..53846b4 100644
+--- a/tools/python/xen/xend/XendQCoWStorageRepo.py
++++ b/tools/python/xen/xend/XendQCoWStorageRepo.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+diff --git a/tools/python/xen/xend/XendSXPDev.py b/tools/python/xen/xend/XendSXPDev.py
+index f145701..13621f4 100644
+--- a/tools/python/xen/xend/XendSXPDev.py
++++ b/tools/python/xen/xend/XendSXPDev.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-#
+ # Helper functions for dealing with the sxp representation of devices
+
+ import types
+diff --git a/tools/python/xen/xend/XendStorageRepository.py b/tools/python/xen/xend/XendStorageRepository.py
+index 6ac94d3..c67aa37 100644
+--- a/tools/python/xen/xend/XendStorageRepository.py
++++ b/tools/python/xen/xend/XendStorageRepository.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+diff --git a/tools/python/xen/xend/XendVDI.py b/tools/python/xen/xend/XendVDI.py
+index f8abea6..778986f 100644
+--- a/tools/python/xen/xend/XendVDI.py
++++ b/tools/python/xen/xend/XendVDI.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+diff --git a/tools/python/xen/xend/arch.py b/tools/python/xen/xend/arch.py
+index 6d789d9..4f82735 100644
+--- a/tools/python/xen/xend/arch.py
++++ b/tools/python/xen/xend/arch.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-#
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+ # License as published by the Free Software Foundation.
+diff --git a/tools/python/xen/xend/osdep.py b/tools/python/xen/xend/osdep.py
+index b51dd2e..d03247a 100644
+--- a/tools/python/xen/xend/osdep.py
++++ b/tools/python/xen/xend/osdep.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-#
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+ # License as published by the Free Software Foundation.
+diff --git a/tools/python/xen/xend/sxp.py b/tools/python/xen/xend/sxp.py
+index c87270f..21ed514 100644
+--- a/tools/python/xen/xend/sxp.py
++++ b/tools/python/xen/xend/sxp.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py
+index 346ff20..31d0130 100644
+--- a/tools/python/xen/xm/xenapi_create.py
++++ b/tools/python/xen/xm/xenapi_create.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
diff --cc debian/patches/0031-tools-xenstore-compatibility.diff.patch
index e8096ad,0000000..5b3465a
mode 100644,000000..100644
--- a/debian/patches/0031-tools-xenstore-compatibility.diff.patch
+++ b/debian/patches/0031-tools-xenstore-compatibility.diff.patch
@@@ -1,61 -1,0 +1,61 @@@
- From 67c0cb5a0a066779caa8c56831ecc896cadbb7cd Mon Sep 17 00:00:00 2001
++From 030188d29ffe4e8e8260566d0963fa12f750a7e7 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:36 +0200
+Subject: tools-xenstore-compatibility.diff
+
+---
+ tools/xenstore/xenstore.h | 1 +
+ tools/xenstore/xenstore_client.c | 2 +-
+ tools/xenstore/xs.c | 4 +++-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tools/xenstore/xenstore.h b/tools/xenstore/xenstore.h
+index fdf5e76..b45224b 100644
+--- a/tools/xenstore/xenstore.h
++++ b/tools/xenstore/xenstore.h
+@@ -26,6 +26,7 @@
+
+ #define XS_OPEN_READONLY 1UL<<0
+ #define XS_OPEN_SOCKETONLY 1UL<<1
++#define XS_OPEN_DOMAINONLY 1UL<<2
+
+ /*
+ * Setting XS_UNWATCH_FILTER arranges that after xs_unwatch, no
+diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c
+index 0ec103f..be70ab4 100644
+--- a/tools/xenstore/xenstore_client.c
++++ b/tools/xenstore/xenstore_client.c
+@@ -632,7 +632,7 @@ main(int argc, char **argv)
+ max_width = ws.ws_col - 2;
+ }
+
+- xsh = xs_open(socket ? XS_OPEN_SOCKETONLY : 0);
++ xsh = xs_open(socket ? XS_OPEN_SOCKETONLY : XS_OPEN_DOMAINONLY);
+ if (xsh == NULL) err(1, "xs_open");
+
+ again:
+diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
+index dd03a85..15e65b8 100644
+--- a/tools/xenstore/xs.c
++++ b/tools/xenstore/xs.c
+@@ -282,17 +282,19 @@ struct xs_handle *xs_daemon_open_readonly(void)
+
+ struct xs_handle *xs_domain_open(void)
+ {
+- return xs_open(0);
++ return xs_open(XS_OPEN_DOMAINONLY);
+ }
+
+ struct xs_handle *xs_open(unsigned long flags)
+ {
+ struct xs_handle *xsh = NULL;
+
++ if (!(flags & XS_OPEN_DOMAINONLY)) {
+ if (flags & XS_OPEN_READONLY)
+ xsh = get_handle(xs_daemon_socket_ro());
+ else
+ xsh = get_handle(xs_daemon_socket());
++ }
+
+ if (!xsh && !(flags & XS_OPEN_SOCKETONLY))
+ xsh = get_handle(xs_domain_dev());
diff --cc debian/patches/0032-send-xl-coredumps-var-lib-xen-dump-NAME.patch
index dbe7d3c,0000000..e93f540
mode 100644,000000..100644
--- a/debian/patches/0032-send-xl-coredumps-var-lib-xen-dump-NAME.patch
+++ b/debian/patches/0032-send-xl-coredumps-var-lib-xen-dump-NAME.patch
@@@ -1,79 -1,0 +1,79 @@@
- From 071ee641afc48f40b8052c77c5eb1e4086297654 Mon Sep 17 00:00:00 2001
++From 2dec9f02a44a006887469c80a7649c31bb518899 Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ijc at hellion.org.uk>
+Date: Sun, 31 Aug 2014 01:42:03 +0100
+Subject: send xl coredumps /var/lib/xen/dump/NAME
+
+---
+ docs/man/xl.cfg.pod.5 | 4 ++--
+ tools/Makefile | 2 +-
+ tools/libxl/xl_cmdimpl.c | 2 +-
+ tools/python/xen/xend/XendDomainInfo.py | 4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
+index e15a49f..d26ea0b 100644
+--- a/docs/man/xl.cfg.pod.5
++++ b/docs/man/xl.cfg.pod.5
+@@ -268,12 +268,12 @@ destroy`.
+
+ =item B<coredump-destroy>
+
+-write a "coredump" of the domain to F</var/xen/dump/NAME> and then
++write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
+ destroy the domain.
+
+ =item B<coredump-restart>
+
+-write a "coredump" of the domain to F</var/xen/dump/NAME> and then
++write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
+ restart the domain.
+
+ =back
+diff --git a/tools/Makefile b/tools/Makefile
+index 2fca717..7c2dcaf 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -58,7 +58,7 @@ all: subdirs-all
+
+ .PHONY: install
+ install: subdirs-install
+- $(INSTALL_DIR) $(DESTDIR)/var/xen/dump
++ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump/
+ $(INSTALL_DIR) $(DESTDIR)/var/log/xen
+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
+ $(INSTALL_DIR) $(DESTDIR)/var/lock/subsys
+diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
+index 4fc46eb..4e9dacb 100644
+--- a/tools/libxl/xl_cmdimpl.c
++++ b/tools/libxl/xl_cmdimpl.c
+@@ -1815,7 +1815,7 @@ static int handle_domain_death(uint32_t *r_domid,
+ char *corefile;
+ int rc;
+
+- if (asprintf(&corefile, "/var/xen/dump/%s", d_config->c_info.name) < 0) {
++ if (asprintf(&corefile, "/var/lib/xen/dump/%s", d_config->c_info.name) < 0) {
+ LOG("failed to construct core dump path");
+ } else {
+ LOG("dumping core to %s", corefile);
+diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
+index cb2d36d..793f3b2 100644
+--- a/tools/python/xen/xend/XendDomainInfo.py
++++ b/tools/python/xen/xend/XendDomainInfo.py
+@@ -2288,7 +2288,7 @@ class XendDomainInfo:
+ # To prohibit directory traversal
+ based_name = os.path.basename(self.info['name_label'])
+
+- coredir = "/var/xen/dump/%s" % (based_name)
++ coredir = "/var/lib/xen/dump/%s" % (based_name)
+ if not os.path.exists(coredir):
+ try:
+ mkdir.parents(coredir, stat.S_IRWXU)
+@@ -2297,7 +2297,7 @@ class XendDomainInfo:
+
+ if not os.path.isdir(coredir):
+ # Use former directory to dump core
+- coredir = '/var/xen/dump'
++ coredir = '/var/lib/xen/dump/'
+
+ this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
+ corefile = "%s/%s-%s.%s.core" % (coredir, this_time,
diff --cc debian/patches/series
index 706b44c,0000000..01adedf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,41 -1,0 +1,32 @@@
+0001-version.patch
+0002-config-prefix.diff.patch
+0003-tools-libfsimage-abiname.diff.patch
+0004-tools-libxc-abiname.diff.patch
+0005-tools-libxl-abiname.diff.patch
+0006-tools-xenstat-abiname.diff.patch
+0007-tools-rpath.diff.patch
+0008-tools-blktap2-prefix.diff.patch
+0009-tools-console-prefix.diff.patch
+0010-tools-libfsimage-prefix.diff.patch
- 0011-tools-libfsimage-rpath.diff.patch
- 0012-tools-libxl-prefix.diff.patch
- 0013-tools-misc-prefix.diff.patch
- 0014-tools-misc-rpath.diff.patch
- 0015-tools-pygrub-prefix.diff.patch
- 0016-tools-python-prefix.diff.patch
- 0017-tools-python-rpath.diff.patch
- 0018-tools-xcutils-rpath.diff.patch
- 0019-tools-xenmon-prefix.diff.patch
- 0020-tools-xenmon-rpath.diff.patch
- 0021-tools-xenpaging-prefix.diff.patch
- 0022-tools-xenstat-prefix.diff.patch
- 0023-tools-xenstat-rpath.diff.patch
- 0024-tools-xenstore-prefix.diff.patch
- 0025-tools-xenstore-rpath.diff.patch
- 0026-tools-xentrace-prefix.diff.patch
- 0027-tools-xentrace-rpath.diff.patch
- 0028-tools-python-xen-relative-path.diff.patch
- 0029-tools-misc-xend-startup.diff.patch
- 0030-tools-disable.diff.patch
- 0031-tools-examples-xend-disable-network.diff.patch
- 0032-tools-examples-xend-disable-relocation.diff.patch
- 0033-tools-pygrub-remove-static-solaris-support.patch
- 0034-tools-include-install.diff.patch
- 0035-tools-xenmon-install.diff.patch
- 0036-tools-hotplug-udevrules.diff.patch
- 0037-tools-python-shebang.diff.patch
- 0038-tools-ocaml-fix-build.diff.patch
- 0039-tools-xenstore-compatibility.diff.patch
- 0040-Set-library-path-to-multi-arch-location.patch
- 0041-send-xl-coredumps-var-lib-xen-dump-NAME.patch
++0011-tools-libxl-prefix.diff.patch
++0012-tools-misc-prefix.diff.patch
++0013-tools-pygrub-prefix.diff.patch
++0014-tools-python-prefix.diff.patch
++0015-tools-xcutils-rpath.diff.patch
++0016-tools-xenmon-prefix.diff.patch
++0017-tools-xenpaging-prefix.diff.patch
++0018-tools-xenstat-prefix.diff.patch
++0019-tools-xenstore-prefix.diff.patch
++0020-tools-xentrace-prefix.diff.patch
++0021-tools-python-xen-relative-path.diff.patch
++0022-tools-misc-xend-startup.diff.patch
++0023-tools-disable.diff.patch
++0024-tools-examples-xend-disable-network.diff.patch
++0025-tools-examples-xend-disable-relocation.diff.patch
++0026-tools-pygrub-remove-static-solaris-support.patch
++0027-tools-include-install.diff.patch
++0028-tools-xenmon-install.diff.patch
++0029-tools-hotplug-udevrules.diff.patch
++0030-tools-python-shebang.diff.patch
++0031-tools-xenstore-compatibility.diff.patch
++0032-send-xl-coredumps-var-lib-xen-dump-NAME.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list