[Pkg-xen-changes] [xen] 02/02: Put core dumps in /var/lib/xen/dump and ensure it exists (Closes: #444000)
Ian Campbell
ijc-guest at moszumanska.debian.org
Sun Aug 31 01:07:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
ijc-guest pushed a commit to branch feature/bug444000
in repository xen.
commit 4c4a6ec404c3c20be943f8a29b305eaf8997421c
Merge: e12936d 071ee64
Author: Ian Campbell <ijc at hellion.org.uk>
Date: Sun Aug 31 01:42:41 2014 +0100
Put core dumps in /var/lib/xen/dump and ensure it exists (Closes: #444000)
debian/.git-dpm | 4 +-
debian/changelog | 7 ++
debian/patches/0001-version.patch | 1 +
debian/patches/0002-config-prefix.diff.patch | 3 +
.../0003-tools-libfsimage-abiname.diff.patch | 3 +
debian/patches/0004-tools-libxc-abiname.diff.patch | 3 +
debian/patches/0005-tools-libxl-abiname.diff.patch | 3 +
.../patches/0006-tools-xenstat-abiname.diff.patch | 3 +
debian/patches/0007-tools-rpath.diff.patch | 3 +
.../patches/0008-tools-blktap2-prefix.diff.patch | 3 +
.../patches/0009-tools-console-prefix.diff.patch | 3 +
.../0010-tools-libfsimage-prefix.diff.patch | 3 +
.../patches/0011-tools-libfsimage-rpath.diff.patch | 3 +
debian/patches/0012-tools-libxl-prefix.diff.patch | 3 +
debian/patches/0013-tools-misc-prefix.diff.patch | 3 +
debian/patches/0014-tools-misc-rpath.diff.patch | 3 +
debian/patches/0015-tools-pygrub-prefix.diff.patch | 3 +
debian/patches/0016-tools-python-prefix.diff.patch | 3 +
debian/patches/0017-tools-python-rpath.diff.patch | 3 +
debian/patches/0018-tools-xcutils-rpath.diff.patch | 3 +
debian/patches/0019-tools-xenmon-prefix.diff.patch | 3 +
debian/patches/0020-tools-xenmon-rpath.diff.patch | 3 +
.../patches/0021-tools-xenpaging-prefix.diff.patch | 3 +
.../patches/0022-tools-xenstat-prefix.diff.patch | 3 +
debian/patches/0023-tools-xenstat-rpath.diff.patch | 3 +
.../patches/0024-tools-xenstore-prefix.diff.patch | 3 +
.../patches/0025-tools-xenstore-rpath.diff.patch | 3 +
.../patches/0026-tools-xentrace-prefix.diff.patch | 3 +
.../patches/0027-tools-xentrace-rpath.diff.patch | 3 +
.../0028-tools-python-xen-relative-path.diff.patch | 3 +
.../0029-tools-misc-xend-startup.diff.patch | 3 +
debian/patches/0030-tools-disable.diff.patch | 3 +
...-tools-examples-xend-disable-network.diff.patch | 3 +
...ols-examples-xend-disable-relocation.diff.patch | 3 +
...ools-pygrub-remove-static-solaris-support.patch | 3 +
.../patches/0034-tools-include-install.diff.patch | 3 +
.../patches/0035-tools-xenmon-install.diff.patch | 3 +
.../0036-tools-hotplug-udevrules.diff.patch | 3 +
.../patches/0037-tools-python-shebang.diff.patch | 3 +
.../patches/0038-tools-ocaml-fix-build.diff.patch | 3 +
.../0039-tools-xenstore-compatibility.diff.patch | 3 +
...0-Set-library-path-to-multi-arch-location.patch | 3 +
...1-send-xl-coredumps-var-lib-xen-dump-NAME.patch | 82 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/xen-utils-common.dirs | 1 +
docs/man/xl.cfg.pod.5 | 4 +-
tools/Makefile | 2 +-
tools/libxl/xl_cmdimpl.c | 2 +-
tools/python/xen/xend/XendDomainInfo.py | 4 +-
49 files changed, 217 insertions(+), 8 deletions(-)
diff --cc debian/.git-dpm
index 0c1e11f,0000000..c535fd1
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
- 93bead88e51dce30e9c5ffb8e899f4f0f6897c64
- 93bead88e51dce30e9c5ffb8e899f4f0f6897c64
++071ee641afc48f40b8052c77c5eb1e4086297654
++071ee641afc48f40b8052c77c5eb1e4086297654
+960b45d65509eb156ccdac8f50a31ffa28e963a1
+960b45d65509eb156ccdac8f50a31ffa28e963a1
+xen_4.4.0.orig.tar.xz
+39aaa0627cd93920be8d12e4c63042c23d653c8c
+3767352
diff --cc debian/changelog
index 5e62065,0000000..a0fe810
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,1097 -1,0 +1,1104 @@@
++xen (4.4.0-5) UNRELEASED; urgency=medium
++
++ [ Ian Campbell ]
++ * Put core dumps in /var/lib/xen/dump and ensure it exists (Closes: #444000)
++
++ -- Ian Campbell <ijc at hellion.org.uk> Sun, 31 Aug 2014 01:42:45 +0100
++
+xen (4.4.0-4) unstable; urgency=medium
+
+ [ Bastian Blank ]
+ * Also remove unused OCaml packages from control file.
+ * Make library packages multi-arch: same. (closes: #730417)
+ * Use debhelper compat level 9. (closes: #692352)
+
+ [ Ian Campbell ]
+ * Correct contents of /etc/xen/scripts/hotplugpath.sh (Closes: #706283)
+ * Drop references cpuperf-xen and cpuperf-perfcntr. (Closes: #733847)
+ * Install xentrace_format(1), xentrace(8) and xentop(1). (Closes: #407143)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 30 Aug 2014 13:34:04 +0200
+
+xen (4.4.0-3) unstable; urgency=medium
+
+ [ Ian Campbell ]
+ * Use correct SeaBIOS binary which supports Xen (Closes: #737905).
+
+ [ Bastian Blank ]
+ * Really update config.{sub,guess}.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 29 Aug 2014 16:33:19 +0200
+
+xen (4.4.0-2) unstable; urgency=medium
+
+ * Remove broken and unused OCaml-support.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 18 Aug 2014 15:18:42 +0200
+
+xen (4.4.0-1) unstable; urgency=medium
+
+ [ Bastian Blank ]
+ * New upstream release.
+ - Update scripts for compatiblity with latest coreutils.
+ (closes: #718898)
+ - Fix guest reboot with xl toolstack. (closes: #727100)
+ - CVE-2013-6375: Insufficient TLB flushing in VT-d (iommu) code.
+ (closes: #730254)
+ - xl support for global VNC options. (closes: #744157)
+ - vif scripts can now be named relative to /etc/xen/scripts.
+ (closes: #744160)
+ - Support for arbitrary sized SeaBIOS binaries. (closes: #737905)
+ - pygrub searches for extlinux.conf in the expected places.
+ (closes: #697407)
+ - Update scripts to use correct syntax for ip command.
+ (closes: #705659)
+ * Fix install of xend configs to not break compatibility.
+
+ [ Ian Campbell ]
+ * Disable blktap1 support using new configure option instead of by patching.
+ * Disable qemu-traditional and rombios support using new configure option
+ instead of by patching. No need to build-depend on ipxe any more.
+ * Use system qemu-xen via new configure option instead of patching.
+ * Use system seabios via new configure option instead of patching.
+ * Use EXTRA_CFLAGS_XEN_TOOLS and APPEND_{CPPFLAGS,LDFLAGS} during build.
+ * Add support for armhf and arm64.
+ * Update config.{sub,guess}.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 09 Aug 2014 13:09:00 +0200
+
+xen (4.3.0-3) unstable; urgency=low
+
+ * Revive hypervisor on i386.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 18 Oct 2013 00:15:16 +0200
+
+xen (4.3.0-2) unstable; urgency=low
+
+ * Force proper install order. (closes: #721999)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 05 Oct 2013 15:03:36 +0000
+
+xen (4.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fix HVM PCI passthrough. (closes: #706543)
+ * Call configure with proper arguments.
+ * Remove now empty xen-docs package.
+ * Disable external code retrieval.
+ * Drop all i386 hypervisor packages.
+ * Drop complete blktap support.
+ * Create /run/xen.
+ * Make xen-utils recommend qemu-system-x86. (closes: #688311)
+ - This version comes with audio support. (closes: #635166)
+ * Make libxenlight and libxlutil public. (closes: #644390)
+ - Set versioned ABI name.
+ - Install headers.
+ - Move libs into normal library path.
+ * Use build flags in the tools build.
+ - Fix fallout from harderning flags.
+ * Update Standards-Version to 3.9.4. No changes.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 05 Sep 2013 13:54:03 +0200
+
+xen (4.2.2-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fix build with gcc 4.8. (closes: #712376)
+ * Build-depend on libssl-dev. (closes: #712366)
+ * Enable hardening as much as possible.
+ * Re-enable ocaml build fixes. (closes: #695176)
+ * Check for out-of-bound values in CPU affinity setup.
+ CVE-2013-2072
+ * Fix information leak on AMD CPUs.
+ CVE-2013-2076
+ * Recover from faults on XRSTOR.
+ CVE-2013-2077
+ * Properly check guest input to XSETBV.
+ CVE-2013-2078
+
+ -- Bastian Blank <waldi at debian.org> Thu, 11 Jul 2013 00:28:24 +0200
+
+xen (4.2.1-2) unstable; urgency=low
+
+ * Actually upload to unstable.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 12 May 2013 00:20:58 +0200
+
+xen (4.2.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Enable usage of seabios.
+ * Fix some toolchain issues.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 11 May 2013 23:55:46 +0200
+
+xen (4.2.0-2) experimental; urgency=low
+
+ * Support JSON output in domain init script helper.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 01 Oct 2012 15:11:30 +0200
+
+xen (4.2.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Bastian Blank <waldi at debian.org> Tue, 18 Sep 2012 13:54:30 +0200
+
+xen (4.2.0~rc3-1) experimental; urgency=low
+
+ * New upstream snapshot.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 07 Sep 2012 20:28:46 +0200
+
+xen (4.2.0~rc2-1) experimental; urgency=low
+
+ * New upstream snapshot.
+ * Build-depend against libglib2.0-dev and libyajl-dev.
+ * Disable seabios build for now.
+ * Remove support for Lenny and earlier.
+ * Support build-arch and build-indep make targets.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 13 May 2012 12:21:10 +0000
+
+xen (4.1.4-4) unstable; urgency=high
+
+ * Make several long runing operations preemptible.
+ CVE-2013-1918
+ * Fix source validation for VT-d interrupt remapping.
+ CVE-2013-1952
+
+ -- Bastian Blank <waldi at debian.org> Thu, 02 May 2013 14:30:29 +0200
+
+xen (4.1.4-3) unstable; urgency=high
+
+ * Fix return from SYSENTER.
+ CVE-2013-1917
+ * Fix various problems with guest interrupt handling.
+ CVE-2013-1919
+ * Only save pointer after access checks.
+ CVE-2013-1920
+ * Fix domain locking for transitive grants.
+ CVE-2013-1964
+
+ -- Bastian Blank <waldi at debian.org> Fri, 19 Apr 2013 13:01:57 +0200
+
+xen (4.1.4-2) unstable; urgency=low
+
+ * Use pre-device interrupt remapping mode per default. Fix removing old
+ remappings.
+ CVE-2013-0153
+
+ -- Bastian Blank <waldi at debian.org> Wed, 06 Feb 2013 13:04:52 +0100
+
+xen (4.1.4-1) unstable; urgency=low
+
+ * New upstream release.
+ - Disable process-context identifier support in newer CPUs for all
+ domains.
+ - Add workarounds for AMD errata.
+ - Don't allow any non-canonical addresses.
+ - Use Multiboot memory map if BIOS emulation does not provide one.
+ - Fix several problems in tmem.
+ CVE-2012-3497
+ - Fix error handling in domain creation.
+ - Adjust locking and interrupt handling during S3 resume.
+ - Tighten more resource and memory range checks.
+ - Reset performance counters. (closes: #698651)
+ - Remove special-case for first IO-APIC.
+ - Fix MSI handling for HVM domains. (closes: #695123)
+ - Revert cache value of disks in HVM domains.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 31 Jan 2013 15:44:50 +0100
+
+xen (4.1.3-8) unstable; urgency=high
+
+ * Fix error in VT-d interrupt remapping source validation.
+ CVE-2012-5634
+ * Fix buffer overflow in qemu e1000 emulation.
+ CVE-2012-6075
+ * Update patch, mention second CVE.
+ CVE-2012-5511, CVE-2012-6333
+
+ -- Bastian Blank <waldi at debian.org> Sat, 19 Jan 2013 13:55:07 +0100
+
+xen (4.1.3-7) unstable; urgency=low
+
+ * Fix clock jump due to incorrect annotated inline assembler.
+ (closes: #599161)
+ * Add support for XZ compressed Linux kernels to hypervisor and userspace
+ based loaders, it is needed for any Linux kernels newer then Wheezy.
+ (closes: #695056)
+
+ -- Bastian Blank <waldi at debian.org> Tue, 11 Dec 2012 18:54:59 +0100
+
+xen (4.1.3-6) unstable; urgency=high
+
+ * Fix error handling in physical to machine memory mapping.
+ CVE-2012-5514
+
+ -- Bastian Blank <waldi at debian.org> Tue, 04 Dec 2012 10:51:43 +0100
+
+xen (4.1.3-5) unstable; urgency=high
+
+ * Fix state corruption due to incomplete grant table switch.
+ CVE-2012-5510
+ * Check range of arguments to several HVM operations.
+ CVE-2012-5511, CVE-2012-6333
+ * Check array index before using it in HVM memory operation.
+ CVE-2012-5512
+ * Check memory range in memory exchange operation.
+ CVE-2012-5513
+ * Don't allow too large memory size and avoid busy looping.
+ CVE-2012-5515
+
+ -- Bastian Blank <waldi at debian.org> Mon, 03 Dec 2012 19:37:38 +0100
+
+xen (4.1.3-4) unstable; urgency=high
+
+ * Use linux 3.2.0-4 stuff.
+ * Fix overflow in timer calculations.
+ CVE-2012-4535
+ * Check value of physical interrupts parameter before using it.
+ CVE-2012-4536
+ * Error out on incorrect memory mapping updates.
+ CVE-2012-4537
+ * Check if toplevel page tables are present.
+ CVE-2012-4538
+ * Fix infinite loop in compatibility code.
+ CVE-2012-4539
+ * Limit maximum kernel and ramdisk size.
+ CVE-2012-2625, CVE-2012-4544
+
+ -- Bastian Blank <waldi at debian.org> Tue, 20 Nov 2012 15:51:01 +0100
+
+xen (4.1.3-3) unstable; urgency=low
+
+ * Xen domain init script:
+ - Make sure Open vSwitch is started before any domain.
+ - Properly handle and show output of failed migration and save.
+ - Ask all domains to shut down before checking them.
+
+ -- Bastian Blank <waldi at debian.org> Tue, 18 Sep 2012 13:26:32 +0200
+
+xen (4.1.3-2) unstable; urgency=medium
+
+ * Don't allow writing reserved bits in debug register.
+ CVE-2012-3494
+ * Fix error handling in interrupt assignment.
+ CVE-2012-3495
+ * Don't trigger bug messages on invalid flags.
+ CVE-2012-3496
+ * Check array bounds in interrupt assignment.
+ CVE-2012-3498
+ * Properly check bounds while setting the cursor in qemu.
+ CVE-2012-3515
+ * Disable monitor in qemu by default.
+ CVE-2012-4411
+
+ -- Bastian Blank <waldi at debian.org> Fri, 07 Sep 2012 19:41:46 +0200
+
+xen (4.1.3-1) unstable; urgency=medium
+
+ * New upstream release: (closes: #683286)
+ - Don't leave the x86 emulation in a bad state. (closes: #683279)
+ CVE-2012-3432
+ - Only check for shared pages while any exist on teardown.
+ CVE-2012-3433
+ - Fix error handling for unexpected conditions.
+ - Update CPUID masking to latest Intel spec.
+ - Allow large ACPI ids.
+ - Fix IOMMU support for PCI-to-PCIe bridges.
+ - Disallow access to some sensitive IO-ports.
+ - Fix wrong address in IOTLB.
+ - Fix deadlock on CPUs without working cpufreq driver.
+ - Use uncached disk access in qemu.
+ - Fix buffer size on emulated e1000 device in qemu.
+ * Fixup broken and remove applied patches.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 17 Aug 2012 11:25:02 +0200
+
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-5) unstable; urgency=low
+
+ [ Ian Campbell ]
+ * Set tap device MAC addresses to fe:ff:ff:ff:ff:ff (Closes: #671018)
+ * Only run xendomains initscript if toolstack is xl or xm (Closes: #680528)
+
+ [ Bastian Blank ]
+ * Actually build-depend on new enough version of dpkg-dev.
+ * Add xen-sytem-* meta-packages. We are finally in a position to do
+ automatic upgrades and this package is missing. (closes: #681376)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 28 Jul 2012 10:23:26 +0200
+
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-4) unstable; urgency=low
+
+ * Add Build-Using info to xen-utils package.
+ * Fix build-arch target.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 01 Jul 2012 19:52:30 +0200
+
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-3) unstable; urgency=low
+
+ * Remove /usr/lib/xen-default. It breaks systems if xenstored is not
+ compatible.
+ * Fix init script usage.
+ * Fix udev rules for emulated network devices:
+ - Force names of emulated network devices to a predictable name.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 01 Jul 2012 16:59:04 +0200
+
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-2) unstable; urgency=low
+
+ * Fix pointer missmatch in interrupt functions. Fixes build on i386.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 15 Jun 2012 18:00:51 +0200
+
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ - Fix privilege escalation and syscall/sysenter DoS while using
+ non-canonical addresses by untrusted PV guests. (closes: #677221)
+ CVE-2012-0217
+ CVE-2012-0218
+ - Disable Xen on CPUs affected by AMD Erratum #121. PV guests can
+ cause a DoS of the host.
+ CVE-2012-2934
+ * Don't fail if standard toolstacks are not available. (closes: #677244)
+
+ -- Bastian Blank <waldi at debian.org> Thu, 14 Jun 2012 17:06:25 +0200
+
+xen (4.1.2-7) unstable; urgency=low
+
+ * Really use ucf.
+ * Update init script dependencies:
+ - Start $syslog before xen.
+ - Start drbd and iscsi before xendomains. (closes: #626356)
+ - Start corosync and heartbeat after xendomains.
+ * Remove /var/log/xen on purge. (closes: #656216)
+
+ -- Bastian Blank <waldi at debian.org> Tue, 22 May 2012 10:44:41 +0200
+
+xen (4.1.2-6) unstable; urgency=low
+
+ * Fix generation of architectures for hypervisor packages.
+ * Remove information about loop devices, it is incorrect. (closes: #503044)
+ * Update xendomains init script:
+ - Create directory for domain images only root readable. (closes: #596048)
+ - Add missing sanity checks for variables. (closes: #671750)
+ - Remove not longer supported config options.
+ - Don't fail if no config is available.
+ - Remove extra output if domain was restored.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 06 May 2012 20:07:41 +0200
+
+xen (4.1.2-5) unstable; urgency=low
+
+ * Actually force init script rename. (closes: #669341)
+ * Fix long output from xl.
+ * Move complete init script setup.
+ * Rewrite xendomains init script:
+ - Use LSB output functions.
+ - Make output more clear.
+ - Use xen toolstack wrapper.
+ - Use a python script to properly read domain details.
+ * Set name for Domain-0.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 23 Apr 2012 11:56:45 +0200
+
+xen (4.1.2-4) unstable; urgency=low
+
+ [ Bastian Blank ]
+ * Build-depend on ipxe-qemu instead of ipxe. (closes: #665070)
+ * Don't longer use a4wide latex package.
+ * Use ucf for /etc/default/xen.
+ * Remove handling for old udev rules link and xenstored directory.
+ * Rename xend init script to xen.
+
+ [ Lionel Elie Mamane ]
+ * Fix toolstack script to work with old dash. (closes: #648029)
+
+ -- Bastian Blank <waldi at debian.org> Mon, 16 Apr 2012 08:47:29 +0000
+
+xen (4.1.2-3) unstable; urgency=low
+
+ * Merge xen-common source package.
+ * Remove xend wrapper, it should not be called by users.
+ * Support xl in init script.
+ * Restart xen daemons on upgrade.
+ * Restart and stop xenconsoled in init script.
+ * Load xen-gntdev module.
+ * Create /var/lib/xen. (closes: #658101)
+ * Cleanup udev rules. (closes: #657745)
+
+ -- Bastian Blank <waldi at debian.org> Wed, 01 Feb 2012 19:28:28 +0100
+
+xen (4.1.2-2) unstable; urgency=low
+
+ [ Jon Ludlam ]
+ * Import (partially reworked) upstream changes for OCaml support.
+ - Rename the ocamlfind packages.
+ - Remove uuid and log libraries.
+ - Fix 2 bit-twiddling bugs and an off-by-one
+ * Fix build of OCaml libraries.
+ * Add OCaml library and development package.
+ * Include some missing headers.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 10 Dec 2011 19:13:25 +0000
+
+xen (4.1.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build-depend on pkg-config.
+ * Add package libxen-4.1. Includes some shared libs.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 26 Nov 2011 18:28:06 +0100
+
+xen (4.1.1-3) unstable; urgency=low
+
+ [ Julien Danjou ]
+ * Remove Julien Danjou from the Uploaders field. (closes: #590439)
+
+ [ Bastian Blank ]
+ * Use current version of python. (closes: #646660)
+ * Build-depend against liblzma-dev, it is used if available.
+ (closes: #646694)
+ * Update Standards-Version to 3.9.2. No changes.
+ * Don't use brace-expansion in debhelper install files.
+
+ -- Bastian Blank <waldi at debian.org> Wed, 26 Oct 2011 14:42:33 +0200
+
+xen (4.1.1-2) unstable; urgency=low
+
+ * Fix hvmloader with gcc 4.6.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 05 Aug 2011 23:58:36 +0200
+
+xen (4.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Don't use qemu-dm if it is not needed. (Backport from xen-unstable.)
+ * Use dh_python2.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 18 Jul 2011 19:38:38 +0200
+
+xen (4.1.0-3) unstable; urgency=low
+
+ * Add ghostscript to build-deps.
+ * Enable qemu-dm build.
+ - Add qemu as another orig tar.
+ - Remove blktap1, bluetooth and sdl support from qemu.
+ - Recommend qemu-keymaps and qemu-utils.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 28 Apr 2011 15:20:45 +0200
+
+xen (4.1.0-2) unstable; urgency=low
+
+ * Re-enable hvmloader:
+ - Use packaged ipxe.
+ * Workaround incompatibility with xenstored of Xen 4.0.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 15 Apr 2011 11:38:25 +0200
+
+xen (4.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 27 Mar 2011 18:09:28 +0000
+
+xen (4.1.0~rc6-1) unstable; urgency=low
+
+ * New upstream release candidate.
+ * Build documentation using pdflatex.
+ * Use python 2.6. (closes: #596545)
+ * Fix lintian override.
+ * Install new tools: xl, xenpaging.
+ * Enable blktap2.
+ - Use own md5 implementation.
+ - Fix includes.
+ - Fix linking of blktap2 binaries.
+ - Remove optimization setting.
+ * Temporarily disable hvmloader, wants to download ipxe.
+ * Remove xenstored pid check from xl.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 17 Mar 2011 16:12:45 +0100
+
+xen (4.0.1-2) unstable; urgency=low
+
+ * Fix races in memory management.
+ * Make sure that frame-table compression leaves enough alligned.
+ * Disable XSAVE support. (closes: #595490)
+ * Check for dying domain instead of raising an assertion.
+ * Add C6 state with EOI errata for Intel.
+ * Make some memory management interrupt safe. Unsure if really needed.
+ * Raise bar for inter-socket migrations on mostly-idle systems.
+ * Fix interrupt handling for legacy routed interrupts.
+ * Allow to set maximal domain memory even during a running change.
+ * Support new partition name in pygrub. (closes: #599243)
+ * Fix some comparisions "< 0" that may be optimized away.
+ * Check for MWAIT support before using it.
+ * Fix endless loop on interrupts on Nehalem cpus.
+ * Don't crash upon direct GDT/LDT access. (closes: #609531)
+ CVE-2010-4255
+ * Don't loose timer ticks after domain restore.
+ * Reserve some space for IOMMU area in dom0. (closes: #608715)
+ * Fix hypercall arguments after trace callout.
+ * Fix some error paths in vtd support. Memory leak.
+ * Reinstate ACPI DMAR table.
+
+ -- Bastian Blank <waldi at debian.org> Wed, 12 Jan 2011 15:01:40 +0100
+
+xen (4.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fix IOAPIC S3 with interrupt remapping enabled.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 03 Sep 2010 17:14:28 +0200
+
+xen (4.0.1~rc6-1) unstable; urgency=low
+
+ * New upstream release candidate.
+ - Add some missing locks for page table walk.
+ - Fix NMU injection into guest.
+ - Fix ioapic updates for vt-d.
+ - Add check for GRUB2 commandline behaviour.
+ - Fix handling of invalid kernel images.
+ - Allow usage of powernow.
+ * Remove lowlevel python modules usage from pygrub. (closes: #588811)
+
+ -- Bastian Blank <waldi at debian.org> Tue, 17 Aug 2010 23:15:34 +0200
+
+xen (4.0.1~rc5-1) unstable; urgency=low
+
+ * New upstream release candidate.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 02 Aug 2010 17:06:27 +0200
+
+xen (4.0.1~rc3-1) unstable; urgency=low
+
+ * New upstream release candidate.
+ * Call dh_pyversion with the correct version.
+ * Restart xen daemon on upgrade.
+
+ -- Bastian Blank <waldi at debian.org> Wed, 30 Jun 2010 16:30:47 +0200
+
+xen (4.0.0-2) unstable; urgency=low
+
+ * Fix python dependency. (closes: #586666)
+ - Use python-support.
+ - Hardcode to use python 2.5 for now.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 21 Jun 2010 17:23:16 +0200
+
+xen (4.0.0-1) unstable; urgency=low
+
+ * Update to unstable.
+ * Fix spelling in README.
+ * Remove unnecessary build-depends.
+ * Fixup xend to use different filename lookup.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 17 Jun 2010 11:16:55 +0200
+
+xen (4.0.0-1~experimental.2) experimental; urgency=low
+
+ * Merge changes from 3.4.3-1.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 28 May 2010 12:58:12 +0200
+
+xen (4.0.0-1~experimental.1) experimental; urgency=low
+
+ * New upstream version.
+ * Rename source package to xen.
+ * Build depend against iasl and uuid-dev.
+ * Disable blktap2 support, it links against OpenSSL.
+ * Update copyright file.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 06 May 2010 15:47:38 +0200
+
+xen-3 (3.4.3-1) unstable; urgency=low
+
+ * New upstream version.
+ * Disable blktap support, it is unusable with current kernels.
+ * Disable libaio, was only used by blktap.
+ * Drop device creation support. (closes: #583283)
+
+ -- Bastian Blank <waldi at debian.org> Fri, 28 May 2010 11:43:18 +0200
+
+xen-3 (3.4.3~rc6-1) unstable; urgency=low
+
+ * New upstream release candidate.
+ - Relocate multiboot modules. (closes: #580045)
+ - Support grub2 in pygrub. (closes: #573311)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 08 May 2010 11:32:29 +0200
+
+xen-3 (3.4.3~rc3-2) unstable; urgency=low
+
+ * Again list the complete version in the hypervisor.
+ * Fix path detection for bootloader, document it. (closes: #481105)
+ * Rewrite README.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 08 Apr 2010 16:14:58 +0200
+
+xen-3 (3.4.3~rc3-1) unstable; urgency=low
+
+ * New upstream release candidate.
+ * Use 3.0 (quilt) source format.
+ * Always use current python version.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 01 Mar 2010 22:14:22 +0100
+
+xen-3 (3.4.2-2) unstable; urgency=low
+
+ * Remove Jeremy T. Bouse from uploaders.
+ * Export blktap lib and headers.
+ * Build amd64 hypervisor on i386. (closes: #366315)
+
+ -- Bastian Blank <waldi at debian.org> Sun, 22 Nov 2009 16:54:47 +0100
+
+xen-3 (3.4.2-1) unstable; urgency=low
+
+ * New upstream version.
+ * Strip hvmloader by hand.
+ * Remove extra license file from libxen-dev.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 16 Nov 2009 20:57:07 +0100
+
+xen-3 (3.4.1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 21 Aug 2009 21:34:38 +0200
+
+xen-3 (3.4.0-2) unstable; urgency=low
+
+ * Add symbols file for libxenstore3.0. (closes: #536173)
+ * Document that ioemu is currently unsupported. (closes: #536175)
+ * Fix location of fsimage plugins. (closes: #536174)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 18 Jul 2009 18:05:35 +0200
+
+xen-3 (3.4.0-1) unstable; urgency=low
+
+ [ Bastian Blank ]
+ * New upstream version.
+ * Remove ioemu for now. (closes: #490409, #496367)
+ * Remove non-pae hypervisor.
+ * Use debhelper compat level 7.
+ * Make the init script start all daemons.
+
+ -- Bastian Blank <waldi at debian.org> Tue, 30 Jun 2009 22:33:22 +0200
+
+xen-3 (3.2.1-2) unstable; urgency=low
+
+ * Use e2fslibs based ext2 support for pygrub. (closes: #476366)
+ * Fix missing checks in pvfb code.
+ See CVE-2008-1952. (closes: #487095)
+ * Add support for loading bzImage files. (closes: #474509)
+ * Enable TLS support in ioemu code.
+ * Drop libcrypto usage because of GPL-incompatibility.
+ * Remove AES code from blktap drivers. Considered broken.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 28 Jun 2008 11:30:43 +0200
+
+xen-3 (3.2.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Set rpath relative to ${ORIGIN}.
+ * Add lintian override to xen-utils package.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 22 May 2008 14:01:47 +0200
+
+xen-3 (3.2.0-5) unstable; urgency=low
+
+ * Provide correct directory to dh_pycentral.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 14 Apr 2008 21:43:49 +0200
+
+xen-3 (3.2.0-4) unstable; urgency=low
+
+ * Pull in newer xen-utils-common.
+ * Fix missing size checks in the ioemu block driver. (closes: #469654)
+ See: CVE-2008-0928
+
+ -- Bastian Blank <waldi at debian.org> Fri, 07 Mar 2008 14:21:38 +0100
+
+xen-3 (3.2.0-3) unstable; urgency=low
+
+ * Clean environment for build.
+ * Add packages libxenstore3.0 and xenstore-utils.
+ * Move docs package in docs section to match overwrites.
+ * Make the hypervisor only recommend the utils.
+ * Cleanup installation. (closes: #462989)
+
+ -- Bastian Blank <waldi at debian.org> Tue, 12 Feb 2008 12:40:56 +0000
+
+xen-3 (3.2.0-2) unstable; urgency=low
+
+ * Fix broken patch. (closes: #462522)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 26 Jan 2008 17:21:52 +0000
+
+xen-3 (3.2.0-1) unstable; urgency=low
+
+ * New upstream version.
+ * Add package libxen-dev. Including public headers and static libs.
+ (closes: #402249)
+ * Don't longer install xenfb, removed upstream.
+
+ -- Bastian Blank <waldi at debian.org> Tue, 22 Jan 2008 12:51:49 +0000
+
+xen-3 (3.1.2-2) unstable; urgency=low
+
+ * Add missing rpath definitions.
+ * Fix building of pae version.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 08 Dec 2007 12:07:42 +0000
+
+xen-3 (3.1.2-1) unstable; urgency=high
+
+ * New upstream release:
+ - Move shared file into /var/run. (closes: #447795)
+ See CVE-2007-3919.
+ - x86: Fix various problems with debug-register handling. (closes: #451626)
+ See CVE-2007-5906.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 24 Nov 2007 13:24:45 +0000
+
+xen-3 (3.1.1-1) unstable; urgency=low
+
+ * New upstream release:
+ - Don't use exec with untrusted values in pygrub. (closes: #444430)
+ See CVE-2007-4993.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 19 Oct 2007 16:02:37 +0000
+
+xen-3 (3.1.0-2) unstable; urgency=low
+
+ * Switch to texlive for documentation.
+ * Drop unused transfig.
+ * Drop unused latex features from documentation.
+ * Build depend against gcc-multilib for amd64. (closes: #439662)
+
+ -- Bastian Blank <waldi at debian.org> Fri, 31 Aug 2007 08:15:50 +0000
+
+xen-3 (3.1.0-1) unstable; urgency=low
+
+ [ Julien Danjou ]
+ * New upstream version.
+
+ [ Ralph Passgang ]
+ * Added graphviz to Build-Indeps
+
+ [ Bastian Blank ]
+ * Upstream removed one part of the version. Do it also.
+ * Merge utils packages.
+ * Install blktap support.
+ * Install pygrub.
+ * Install xenfb tools.
+ * xenconsoled startup is racy, wait a little bit.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 20 Aug 2007 15:05:08 +0000
+
+xen-3.0 (3.0.4-1-1) unstable; urgency=low
+
+ [ Bastian Blank ]
+ * New upstream version (closes: #394411)
+
+ [ Guido Trotter ]
+ * Actually try to build and release xen 3.0.4
+ * Update build dependencies
+
+ -- Guido Trotter <ultrotter at debian.org> Wed, 23 May 2007 11:57:29 +0100
+
+xen-3.0 (3.0.3-0-2) unstable; urgency=medium
+
+ [Bastian Blank]
+ * Remove device recreate code.
+ * Remove build dependency on linux-support-X
+
+ [ Guido Trotter ]
+ * Add missing build dependency on zlib1g-dev (closes: #396557)
+ * Add missing build dependencies on libncurses5-dev and x11proto-core-dev
+ (closes: #396561, #396567)
+
+ -- Guido Trotter <ultrotter at debian.org> Thu, 2 Nov 2006 16:38:02 +0000
+
+xen-3.0 (3.0.3-0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 20 Oct 2006 11:04:35 +0000
+
+xen-3.0 (3.0.3~rc4+hg11760-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ * Ignore update-grub errors. (closes: #392534)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 14 Oct 2006 13:09:53 +0000
+
+xen-3.0 (3.0.3~rc1+hg11686-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ * Rename ioemu package to include the complete version.
+ * Fix name of hypervisor. (closes: #391771)
+
+ -- Bastian Blank <waldi at debian.org> Mon, 9 Oct 2006 12:48:13 +0000
+
+xen-3.0 (3.0.2-3+hg9762-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ * Rename hypervisor and utils packages to include the complete version.
+ * Redo build environment.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 4 Sep 2006 18:43:12 +0000
+
+xen-3.0 (3.0.2+hg9697-2) unstable; urgency=low
+
+ [ Guido Trotter ]
+ * Update xen-utils' README.Debian (closes: #372524)
+
+ [ Bastian Blank ]
+ * Adopt new python policy. (closes: #380990)
+ * Add patch to make new kernels working on the hypervisor.
+
+ -- Bastian Blank <waldi at debian.org> Tue, 15 Aug 2006 19:20:08 +0000
+
+xen-3.0 (3.0.2+hg9697-1) unstable; urgency=low
+
+ [ Guido Trotter ]
+ * Update Standards Version
+ * Merge upstream fixes trunk (upstream 3.0.2-3 + a couple of fixes)
+
+ [ Bastian Blank ]
+ * Add xen-ioemu-3.0 package to support HVM guests (closes: #368496)
+
+ -- Guido Trotter <ultrotter at debian.org> Wed, 31 May 2006 10:50:05 +0200
+
+xen-3.0 (3.0.2+hg9681-1) unstable; urgency=low
+
+ * Update xen-hypervisor-3.0-i386 and xen-hypervisor-3.0-i386-pae
+ descriptions, specifying what the difference between the two packages is
+ (closes: #366019)
+ * Merge upstream fixes trunk
+
+ -- Guido Trotter <ultrotter at debian.org> Thu, 18 May 2006 15:25:02 +0200
+
+xen-3.0 (3.0.2+hg9656-1) unstable; urgency=low
+
+ * Merge upstream fixes trunk
+ - This includes a fix for CVE-2006-1056
+
+ -- Guido Trotter <ultrotter at debian.org> Thu, 27 Apr 2006 17:34:03 +0200
+
+xen-3.0 (3.0.2+hg9651-1) unstable; urgency=low
+
+ * Merge upstream fixes trunk
+ * Fix PAE disabled in pae build (Closes: #364875)
+
+ -- Julien Danjou <acid at debian.org> Wed, 26 Apr 2006 13:19:39 +0200
+
+xen-3.0 (3.0.2+hg9646-1) unstable; urgency=low
+
+ [ Guido Trotter ]
+ * Merge upstream fixes trunk
+
+ [ Bastian Blank ]
+ * debian/patches/libdir.dpatch: Update to make xm save work
+
+ -- Julien Danjou <acid at debian.org> Mon, 24 Apr 2006 18:02:07 +0200
+
+xen-3.0 (3.0.2+hg9611-1) unstable; urgency=low
+
+ * Merge upstream bug fixes
+ * Fix bug with xend init.d script
+
+ -- Julien Danjou <acid at debian.org> Wed, 12 Apr 2006 17:35:35 +0200
+
+xen-3.0 (3.0.2+hg9598-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix copyright file
+
+ -- Julien Danjou <acid at debian.org> Mon, 10 Apr 2006 17:02:55 +0200
+
+xen-3.0 (3.0.1+hg8762-1) unstable; urgency=low
+
+ * The "preserve our homes" release
+ * Now cooperatively maintained by the Debian Xen Team
+ * New upstream release (closes: #327493, #342249)
+ * Build depend on transfig (closes: #321157)
+ * Use gcc rather than gcc-3.4 to compile (closes: #323698)
+ * Split xen-hypervisor-3.0 and xen-utils-3.0
+ * Build both normal and pae hypervisor packages
+ * Change maintainer and add uploaders field
+ * Add force-reload support for init script xendomains
+ * Remove dependency against bash
+ * Bump standards version to 3.6.2.2
+ * xen-utils-3.0 conflicts and replaces xen
+ * Add dpatch structure to the package
+ * Remove build-dependency on gcc (it's build essential anyway)
+ * Make SrvServer.py not executable
+ * Create NEWS.Debian file with important upgrade notices
+ * Update copyright file
+ * Remove the linux-patch-xen package
+ * Removed useless build-dependencies: libncurses5-dev, wget
+ * Changed xendomains config path to /etc/default
+ * xen-utils-3.0 now provides xen-utils and xen-hypervisor-3.0-i386 &
+ xen-hypervisor-3.0-i386-pae & xen-hypervizor-amd64 now provide
+ xen-hypervisor
+ * Made xen-utils-3.0.postinst more fault-tolerant, so that upgrading
+ xen2 -> xen3 don't fail because of a running xen2 hypervisor
+ * Updated the "Replaces & Conflicts"
+ * Install only and correctly udev files
+ * Compile date is no more in current locale
+ * Add patch which add the debian version and maintainer in the version
+ string and removes the banner.
+ * Don't install unusable cruft in xen-utils
+ * Remove libxen packages (no stable API/ABI)
+
+ -- Julien Danjou <acid at debian.org> Wed, 5 Apr 2006 16:05:07 +0200
+
+xen (2.0.6-1) unstable; urgency=low
+
+ * Patches applied upstream: non-xen-init-exit.patch, add-build.patch,
+ python-install.patch, disable-html-docs.patch.
+ * New upstream released. Closes: #311336.
+ * Remove comparison to UML from xen short description. Closes: #317066.
+ * Make packages conflicts with 1.2 doc debs. Closes: #304285.
+ * Add iproute to xen depends, as it uses /bin/ip. Closes: #300488,
+ #317468.
+
+ -- Adam Heath <doogie at brainfood.com> Wed, 06 Jul 2005 12:35:50 -0500
+
+xen (2.0.5-3) experimental; urgency=low
+
+ * Change priority/section to match the overrides file.
+
+ -- Adam Heath <doogie at brainfood.com> Fri, 18 Mar 2005 12:43:50 -0600
+
+xen (2.0.5-2) experimental; urgency=low
+
+ * Mike McCallister <mike+debian at metalogue.com>,
+ Tommi Virtanen <tv at debian.org>, Tom Hibbert <tom at nsp.co.nz>:
+ Fix missing '.' in update-rc.d call in xen.postinst. Closes: #299384
+
+ -- Adam Heath <doogie at brainfood.com> Fri, 18 Mar 2005 11:39:56 -0600
+
+xen (2.0.5-1) experimental; urgency=low
+
+ * New upstream.
+ * Remove pic-lib.patch, tools-misc-TARGETS.patch, and clean-mttr.patch
+ as they have been applied upstream(in various forms).
+ * xend now starts at priority 20, stops at 21, while xendomains starts
+ at 21, and stops at 20.
+
+ -- Adam Heath <doogie at brainfood.com> Fri, 11 Mar 2005 14:33:33 -0600
+
+xen (2.0.4-4) experimental; urgency=low
+
+ * Bah, major booboo. Add /boot to debian/xen.install, so xen.gz will
+ get shipped. Reported by Clint Adams <schizo at debian.org>.
+
+ -- Adam Heath <doogie at brainfood.com> Tue, 15 Feb 2005 13:00:57 -0600
+
+xen (2.0.4-3) experimental; urgency=low
+
+ * Fix file overlap(/usr/share/doc/xen/examples/*) between xen and
+ xen-docs. Reported by Tupshin Harper <tupshin at tupshin.com>.
+
+ -- Adam Heath <doogie at brainfood.com> Sun, 06 Feb 2005 01:22:45 -0600
+
+xen (2.0.4-2) experimental; urgency=low
+
+ * Fix kernel patch generation. It was broken when I integrated with
+ debian's kernel source. I used a symlink, and diff doesn't follow
+ those.
+
+ -- Adam Heath <doogie at brainfood.com> Sat, 05 Feb 2005 18:16:35 -0600
+
+xen (2.0.4-1) experimental; urgency=low
+
+ * New upstream.
+ * xen.deb can now install on a plain kernel; that is, the init scripts
+ exit successfully if /proc/xen/privcmd doesn't exist. This allows
+ for dual-boot setups.
+ * Manpages do not yet exist xend, xenperf, xensv, xfrd, nor xm. xend
+ xfrd are daemons, and take little if any options. I've not had a need
+ to use xenperf nor xensv yet. xm has nice built in help(xm help).
+ * Upstream now requires either linux 2.4.29, or 2.6.10. Since 2.4.29 is
+ not yet in debian, disable the 2.4 patch generation. Closes: #271245.
+ * Not certain how the kernel-patch-xen was empty. It's not now, with
+ the repackaging. Closes: #272299.
+ * Xen no longer produces kernel images, so problems about missing features
+ are no longer valid. Closes: #253924.
+ * Acknowledge nmu bugs:
+ * No longer build-depend on gcc 3.3, as the default gcc works. Closes:
+ #243048.
+
+ -- Adam Heath <doogie at brainfood.com> Sat, 05 Feb 2005 18:04:27 -0600
+
+xen (2.0.3-0.1) unstable; urgency=low
+
+ * Changes from Tommi Virtanen:
+ * Added dh-kpatches and libcurl3-dev to Build-Depends.
+ * Add /etc/xen/sv/params.py and /etc/xen/xend/params.py.
+ * Add xmexample1 and xmexample2 to xen/doc/examples.
+
+ -- Adam Heath <doogie at brainfood.com> Wed, 26 Jan 2005 10:55:07 -0600
+
+xen (2.0.3-0) unstable; urgency=low
+
+ * New upstream. Closes: #280733.
+ * Repackaged from scratch.
+ * Using unreleased patch management system. See debian/README.build.
+ * After extracting the .dsc, there are no special steps needed
+ * Those wanting to change the source, use the normal procedures for
+ any package, including using interdiff(or other tool) to send a
+ patch to me or the bts.
+ * No longer try to do anything fancy with regard to the layout of the
+ built kernels. Now, only patches are distributed. Please make use of
+ the xen support in kernel-package.
+ * Early preview release to #debian-devel.
+
+ -- Adam Heath <doogie at brainfood.com> Tue, 25 Jan 2005 13:24:54 -0600
+
+xen (1.2-4.1) unstable; urgency=high
+
+ * NMU
+ * Remove gcc-3.2 from Build-Depends as isn't used during build
+ (Closes: #243048)
+
+ -- Frank Lichtenheld <djpig at debian.org> Sat, 21 Aug 2004 17:42:28 +0200
+
+xen (1.2-4) unstable; urgency=low
+
+ * Added xen-docs.README.Debian, which explains the kernel image layout,
+ and contains references on the locations differ from what is mentioned
+ by the upstream documentation. Closes: #230345.
+
+ -- Adam Heath <doogie at brainfood.com> Fri, 26 Mar 2004 17:36:41 -0600
+
+xen (1.2-3) unstable; urgency=low
+
+ * Add kernel-source-2.4.25 and kernel-patch-debian-2.4.25 to
+ Build-Depends-Indep.
+
+ -- Adam Heath <doogie at brainfood.com> Tue, 23 Mar 2004 20:14:39 -0600
+
+xen (1.2-2) unstable; urgency=low
+
+ * xen: moved /boot/xen.gz to /usr/lib/kernels/xen-i386/images/vmlinuz
+ * kernel-image, kernel-modules: swapped i386/xeno to xeno/i386 in
+ /usr/lib/kernels.
+ * Add kernel-patch-nfs-swap deb.
+ * Apply additional patches to kernel-image-xen:
+ * nfs-group
+ * nfs-swap
+
+ -- Adam Heath <doogie at brainfood.com> Thu, 04 Mar 2004 12:47:47 -0600
+
+xen (1.2-1) unstable; urgency=low
+
+ * Initial version.
+
+ -- Adam Heath <doogie at brainfood.com> Tue, 02 Mar 2004 13:21:52 -0600
diff --cc debian/patches/0001-version.patch
index 2f712fd,0000000..408bda7
mode 100644,000000..100644
--- a/debian/patches/0001-version.patch
+++ b/debian/patches/0001-version.patch
@@@ -1,170 -1,0 +1,171 @@@
+From 3af76d3edaea67658163e3d1fc8c1ed3a70a31ae Mon Sep 17 00:00:00 2001
++Message-Id: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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
+--- 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
+--- 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..8ea2b6e
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,53 @@@
+From 8b0bf3ad05a7e948baa42a05f65fa5ff7c7cc5be Mon Sep 17 00:00:00 2001
++Message-Id: <8b0bf3ad05a7e948baa42a05f65fa5ff7c7cc5be.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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(-)
+
+diff --git a/Config.mk b/Config.mk
+index eb2c192..953122b 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
+--- a/config/StdGNU.mk
++++ b/config/StdGNU.mk
+@@ -30,16 +30,19 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
+ PREFIX ?= /usr
+ BINDIR = $(PREFIX)/bin
+ INCLUDEDIR = $(PREFIX)/include
+-LIBEXEC = $(PREFIX)/lib/xen/bin
++LIBDIR = $(PREFIX)/lib
+ 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_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..0364137
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,62 @@@
+From f2203c717c8e26d6c203bf96199343c74163badb Mon Sep 17 00:00:00 2001
++Message-Id: <f2203c717c8e26d6c203bf96199343c74163badb.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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..f616076
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,101 @@@
+From ccabc6a4e41371130dbe94853d1e6066ae8ddab2 Mon Sep 17 00:00:00 2001
++Message-Id: <ccabc6a4e41371130dbe94853d1e6066ae8ddab2.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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..b0e8ae8
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,83 @@@
+From 0764e612e4b46dab9adad7106aab901bf0896ef3 Mon Sep 17 00:00:00 2001
++Message-Id: <0764e612e4b46dab9adad7106aab901bf0896ef3.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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..7f8d2ad
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,66 @@@
+From 51579fa479c4afbc5c677725c73baf854360f1b8 Mon Sep 17 00:00:00 2001
++Message-Id: <51579fa479c4afbc5c677725c73baf854360f1b8.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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..2d6d44d
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,25 @@@
+From 479d90ee22e4a370a65f3fb90476884ff1e2629d Mon Sep 17 00:00:00 2001
++Message-Id: <479d90ee22e4a370a65f3fb90476884ff1e2629d.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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..c75e26c
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,157 @@@
+From eef276f7bc0ea0355ee0fb4a65797675fbaff6db Mon Sep 17 00:00:00 2001
++Message-Id: <eef276f7bc0ea0355ee0fb4a65797675fbaff6db.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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..96588ed
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,35 @@@
+From e4f9e8c63dd2ea84a9484537850fcaf20596c418 Mon Sep 17 00:00:00 2001
++Message-Id: <e4f9e8c63dd2ea84a9484537850fcaf20596c418.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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..8ba013b
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,51 @@@
+From 6ea03d7a26b3ef4f0e97c9f75a227850e68b4c22 Mon Sep 17 00:00:00 2001
++Message-Id: <6ea03d7a26b3ef4f0e97c9f75a227850e68b4c22.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/common/Makefile | 6 ++++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
+index 8a23655..9aedcc7 100644
+--- a/tools/libfsimage/Rules.mk
++++ b/tools/libfsimage/Rules.mk
+@@ -6,7 +6,7 @@ LDFLAGS += -L../common/
+
+ 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-libfsimage-rpath.diff.patch
index 8c5b19e,0000000..329cfbb
mode 100644,000000..100644
--- a/debian/patches/0011-tools-libfsimage-rpath.diff.patch
+++ b/debian/patches/0011-tools-libfsimage-rpath.diff.patch
@@@ -1,21 -1,0 +1,24 @@@
+From edac38c6428c11764047b4c3847d7ee9d2d20e80 Mon Sep 17 00:00:00 2001
++Message-Id: <edac38c6428c11764047b4c3847d7ee9d2d20e80.1409445761.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:56 +0200
+Subject: tools-libfsimage-rpath.diff
+
+---
+ tools/libfsimage/Rules.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
+index 9aedcc7..2750f4f 100644
+--- a/tools/libfsimage/Rules.mk
++++ b/tools/libfsimage/Rules.mk
+@@ -3,6 +3,7 @@ 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))
+
diff --cc debian/patches/0012-tools-libxl-prefix.diff.patch
index 251b412,0000000..0055a8a
mode 100644,000000..100644
--- a/debian/patches/0012-tools-libxl-prefix.diff.patch
+++ b/debian/patches/0012-tools-libxl-prefix.diff.patch
@@@ -1,69 -1,0 +1,72 @@@
+From 115e1e09532eaa3c48f29cd8fea6043decafef3b Mon Sep 17 00:00:00 2001
++Message-Id: <115e1e09532eaa3c48f29cd8fea6043decafef3b.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0013-tools-misc-prefix.diff.patch
index 267fab2,0000000..83ea481
mode 100644,000000..100644
--- a/debian/patches/0013-tools-misc-prefix.diff.patch
+++ b/debian/patches/0013-tools-misc-prefix.diff.patch
@@@ -1,41 -1,0 +1,44 @@@
+From 63986546e43197e064de938e8c99baec0214a8cc Mon Sep 17 00:00:00 2001
++Message-Id: <63986546e43197e064de938e8c99baec0214a8cc.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/python/xen/xend/xend | 2 ++
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/tools/misc/Makefile b/tools/misc/Makefile
+index 17aeda5..fbc20cf 100644
+--- a/tools/misc/Makefile
++++ b/tools/misc/Makefile
+@@ -41,12 +41,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/0014-tools-misc-rpath.diff.patch
index 5b2b9f0,0000000..67ef6c5
mode 100644,000000..100644
--- a/debian/patches/0014-tools-misc-rpath.diff.patch
+++ b/debian/patches/0014-tools-misc-rpath.diff.patch
@@@ -1,22 -1,0 +1,25 @@@
+From bf9b7e12f1b97bc48e46e7610515a4d866c99c37 Mon Sep 17 00:00:00 2001
++Message-Id: <bf9b7e12f1b97bc48e46e7610515a4d866c99c37.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:00 +0200
+Subject: tools-misc-rpath.diff
+
+---
+ tools/misc/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/misc/Makefile b/tools/misc/Makefile
+index fbc20cf..56d4b82 100644
+--- a/tools/misc/Makefile
++++ b/tools/misc/Makefile
+@@ -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
+
diff --cc debian/patches/0015-tools-pygrub-prefix.diff.patch
index 8d48153,0000000..1287eca
mode 100644,000000..100644
--- a/debian/patches/0015-tools-pygrub-prefix.diff.patch
+++ b/debian/patches/0015-tools-pygrub-prefix.diff.patch
@@@ -1,41 -1,0 +1,44 @@@
+From 6ec7b50ff252a9933fff45c784670c0841b598b5 Mon Sep 17 00:00:00 2001
++Message-Id: <6ec7b50ff252a9933fff45c784670c0841b598b5.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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
+--- 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/0016-tools-python-prefix.diff.patch
index 0ab3e3f,0000000..4a7b429
mode 100644,000000..100644
--- a/debian/patches/0016-tools-python-prefix.diff.patch
+++ b/debian/patches/0016-tools-python-prefix.diff.patch
@@@ -1,62 -1,0 +1,65 @@@
+From 8694cab781c57fd1a2a0625008b7a71c3946e7be Mon Sep 17 00:00:00 2001
++Message-Id: <8694cab781c57fd1a2a0625008b7a71c3946e7be.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:02 +0200
+Subject: tools-python-prefix.diff
+
+---
+ tools/python/xen/util/auxbin.py | 36 +++++++++++++++++++-----------------
+ 1 file changed, 19 insertions(+), 17 deletions(-)
+
+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/0017-tools-python-rpath.diff.patch
index dfcc2c2,0000000..7b2381a
mode 100644,000000..100644
--- a/debian/patches/0017-tools-python-rpath.diff.patch
+++ b/debian/patches/0017-tools-python-rpath.diff.patch
@@@ -1,93 -1,0 +1,96 @@@
+From a2a35eed745082415d89f2ef5893708d3247abf6 Mon Sep 17 00:00:00 2001
++Message-Id: <a2a35eed745082415d89f2ef5893708d3247abf6.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:03 +0200
+Subject: tools-python-rpath.diff
+
+---
+ tools/python/setup.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+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 --cc debian/patches/0018-tools-xcutils-rpath.diff.patch
index 25b54ad,0000000..a860571
mode 100644,000000..100644
--- a/debian/patches/0018-tools-xcutils-rpath.diff.patch
+++ b/debian/patches/0018-tools-xcutils-rpath.diff.patch
@@@ -1,22 -1,0 +1,25 @@@
+From 90fe4cf21df373149af41da2b85ea9eee941f1f3 Mon Sep 17 00:00:00 2001
++Message-Id: <90fe4cf21df373149af41da2b85ea9eee941f1f3.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0019-tools-xenmon-prefix.diff.patch
index d3a97fa,0000000..fe4f44a
mode 100644,000000..100644
--- a/debian/patches/0019-tools-xenmon-prefix.diff.patch
+++ b/debian/patches/0019-tools-xenmon-prefix.diff.patch
@@@ -1,28 -1,0 +1,31 @@@
+From 0c76747bca83b242b069196e534a7f3675466a8e Mon Sep 17 00:00:00 2001
++Message-Id: <0c76747bca83b242b069196e534a7f3675466a8e.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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(-)
+
+diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
+index 3fe87ba..76383e0 100644
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
+@@ -27,10 +27,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/0020-tools-xenmon-rpath.diff.patch
index 916840c,0000000..75025df
mode 100644,000000..100644
--- a/debian/patches/0020-tools-xenmon-rpath.diff.patch
+++ b/debian/patches/0020-tools-xenmon-rpath.diff.patch
@@@ -1,21 -1,0 +1,24 @@@
+From dccfc292f512dbae0a0c10f921d8cd3167c64ce9 Mon Sep 17 00:00:00 2001
++Message-Id: <dccfc292f512dbae0a0c10f921d8cd3167c64ce9.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:07 +0200
+Subject: tools-xenmon-rpath.diff
+
+---
+ tools/xenmon/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
+index 76383e0..dab5415 100644
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
+@@ -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
+
diff --cc debian/patches/0021-tools-xenpaging-prefix.diff.patch
index 43da9d7,0000000..272a3bf
mode 100644,000000..100644
--- a/debian/patches/0021-tools-xenpaging-prefix.diff.patch
+++ b/debian/patches/0021-tools-xenpaging-prefix.diff.patch
@@@ -1,33 -1,0 +1,36 @@@
+From 2127da1d6784fa1f0cc88e67bba409ac19ec364e Mon Sep 17 00:00:00 2001
++Message-Id: <2127da1d6784fa1f0cc88e67bba409ac19ec364e.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0022-tools-xenstat-prefix.diff.patch
index 057d496,0000000..09ed64b
mode 100644,000000..100644
--- a/debian/patches/0022-tools-xenstat-prefix.diff.patch
+++ b/debian/patches/0022-tools-xenstat-prefix.diff.patch
@@@ -1,37 -1,0 +1,40 @@@
+From aa64e1364605a735b0ec993619efe91b219870c7 Mon Sep 17 00:00:00 2001
++Message-Id: <aa64e1364605a735b0ec993619efe91b219870c7.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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(-)
+
+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
+--- a/tools/xenstat/xentop/Makefile
++++ b/tools/xenstat/xentop/Makefile
+@@ -30,8 +30,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/0023-tools-xenstat-rpath.diff.patch
index 5c6f6ef,0000000..48d4ca7
mode 100644,000000..100644
--- a/debian/patches/0023-tools-xenstat-rpath.diff.patch
+++ b/debian/patches/0023-tools-xenstat-rpath.diff.patch
@@@ -1,23 -1,0 +1,26 @@@
+From 2586599a8d40916dcdba19d83d6ea64997c7045a Mon Sep 17 00:00:00 2001
++Message-Id: <2586599a8d40916dcdba19d83d6ea64997c7045a.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:11 +0200
+Subject: tools-xenstat-rpath.diff
+
+---
+ tools/xenstat/xentop/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
+index 6146491..61f1c7d 100644
+--- a/tools/xenstat/xentop/Makefile
++++ b/tools/xenstat/xentop/Makefile
+@@ -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
diff --cc debian/patches/0024-tools-xenstore-prefix.diff.patch
index 3b12564,0000000..c6c2718
mode 100644,000000..100644
--- a/debian/patches/0024-tools-xenstore-prefix.diff.patch
+++ b/debian/patches/0024-tools-xenstore-prefix.diff.patch
@@@ -1,49 -1,0 +1,52 @@@
+From 02ab630bf4b056fd3e042be3fa76536d9c2164c6 Mon Sep 17 00:00:00 2001
++Message-Id: <02ab630bf4b056fd3e042be3fa76536d9c2164c6.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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(-)
+
+diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
+index 262f401..f8237ed 100644
+--- a/tools/xenstore/Makefile
++++ b/tools/xenstore/Makefile
+@@ -58,10 +58,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
+
+ .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/0025-tools-xenstore-rpath.diff.patch
index 27ce8f9,0000000..d2c54e3
mode 100644,000000..100644
--- a/debian/patches/0025-tools-xenstore-rpath.diff.patch
+++ b/debian/patches/0025-tools-xenstore-rpath.diff.patch
@@@ -1,22 -1,0 +1,25 @@@
+From 90380bf46fb8ed13ee7b896f215c645008f992e1 Mon Sep 17 00:00:00 2001
++Message-Id: <90380bf46fb8ed13ee7b896f215c645008f992e1.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:13 +0200
+Subject: tools-xenstore-rpath.diff
+
+---
+ tools/xenstore/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
+index f8237ed..153c36f 100644
+--- a/tools/xenstore/Makefile
++++ b/tools/xenstore/Makefile
+@@ -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
+
diff --cc debian/patches/0026-tools-xentrace-prefix.diff.patch
index 43efbd7,0000000..013b81b
mode 100644,000000..100644
--- a/debian/patches/0026-tools-xentrace-prefix.diff.patch
+++ b/debian/patches/0026-tools-xentrace-prefix.diff.patch
@@@ -1,30 -1,0 +1,33 @@@
+From 6cfdf1c164beaec90d7d5edfe7b65a6f0f0389a0 Mon Sep 17 00:00:00 2001
++Message-Id: <6cfdf1c164beaec90d7d5edfe7b65a6f0f0389a0.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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(-)
+
+diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
+index 63b09c0..a559110 100644
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
+@@ -20,13 +20,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/0027-tools-xentrace-rpath.diff.patch
index 2a1994e,0000000..26c0e80
mode 100644,000000..100644
--- a/debian/patches/0027-tools-xentrace-rpath.diff.patch
+++ b/debian/patches/0027-tools-xentrace-rpath.diff.patch
@@@ -1,21 -1,0 +1,24 @@@
+From f0078305a097d55a4028d44054b3e1edc9d8f0b0 Mon Sep 17 00:00:00 2001
++Message-Id: <f0078305a097d55a4028d44054b3e1edc9d8f0b0.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:15 +0200
+Subject: tools-xentrace-rpath.diff
+
+---
+ tools/xentrace/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
+index a559110..fcc578a 100644
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
+@@ -5,6 +5,7 @@ CFLAGS += -Werror
+
+ CFLAGS += $(CFLAGS_libxenctrl)
+ LDLIBS += $(LDLIBS_libxenctrl)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ BIN = xentrace xentrace_setsize
+ LIBBIN = xenctx
diff --cc debian/patches/0028-tools-python-xen-relative-path.diff.patch
index 89c42b3,0000000..ca74570
mode 100644,000000..100644
--- a/debian/patches/0028-tools-python-xen-relative-path.diff.patch
+++ b/debian/patches/0028-tools-python-xen-relative-path.diff.patch
@@@ -1,183 -1,0 +1,186 @@@
+From 304ab83d71fd0e5070b81a36d5fa220083a84e09 Mon Sep 17 00:00:00 2001
++Message-Id: <304ab83d71fd0e5070b81a36d5fa220083a84e09.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0029-tools-misc-xend-startup.diff.patch
index a58c77b,0000000..eba8d70
mode 100644,000000..100644
--- a/debian/patches/0029-tools-misc-xend-startup.diff.patch
+++ b/debian/patches/0029-tools-misc-xend-startup.diff.patch
@@@ -1,46 -1,0 +1,49 @@@
+From 1037430905680efb485a1ddc2eb4f28f8f703404 Mon Sep 17 00:00:00 2001
++Message-Id: <1037430905680efb485a1ddc2eb4f28f8f703404.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0030-tools-disable.diff.patch
index a280fbc,0000000..eb489b7
mode 100644,000000..100644
--- a/debian/patches/0030-tools-disable.diff.patch
+++ b/debian/patches/0030-tools-disable.diff.patch
@@@ -1,39 -1,0 +1,42 @@@
+From 0f2567c76adb8217d3bce54772458334e8f1ff1b Mon Sep 17 00:00:00 2001
++Message-Id: <0f2567c76adb8217d3bce54772458334e8f1ff1b.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0031-tools-examples-xend-disable-network.diff.patch
index 1e787c1,0000000..f637519
mode 100644,000000..100644
--- a/debian/patches/0031-tools-examples-xend-disable-network.diff.patch
+++ b/debian/patches/0031-tools-examples-xend-disable-network.diff.patch
@@@ -1,33 -1,0 +1,36 @@@
+From ccd27b88d14fb9b8450c776bbb768d9068ef6f41 Mon Sep 17 00:00:00 2001
++Message-Id: <ccd27b88d14fb9b8450c776bbb768d9068ef6f41.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0032-tools-examples-xend-disable-relocation.diff.patch
index ca5281c,0000000..c97f365
mode 100644,000000..100644
--- a/debian/patches/0032-tools-examples-xend-disable-relocation.diff.patch
+++ b/debian/patches/0032-tools-examples-xend-disable-relocation.diff.patch
@@@ -1,29 -1,0 +1,32 @@@
+From c7ed987e69ab06c4c2241de1e2c885e3485209c1 Mon Sep 17 00:00:00 2001
++Message-Id: <c7ed987e69ab06c4c2241de1e2c885e3485209c1.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0033-tools-pygrub-remove-static-solaris-support.patch
index c5833fb,0000000..e426e49
mode 100644,000000..100644
--- a/debian/patches/0033-tools-pygrub-remove-static-solaris-support.patch
+++ b/debian/patches/0033-tools-pygrub-remove-static-solaris-support.patch
@@@ -1,85 -1,0 +1,88 @@@
+From 3ac76cd474a0df61206685ea32f7d606edcd0eab Mon Sep 17 00:00:00 2001
++Message-Id: <3ac76cd474a0df61206685ea32f7d606edcd0eab.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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
+--- 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/0034-tools-include-install.diff.patch
index 9be7a99,0000000..8196d39
mode 100644,000000..100644
--- a/debian/patches/0034-tools-include-install.diff.patch
+++ b/debian/patches/0034-tools-include-install.diff.patch
@@@ -1,29 -1,0 +1,32 @@@
+From 3e76f694f4a8707e5c9d6cd115a4bd1b45ead0ad Mon Sep 17 00:00:00 2001
++Message-Id: <3e76f694f4a8707e5c9d6cd115a4bd1b45ead0ad.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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
+--- 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 ../xen-sys/$(XEN_OS) xen/sys
+@@ -28,7 +27,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/0035-tools-xenmon-install.diff.patch
index ba973f9,0000000..c32b019
mode 100644,000000..100644
--- a/debian/patches/0035-tools-xenmon-install.diff.patch
+++ b/debian/patches/0035-tools-xenmon-install.diff.patch
@@@ -1,33 -1,0 +1,36 @@@
+From e16bd9e6d1442a765debb612b4294bdce01a0202 Mon Sep 17 00:00:00 2001
++Message-Id: <e16bd9e6d1442a765debb612b4294bdce01a0202.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0036-tools-hotplug-udevrules.diff.patch
index 5519500,0000000..d9da846
mode 100644,000000..100644
--- a/debian/patches/0036-tools-hotplug-udevrules.diff.patch
+++ b/debian/patches/0036-tools-hotplug-udevrules.diff.patch
@@@ -1,25 -1,0 +1,28 @@@
+From d1c768ea46c9b5ba443651a0ab58221a879bd198 Mon Sep 17 00:00:00 2001
++Message-Id: <d1c768ea46c9b5ba443651a0ab58221a879bd198.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0037-tools-python-shebang.diff.patch
index 44de22c,0000000..c199709
mode 100644,000000..100644
--- a/debian/patches/0037-tools-python-shebang.diff.patch
+++ b/debian/patches/0037-tools-python-shebang.diff.patch
@@@ -1,175 -1,0 +1,178 @@@
+From c244013161c4bd79b28d1d605dfc70df2efc8471 Mon Sep 17 00:00:00 2001
++Message-Id: <c244013161c4bd79b28d1d605dfc70df2efc8471.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0038-tools-ocaml-fix-build.diff.patch
index 8c3a59d,0000000..391346b
mode 100644,000000..100644
--- a/debian/patches/0038-tools-ocaml-fix-build.diff.patch
+++ b/debian/patches/0038-tools-ocaml-fix-build.diff.patch
@@@ -1,116 -1,0 +1,119 @@@
+From 34dac57f09adbc451cd2b4c56a13376b3abfeb3a Mon Sep 17 00:00:00 2001
++Message-Id: <34dac57f09adbc451cd2b4c56a13376b3abfeb3a.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
+Date: Tue, 29 Nov 2011 11:45:27 +0000
+Subject: tools-ocaml-fix-build.diff
+
+Fix the build of the ocaml libraries
+
+Signed-off-by: Jon Ludlam <jonathan.ludlam at eu.citrix.com>
+---
+ tools/Rules.mk | 2 ++
+ 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 +++-
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/tools/Rules.mk b/tools/Rules.mk
+index 74ce6bc..a2fb32e 100644
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
+@@ -23,10 +23,12 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE)
+
+ CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
+ LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so
++LDLIBS_libxenctrl_SYSTEM = -lxenctrl-$(XEN_VERSION)
+ SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC)
+
+ CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
+ LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest.so
++LDLIBS_libxenguest_SYSTEM = -lxenguest-$(XEN_VERSION)
+ SHLIB_libxenguest = -Wl,-rpath-link=L$(XEN_LIBXC)
+
+ CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
+diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
+index 8e4ca36..6b22bbe 100644
+--- a/tools/ocaml/Makefile
++++ b/tools/ocaml/Makefile
+@@ -1,7 +1,7 @@
+ XEN_ROOT = $(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-SUBDIRS_PROGRAMS = xenstored test
++SUBDIRS_PROGRAMS = xenstored
+
+ SUBDIRS = libs $(SUBDIRS_PROGRAMS)
+
+diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules
+index 0745e83..5687eca 100644
+--- a/tools/ocaml/Makefile.rules
++++ b/tools/ocaml/Makefile.rules
+@@ -47,7 +47,7 @@ ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $(ALL_OCAML_OBJS))
+ clean: $(CLEAN_HOOKS)
+ $(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot *.spot *.spit $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make META
+
+-quiet-command = $(if $(V),$1, at printf " %-8s %s\n" "$2" "$3" && $1)
++quiet-command = $1
+
+ mk-caml-lib-native = $(call quiet-command, $(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $1 $2 $3,MLA,$1)
+ mk-caml-lib-bytecode = $(call quiet-command, $(OCAMLC) $(OCAMLCFLAGS) -a -o $1 $2 $3,MLA,$1)
+@@ -58,14 +58,8 @@ mk-caml-lib-stubs = \
+
+ # define a library target <name>.cmxa and <name>.cma
+ define OCAML_LIBRARY_template
+- $(1).cmxa: lib$(1)_stubs.a $(foreach obj,$($(1)_OBJS),$(obj).cmx)
+- $(call mk-caml-lib-native,$$@, -cclib -l$(1)_stubs $(foreach lib,$(LIBS_$(1)),-cclib $(lib)), $(foreach obj,$($(1)_OBJS),$(obj).cmx))
+- $(1).cma: $(foreach obj,$($(1)_OBJS),$(obj).cmo)
+- $(call mk-caml-lib-bytecode,$$@, -dllib dll$(1)_stubs.so -cclib -l$(1)_stubs, $$+)
+- $(1)_stubs.a: $(foreach obj,$$($(1)_C_OBJS),$(obj).o)
+- $(call mk-caml-stubs,$$@, $$+)
+- lib$(1)_stubs.a: $(foreach obj,$($(1)_C_OBJS),$(obj).o)
+- $(call mk-caml-lib-stubs,$$@, $$+)
++ $(1).cma: $(foreach obj,$($(1)_OBJS),$(obj).cmx $(obj).cmo) $(foreach obj,$($(1)_C_OBJS),$(obj).o)
++ $(OCAMLMKLIB) -o $1 -oc $(1)_stubs $(foreach obj,$($(1)_OBJS),$(obj).cmx $(obj).cmo) $(foreach obj,$($(1)_C_OBJS),$(obj).o) $(foreach lib, $(LIBS_$(1)_SYSTEM), -cclib $(lib)) $(foreach arg,$(LIBS_$(1)),-ldopt $(arg))
+ endef
+
+ define OCAML_NOC_LIBRARY_template
+diff --git a/tools/ocaml/libs/eventchn/Makefile b/tools/ocaml/libs/eventchn/Makefile
+index 2d8d618..ebbe777 100644
+--- a/tools/ocaml/libs/eventchn/Makefile
++++ b/tools/ocaml/libs/eventchn/Makefile
+@@ -9,6 +9,7 @@ INTF = $(foreach obj, $(OBJS),$(obj).cmi)
+ LIBS = xeneventchn.cma xeneventchn.cmxa
+
+ LIBS_xeneventchn = $(LDLIBS_libxenctrl)
++LIBS_xeneventchn_SYSTEM = $(LDLIBS_libxenctrl_SYSTEM)
+
+ all: $(INTF) $(LIBS) $(PROGRAMS)
+
+diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
+index 239c187..7cd17dc 100644
+--- a/tools/ocaml/libs/xc/Makefile
++++ b/tools/ocaml/libs/xc/Makefile
+@@ -10,6 +10,7 @@ INTF = xenctrl.cmi
+ LIBS = xenctrl.cma xenctrl.cmxa
+
+ LIBS_xenctrl = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
++LIBS_xenctrl_SYSTEM = $(LDLIBS_libxenctrl_SYSTEM) $(LDLIBS_libxenguest_SYSTEM)
+
+ xenctrl_OBJS = $(OBJS)
+ xenctrl_C_OBJS = xenctrl_stubs
+diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
+index b18f190..ee1c1ea 100644
+--- a/tools/ocaml/xenstored/Makefile
++++ b/tools/ocaml/xenstored/Makefile
+@@ -43,7 +43,9 @@ XENSTOREDLIBS = \
+ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \
+ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \
+ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb $(OCAML_TOPLEVEL)/libs/xb/xenbus.cmxa \
+- -ccopt -L -ccopt $(XEN_ROOT)/tools/libxc
++ -ccopt -L -ccopt $(XEN_ROOT)/tools/libxc \
++ $(foreach obj, $(LDLIBS_libxenctrl), -ccopt $(obj)) \
++ $(foreach obj, $(LDLIBS_libxenguest), -ccopt $(obj))
+
+ PROGRAMS = oxenstored
+
diff --cc debian/patches/0039-tools-xenstore-compatibility.diff.patch
index e8096ad,0000000..a9a3798
mode 100644,000000..100644
--- a/debian/patches/0039-tools-xenstore-compatibility.diff.patch
+++ b/debian/patches/0039-tools-xenstore-compatibility.diff.patch
@@@ -1,61 -1,0 +1,64 @@@
+From 67c0cb5a0a066779caa8c56831ecc896cadbb7cd Mon Sep 17 00:00:00 2001
++Message-Id: <67c0cb5a0a066779caa8c56831ecc896cadbb7cd.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+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/0040-Set-library-path-to-multi-arch-location.patch
index 3846913,0000000..0ed71bd
mode 100644,000000..100644
--- a/debian/patches/0040-Set-library-path-to-multi-arch-location.patch
+++ b/debian/patches/0040-Set-library-path-to-multi-arch-location.patch
@@@ -1,36 -1,0 +1,39 @@@
+From 93bead88e51dce30e9c5ffb8e899f4f0f6897c64 Mon Sep 17 00:00:00 2001
++Message-Id: <93bead88e51dce30e9c5ffb8e899f4f0f6897c64.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
+From: Bastian Blank <waldi at debian.org>
+Date: Tue, 26 Aug 2014 17:17:34 +0200
+Subject: Set library path to multi-arch location
+
+---
+ config/StdGNU.mk | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/config/StdGNU.mk b/config/StdGNU.mk
+index b566b5c..0f1776d 100644
+--- a/config/StdGNU.mk
++++ b/config/StdGNU.mk
+@@ -1,3 +1,5 @@
++include /usr/share/dpkg/architecture.mk
++
+ AS = $(CROSS_COMPILE)as
+ LD = $(CROSS_COMPILE)ld
+ ifeq ($(clang),y)
+@@ -30,14 +32,14 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
+ PREFIX ?= /usr
+ BINDIR = $(PREFIX)/bin
+ INCLUDEDIR = $(PREFIX)/include
+-LIBDIR = $(PREFIX)/lib
++LIBDIR = $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+ SHAREDIR = $(PREFIX)/share
+ MANDIR = $(SHAREDIR)/man
+ MAN1DIR = $(MANDIR)/man1
+ MAN8DIR = $(MANDIR)/man8
+ SBINDIR = $(PREFIX)/sbin
+
+-PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
++PRIVATE_PREFIX = $(PREFIX)/lib/xen-$(XEN_VERSION)
+ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+ PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
+
diff --cc debian/patches/0041-send-xl-coredumps-var-lib-xen-dump-NAME.patch
index 0000000,0000000..4ecd0d6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0041-send-xl-coredumps-var-lib-xen-dump-NAME.patch
@@@ -1,0 -1,0 +1,82 @@@
++From 071ee641afc48f40b8052c77c5eb1e4086297654 Mon Sep 17 00:00:00 2001
++Message-Id: <071ee641afc48f40b8052c77c5eb1e4086297654.1409445762.git.ijc at hellion.org.uk>
++In-Reply-To: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++References: <3af76d3edaea67658163e3d1fc8c1ed3a70a31ae.1409445761.git.ijc at hellion.org.uk>
++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 2fbad3a,0000000..706b44c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,40 -1,0 +1,41 @@@
+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
diff --cc debian/xen-utils-common.dirs
index c745c08,0000000..a598c47
mode 100644,000000..100644
--- a/debian/xen-utils-common.dirs
+++ b/debian/xen-utils-common.dirs
@@@ -1,1 -1,0 +1,2 @@@
+var/lib/xen
++var/lib/xen/dump
--
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