debian/0000775000000000000000000000000012322726675007204 5ustar debian/compat0000664000000000000000000000000211201570721010362 0ustar 7 debian/control0000664000000000000000000001427012321772310010575 0ustar Source: xen Section: kernel Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Xen Team Uploaders: Guido Trotter , Bastian Blank Standards-Version: 3.9.4 Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.16.0~), lsb-release, python-dev, bcc, gcc-multilib [!arm64], e2fslibs-dev, iasl, ipxe-qemu, seabios, libaio-dev, libglib2.0-dev, libgnutls-dev, liblzma-dev, libncurses5-dev, libpci-dev, libyajl-dev, libssl-dev, pkg-config, uuid-dev, zlib1g-dev, ocaml-nox, dh-ocaml, ocaml-findlib, libfdt-dev [armhf arm64] XS-Python-Version: current Package: libxen-4.4 Architecture: amd64 i386 armhf arm64 Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Public libs for Xen This package contains the shared libraries for Xen. Package: libxenstore3.0 Architecture: amd64 i386 armhf arm64 Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Xenstore communications library for Xen This package contains the public libxenstore. Package: libxen-dev Architecture: amd64 i386 armhf arm64 Section: libdevel Depends: libxen-4.4 (= ${binary:Version}), libxenstore3.0 (= ${binary:Version}), ${misc:Depends} Description: Public headers and libs for Xen This package contains the public headers and static libraries for Xen. Package: xenstore-utils Architecture: amd64 i386 armhf arm64 Section: admin Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: xen-utils-common (<= 3.1.0-1) Conflicts: xen-utils-common (<= 3.1.0-1) Description: Xenstore utilities for Xen This package contains the Xenstore utilities. Package: libxen-ocaml Architecture: amd64 i386 Section: ocaml Provides: ${ocaml:Provides} Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends} Description: OCaml libraries for controlling Xen This package contains the runtime libraries required for the ocaml bindings to the Xen control libraries. Package: libxen-ocaml-dev Architecture: amd64 i386 Section: ocaml Provides: ${ocaml:Provides} Depends: libxen-ocaml (= ${binary:Version}), libxen-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends} Description: OCaml libraries for controlling Xen (devel package) This package contains the ocaml findlib packages for compiling applications that are designed to control the Xen hypervisor. Package: xen-utils-common Architecture: all Depends: gawk, lsb-base, python, udev, xenstore-utils, ${misc:Depends} Description: Xen administrative tools - common files The userspace tools to manage a system virtualized through the Xen virtual machine monitor. Package: xen-utils-4.4 Architecture: amd64 i386 armhf arm64 Provides: xen-utils Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-utils-common (>= ${source:Version}) Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-4.4, qemu-system-x86 [i386 amd64] Description: XEN administrative tools The userspace tools to manage a system virtualized through the XEN virtual machine monitor. Built-Using: ${misc:Built-Using} Package: xen-hypervisor-4.4-amd64 Architecture: amd64 i386 Provides: xen-hypervisor, xen-hypervisor-4.4, xen-hypervisor-amd64 Depends: ${misc:Depends} Recommends: xen-utils-4.4 Description: Xen Hypervisor on AMD64 The hypervisor is the "core" for XEN itself. It gets booted by the boot loader and controls cpu and memory, sharing them between your administrative domain (Domain 0) and the virtual guest systems. . In order to boot a XEN system along with this package you also need a kernel specifically crafted to work as the Domain 0, mediating hardware access for XEN itself. Package: xen-system-amd64 Architecture: amd64 i386 Provides: xen-system Depends: xen-hypervisor-4.4-amd64, xen-utils-4.4, ${misc:Depends} Description: Xen System on AMD64 (meta-package) This package depends on the latest Xen hypervisor for use on AMD64 and the Xen utils. Package: xen-hypervisor-4.4-armhf Architecture: armhf Provides: xen-hypervisor, xen-hypervisor-4.4, xen-hypervisor-armhf Depends: ${misc:Depends} Recommends: xen-utils-4.4 Description: Xen Hypervisor on Arm v7/v8 The hypervisor is the "core" for XEN itself. It gets booted by the boot loader and controls cpu and memory, sharing them between your administrative domain (Domain 0) and the virtual guest systems. . In order to boot a XEN system along with this package you also need a kernel specifically crafted to work as the Domain 0, mediating hardware access for XEN itself. Package: xen-system-armhf Architecture: armhf Provides: xen-system Depends: xen-hypervisor-4.4-armhf, xen-utils-4.4, ${misc:Depends} Description: Xen System on Arm v7/v8 (meta-package) This package depends on the latest Xen hypervisor for use on armhf and the Xen utils. Package: xen-hypervisor-4.4-arm64 Architecture: arm64 Provides: xen-hypervisor, xen-hypervisor-4.4, xen-hypervisor-arm64 Depends: ${misc:Depends} Recommends: xen-utils-4.4 Description: Xen Hypervisor on Arm64 The hypervisor is the "core" for XEN itself. It gets booted by the boot loader and controls cpu and memory, sharing them between your administrative domain (Domain 0) and the virtual guest systems. . In order to boot a XEN system along with this package you also need a kernel specifically crafted to work as the Domain 0, mediating hardware access for XEN itself. Package: xen-system-arm64 Architecture: arm64 Provides: xen-system Depends: xen-hypervisor-4.4-arm64, xen-utils-4.4, ${misc:Depends} Description: Xen System on Arm64 (meta-package) This package depends on the latest Xen hypervisor for use on armhf and the Xen utils. # # Transitional packages for upgrading # Package: xen-hypervisor-4.1-amd64 Architecture: amd64 i386 Depends: xen-system-amd64 Section: oldlibs Description: Transitional package for upgrade Package: xen-hypervisor-4.1-i386 Architecture: i386 Depends: xen-system-amd64 Section: oldlibs Description: Transitional package for upgrade Package: xen-hypervisor-4.3-amd64 Architecture: amd64 i386 Depends: xen-system-amd64 Section: oldlibs Description: Transitional package for upgrade Package: xen-hypervisor-4.3-armhf Architecture: armhf Depends: xen-system-armhf Section: oldlibs Description: Transitional package for upgrade debian/xen-utils-common.dirs0000664000000000000000000000001412316260750013266 0ustar var/lib/xen debian/xen-utils-common.examples0000664000000000000000000000006311711764012014145 0ustar debian/tmp/etc/xen/cpupool* debian/tmp/etc/xen/xm* debian/scripts/0000775000000000000000000000000012317541164010663 5ustar debian/scripts/qemu-ifup0000664000000000000000000000054412000050346012503 0ustar #!/bin/sh echo -c 'config qemu network with xen bridge for ' echo $* # Initialise a dummy MAC address. We choose the numerically # largest non-broadcast address to prevent the address getting # stolen by an Ethernet bridge for STP purposes. # (FE:FF:FF:FF:FF:FF) ip link set $1 address fe:ff:ff:ff:ff:ff || true ifconfig $1 0.0.0.0 up brctl addif $2 $1 debian/scripts/xend-domain-config-path-strip0000775000000000000000000000110412221316003016326 0ustar #!/bin/sh -e CONFDIR=/var/lib/xend/domains if [ $(id -u) -ne 0 ]; then echo "Must be called as root" >&2 exit 1 fi for CFG in $(find $CONFDIR -type f); do awk ' /\(loader/ && /\/usr\/lib\/xen-/{ sub(/\/usr\/lib\/xen-.*\/boot\//, "") print next } /\(device_model/ && /\/usr\/lib\/xen-/{ sub(/\/usr\/lib\/xen-.*\/bin\//, "") print next } { print } ' $CFG >/tmp/xend-domain.$$ if ! diff -q $CFG /tmp/xend-domain.$$ >/dev/null; then echo "Updating $(basename $(dirname $CFG))" cat /tmp/xend-domain.$$ >$CFG fi rm /tmp/xend-domain.$$ done debian/scripts/xen-dir0000775000000000000000000000042111767450762012167 0ustar #!/bin/sh -e VERSION=$(. /usr/lib/xen-common/bin/xen-version); RET=$?; [ $RET -eq 0 ] || exit $RET if [ -d "/usr/lib/xen-$VERSION" ]; then echo "/usr/lib/xen-$VERSION" else echo "ERROR: Can't find version $VERSION of xen utils, bailing out!" >&2 exit 127 fi debian/scripts/xen0000775000000000000000000000023111652107645011402 0ustar #!/bin/sh -e COMMAND="$(basename $0)" TOOLSTACK=$(. /usr/lib/xen-common/bin/xen-toolstack); RET=$?; [ $RET -eq 0 ] || exit $RET exec "$TOOLSTACK" "$@" debian/scripts/xen-utils-wrapper0000775000000000000000000000015511652104434014214 0ustar #!/bin/sh -e COMMAND="$(basename $0)" DIR=$(/usr/lib/xen-common/bin/xen-dir) exec "$DIR/bin/$COMMAND" "$@" debian/scripts/xen-toolstack-wrapper0000775000000000000000000000047211652111637015064 0ustar #!/bin/sh -e COMMAND="$(basename $0)" TOOLSTACK=$(. /usr/lib/xen-common/bin/xen-toolstack); RET=$?; [ $RET -eq 0 ] || exit $RET if [ "$(basename "$TOOLSTACK")" != "$COMMAND" ]; then echo "ERROR: A different toolstack ($(basename "$TOOLSTACK")) have been selected!" >&2 exit 1 fi exec "$TOOLSTACK" "$@" debian/scripts/xen-toolstack0000775000000000000000000000163111766352234013412 0ustar #!/bin/sh -e configfile=/etc/default/xen dir=$(. /usr/lib/xen-common/bin/xen-dir); ret=$?; [ $ret -eq 0 ] || exit $ret check() { local PATH if [ "$1" = xm ] || [ "$1" = xl ]; then PATH="$dir/bin" else PATH="$dir/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" fi command -v "$1" || : } if [ -e $configfile ]; then . $configfile || true fi if [ "$TOOLSTACK" ]; then cmd=$(check "$TOOLSTACK") if [ "$cmd" ]; then echo "$cmd" else echo "WARING: Can't find toolstack $TOOLSTACK, fallback to default!" >&2 TOOLSTACK= fi fi if [ -z "$TOOLSTACK" ]; then cmd_xm=$(check xm) cmd_xl=$(check xl) if [ "$cmd_xm" ]; then echo "$cmd_xm" elif [ "$cmd_xl" ]; then echo "$cmd_xl" else echo "ERROR: Toolstack not specifed and nothing detected, bailing out!" >&2 exit 127 fi fi debian/scripts/xen-init-list0000775000000000000000000000376012026064172013317 0ustar #!/usr/bin/python from __future__ import print_function import json import re import sys import subprocess class SXPParser(object): tokenizer_rules = r""" (?P \( ) | (?P \) ) | (?P \s+ ) | [^()^\s]+ """ tokenizer_re = re.compile(tokenizer_rules, re.X) def __init__(self): self.stack = [] self.data = [] def __call__(self, input): for match in self.tokenizer_re.finditer(input): if match.group('open'): self.stack.append([]) elif match.group('close'): top = self.stack.pop() if self.stack: self.stack[-1].append(top) else: self.data.append(top) elif match.group('whitespace'): pass else: if self.stack: self.stack[-1].append(match.group()) return self.data class Data(object): def __call__(self, out): for domid, info in sorted(self.data.iteritems(), reverse=True): print(str(domid), *info) class DataJSON(Data): def __init__(self, p): s = json.loads(p) self.data = d = {} for i in s: domid = i['domid'] name = i['config']['c_info']['name'] d[domid] = (name, ) class DataSXP(Data): def __init__(self, p): s = SXPParser()(p) self.data = d = {} for i in s: if i and i[0] == 'domain': try: data = dict(j for j in i if len(j) == 2) domid = int(data['domid']) name = data['name'] if domid == 0: continue d[domid] = (name, ) except (KeyError, ValueError) as e: pass if __name__ == '__main__': p = subprocess.check_output(('xen', 'list', '-l')) if p[0] == '(': d = DataSXP(p) else: d = DataJSON(p) d(sys.stdout) debian/scripts/Makefile0000664000000000000000000000267012221315760012323 0ustar ETC_SCRIPTS = \ qemu-ifup GLOBAL_SCRIPTS = \ xen GLOBAL_TOOLSTACK_LINKS = \ xl \ xm GLOBAL_TOOLSTACK_WRAPPER = xen-toolstack-wrapper GLOBAL_UTILS_LINKS = \ cpuperf-perfcntr \ cpuperf-xen \ xenperf \ xenpm \ xentop \ xentrace \ xentrace_format \ xentrace_setmask \ xentrace_setsize GLOBAL_UTILS_WRAPPER = xen-utils-wrapper PRIVATE_SCRIPTS = \ xen-dir \ xen-init-list \ xen-toolstack \ xen-version \ xend-domain-config-path-strip \ $(GLOBAL_TOOLSTACK_WRAPPER) \ $(GLOBAL_UTILS_WRAPPER) ETC_SCRIPTS_DIR = /etc/xen/scripts GLOBAL_SCRIPTS_DIR = /usr/sbin PRIVATE_SCRIPTS_DIR = /usr/lib/xen-common/bin install: install -d $(DESTDIR)$(ETC_SCRIPTS_DIR) install $(ETC_SCRIPTS) $(DESTDIR)$(ETC_SCRIPTS_DIR) install -d $(DESTDIR)$(GLOBAL_SCRIPTS_DIR) install $(GLOBAL_SCRIPTS) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR) @for i in $(GLOBAL_TOOLSTACK_LINKS); do \ echo ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_TOOLSTACK_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i; \ ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_TOOLSTACK_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i || exit 1; \ done @for i in $(GLOBAL_UTILS_LINKS); do \ echo ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_UTILS_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i; \ ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_UTILS_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i || exit 1; \ done install -d $(DESTDIR)$(PRIVATE_SCRIPTS_DIR) install $(PRIVATE_SCRIPTS) $(DESTDIR)$(PRIVATE_SCRIPTS_DIR) debian/scripts/xen-version0000775000000000000000000000076211777774310013105 0ustar #!/bin/sh -e error() { echo "ERROR: " "$@" >&2 exit 1 } if [ -e "/sys/hypervisor/type" ]; then type="$(cat /sys/hypervisor/type)" if [ "$type" = xen ]; then DIR=/sys/hypervisor/version VERSION="$(cat $DIR/major).$(cat $DIR/minor)" elif [ -z "$type" ]; then error "Can't read hypervisor type from sysfs!" else error "Hypervisor is not xen but '$type'!" fi else error "Can't find hypervisor information in sysfs!" fi echo "$VERSION" debian/lib/0000775000000000000000000000000012212071061007726 5ustar debian/lib/python/0000775000000000000000000000000012212071061011247 5ustar debian/lib/python/debian_xen/0000775000000000000000000000000012221321226013344 5ustar debian/lib/python/debian_xen/__init__.py0000664000000000000000000000115710720110172015457 0ustar def _setup(): import os.path, sys version = None rules = os.path.join(__path__[0], "../../../rules.defs") f = file(rules) for l in f: l = l.strip().split() if l[0] == 'KERNELVERSION': version = l[-1] f.close() if version is None: raise RuntimeError("Can't find KERNELVERSION setting") global support support = '/usr/src/linux-support-%s' % version if not os.path.exists(support): raise RuntimeError("Can't find %s, please install the linux-support-%s package" % (support, version)) sys.path.append('%s/lib/python' % support) _setup() debian/lib/python/debian_xen/debian.py0000664000000000000000000000116111766343634015163 0ustar import re from debian_linux.debian import Version class VersionXen(Version): _version_xen_rules = ur""" ^ (?P \d+\.\d+ ) (?: \.\d+ (?: ~rc\d+ )? (?: \+hg-\d+.[a-z0-9]+ )? | ~hg-\d+.[a-z0-9]+ ) - (?:[^-]+) $ """ _version_xen_re = re.compile(_version_xen_rules, re.X) def __init__(self, version): super(VersionXen, self).__init__(version) match = self._version_xen_re.match(version) if match is None: raise ValueError("Invalid debian xen version") d = match.groupdict() self.xen_version = d['version'] debian/xen-migrate-xend-managed-domains0000775000000000000000000000270712321454755015332 0ustar #!/bin/sh SRCDIR="/var/lib/xend/domains" TGTDIR="/etc/xen" if [ ! -d "$SRCDIR" ]; then exit 0 fi if [ -f /var/lib/xend/migration-done ]; then exit 0 fi XENPROC="/proc/xen/capabilities" if [ ! -f $XENPROC ] || [ "$(cat $XENPROC)" != "control_d" ]; then if [ "$(find $SRCDIR -name config.sxp 2>/dev/null)" != "" ]; then echo "---" echo "--- INFO: Cannot migrate xend domains when not" echo "--- running under Xen hypervisor!" echo "---" echo "Boot into the Xen hypervisor and run" echo "$0 inside dom0." fi >&2 exit 0 fi PATH="$(/usr/lib/xen-common/bin/xen-dir)/bin:$PATH" export PATH N=0 LOG="" for DOMUUID in $(ls -1 "$SRCDIR"); do CFGFILE="$SRCDIR/$DOMUUID/config.sxp" if [ -f "$CFGFILE" ]; then LOG="$LOG\n$(xen-sxp2xm $CFGFILE $TGTDIR)" if [ $? -eq 0 ]; then N=$(($N + 1)) fi fi done if [ $N -gt 0 ]; then echo "---" echo "--- INFO" echo "---" echo "The xm toolstack is deprecated and the default was changed to" echo "xl. However the xl toolstack does not support the managed" echo "domains of xend. $N domain(s) were converted into the xen-xm" echo "format and can be found under /etc/xen/.cfg." echo "The conversion might be incomplete. Please make sure to review" echo "the result." echo "Note that those might only be meaningful if using the xl/xen" echo "commands directly. Access through libvirt will get (or has" echo "been) migrated separately." echo "$LOG" touch /var/lib/xend/migration-done fi >&2 debian/xen-utils-common.xendomains.default0000664000000000000000000000543711751534245016140 0ustar # The xendomains script can send SysRq requests to domains on shutdown. # If you don't want to MIGRATE, SAVE, or SHUTDOWN, this may be a possibility # to do a quick and dirty shutdown ("s e i u o") or at least sync the disks # of the domains ("s"). # # XENDOMAINS_SYSRQ= # Set this to a non-empty string if you want to migrate virtual machines # on shutdown. The string will be passed to the xm migrate DOMID command # as is: It should contain the target IP address of the physical machine # to migrate to and optionally parameters like --live. Leave empty if # you don't want to try virtual machine relocation on shutdown. # If migration succeeds, neither SAVE nor SHUTDOWN will be executed for # that domain. # # XENDOMAINS_MIGRATE= # Directory to save running domains to when the system (dom0) is # shut down. Will also be used to restore domains from if # XENDOMAINS_RESTORE # is set (see below). Leave empty to disable domain saving on shutdown # (e.g. because you rather shut domains down). # If domain saving does succeed, SHUTDOWN will not be executed. # XENDOMAINS_SAVE=/var/lib/xen/save # This variable determines whether saved domains from XENDOMAINS_SAVE # will be restored on system startup. # XENDOMAINS_RESTORE=true # This variable sets the directory where domains configurations # are stored that should be started on system startup automatically. # Leave empty if you don't want to start domains automatically # (or just don't place any xen domain config files in that dir). # Note that the script tries to be clever if both RESTORE and AUTO are # set: It will first restore saved domains and then only start domains # in AUTO which are not running yet. # Note that the name matching is somewhat fuzzy. # XENDOMAINS_AUTO=/etc/xen/auto # On xendomains stop, a number of xm commands (xm migrate, save, shutdown, # shutdown --all) may be executed. In the worst case, these commands may # stall forever, which will prevent a successful shutdown of the machine. # If this variable is non-zero, the script will set up a watchdog timer # for every of these xm commands and time it out after the number of seconds # specified by this variable. # Note that SHUTDOWN_ALL will not be called if no virtual machines or only # zombies are still running, so you don't need to enable this timeout just # for the zombie case. # The setting should be large enough to make sure that migrate/save/shutdown # can succeed. If you do live migrations, keep in mind that live migration # of a 1GB machine over Gigabit ethernet may actually take something like # 100s (assuming that live migration uses 10% of the network # bandwidth). # Depending on the virtual machine, a shutdown may also require a significant # amount of time. So better setup this variable to a huge number and hope the # watchdog never fires. # XENDOMAINS_STOP_MAXWAIT=300 debian/patches/0000775000000000000000000000000012321776561010631 5ustar debian/patches/tools-firmware-etherboot-packaged.diff0000664000000000000000000000260412276137142020160 0ustar Index: xen-4.4.0~rc3+20140210/tools/firmware/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/firmware/Makefile 2014-02-10 12:53:55.378052281 +0100 +++ xen-4.4.0~rc3+20140210/tools/firmware/Makefile 2014-02-10 12:56:18.042749731 +0100 @@ -14,7 +14,6 @@ SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir endif SUBDIRS-$(CONFIG_ROMBIOS) += rombios SUBDIRS-$(CONFIG_ROMBIOS) += vgabios -SUBDIRS-$(CONFIG_ROMBIOS) += etherboot SUBDIRS-y += hvmloader ovmf-dir: @@ -50,9 +49,6 @@ clean: subdirs-clean .PHONY: distclean distclean: subdirs-distclean -subdir-distclean-etherboot: .phony - $(MAKE) -C etherboot distclean - subdir-distclean-ovmf: .phony rm -rf ovmf-dir ovmf-dir-remote Index: xen-4.4.0~rc3+20140210/tools/firmware/hvmloader/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/firmware/hvmloader/Makefile 2014-02-10 12:53:55.402052398 +0100 +++ xen-4.4.0~rc3+20140210/tools/firmware/hvmloader/Makefile 2014-02-10 12:56:18.042749731 +0100 @@ -48,7 +48,7 @@ CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl else CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin endif -ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) +ETHERBOOT_ROMS := $(addprefix /usr/lib/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS))) endif ROMS := debian/patches/tools-examples-xend-disable-network.diff0000664000000000000000000000114712276137140020457 0ustar Index: xen-4.4.0~rc3+20140210/tools/examples/xend-config.sxp =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/examples/xend-config.sxp 2014-02-10 12:53:55.558053158 +0100 +++ xen-4.4.0~rc3+20140210/tools/examples/xend-config.sxp 2014-02-10 12:56:16.794743624 +0100 @@ -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 debian/patches/tools-python-prefix.diff0000664000000000000000000000313112276137125015427 0ustar Index: xen-4.4.0~rc3+20140210/tools/python/xen/util/auxbin.py =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/xen/util/auxbin.py 2014-02-10 12:53:56.922059821 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/xen/util/auxbin.py 2014-02-10 12:56:05.234687115 +0100 @@ -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 debian/patches/tools-xentrace-rpath.diff0000664000000000000000000000076512276137135015553 0ustar Index: xen-4.4.0~rc3+20140210/tools/xentrace/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xentrace/Makefile 2014-02-10 12:56:12.526722759 +0100 +++ xen-4.4.0~rc3+20140210/tools/xentrace/Makefile 2014-02-10 12:56:13.258726342 +0100 @@ -5,6 +5,7 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) +LDFLAGS += $(call LDFLAGS_RPATH,../lib) BIN = xentrace xentrace_setsize LIBBIN = xenctx debian/patches/version.patch0000664000000000000000000001576512276136743013356 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## version.dpatch by Bastian Blank ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ Index: xen-4.4.0~rc3+20140210/xen/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/xen/Makefile 2014-02-10 12:53:58.642068229 +0100 +++ xen-4.4.0~rc3+20140210/xen/Makefile 2014-02-10 12:54:01.262081037 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/xen/common/kernel.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/xen/common/kernel.c 2014-02-10 12:53:58.622068137 +0100 +++ xen-4.4.0~rc3+20140210/xen/common/kernel.c 2014-02-10 12:54:01.262081037 +0100 @@ -243,8 +243,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL { 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; Index: xen-4.4.0~rc3+20140210/xen/common/version.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/xen/common/version.c 2014-02-10 12:53:58.606068059 +0100 +++ xen-4.4.0~rc3+20140210/xen/common/version.c 2014-02-10 12:54:01.262081037 +0100 @@ -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; -} Index: xen-4.4.0~rc3+20140210/xen/drivers/char/console.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/xen/drivers/char/console.c 2014-02-10 12:53:58.546067761 +0100 +++ xen-4.4.0~rc3+20140210/xen/drivers/char/console.c 2014-02-10 12:54:01.266081058 +0100 @@ -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 ) { Index: xen-4.4.0~rc3+20140210/xen/include/xen/compile.h.in =================================================================== --- xen-4.4.0~rc3+20140210.orig/xen/include/xen/compile.h.in 2014-02-10 12:53:58.590067981 +0100 +++ xen-4.4.0~rc3+20140210/xen/include/xen/compile.h.in 2014-02-10 12:54:01.266081058 +0100 @@ -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 \ Index: xen-4.4.0~rc3+20140210/xen/include/xen/version.h =================================================================== --- xen-4.4.0~rc3+20140210.orig/xen/include/xen/version.h 2014-02-10 12:53:58.558067825 +0100 +++ xen-4.4.0~rc3+20140210/xen/include/xen/version.h 2014-02-10 12:54:01.266081058 +0100 @@ -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__ */ debian/patches/tools-libxc-abiname.diff0000664000000000000000000000755712305357553015330 0ustar Index: xen-4.4.0~rc3+20140210/tools/libxc/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/libxc/Makefile 2014-02-10 12:53:58.162065886 +0100 +++ xen-4.4.0~rc3+20140210/tools/libxc/Makefile 2014-02-10 12:55:56.690645342 +0100 @@ -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, 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) debian/patches/qemu-disable-blktap.diff0000664000000000000000000000700212276137152015301 0ustar qemu: Disable blktap build There is no upstream version of this (only Citrix has something which is not going to be upstream for XenServer). Index: xen-4.4.0~rc3+20140210/qemu/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/qemu/Makefile 2014-02-10 12:53:53.914045123 +0100 +++ xen-4.4.0~rc3+20140210/qemu/Makefile 2014-02-10 12:56:26.314790166 +0100 @@ -47,13 +47,9 @@ $(filter %-user,$(SUBDIR_RULES)): libqem recurse-all: $(SUBDIR_RULES) CPPFLAGS += -I$(XEN_ROOT)/tools/libxc -CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore CPPFLAGS += -I$(XEN_ROOT)/tools/include -tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c - $(CC) -DQEMU_TOOL $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS) - ####################################################################### # BLOCK_OBJS is code used by both qemu system emulation and qemu-img Index: xen-4.4.0~rc3+20140210/qemu/configure =================================================================== --- xen-4.4.0~rc3+20140210.orig/qemu/configure 2014-02-10 12:53:53.862044869 +0100 +++ xen-4.4.0~rc3+20140210/qemu/configure 2014-02-10 12:56:26.314790166 +0100 @@ -185,9 +185,10 @@ bluez="yes" kvm="yes" kerneldir="" aix="no" -blobs="yes" +blobs="no" fdt="yes" sdl_x11="no" +brlapi="no" # OS specific if check_define __linux__ ; then Index: xen-4.4.0~rc3+20140210/qemu/hw/xen_machine_pv.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/qemu/hw/xen_machine_pv.c 2014-02-10 12:53:53.894045021 +0100 +++ xen-4.4.0~rc3+20140210/qemu/hw/xen_machine_pv.c 2014-02-10 12:56:26.318790190 +0100 @@ -29,10 +29,6 @@ #include "xen_backend.h" #include "qemu-xen.h" -#if defined(CONFIG_BLKTAP1) && !defined(CONFIG_STUBDOM) -#include -#endif - uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE; @@ -47,11 +43,6 @@ static void xen_init_pv(ram_addr_t ram_s CPUState *env; uint32_t domid_target; -#if defined(CONFIG_BLKTAP1) && !defined(CONFIG_STUBDOM) && !defined(__NetBSD__) - /* Initialize tapdisk client */ - init_blktap(); -#endif - /* Initialize a dummy CPU */ if (cpu_model == NULL) { #ifdef TARGET_X86_64 Index: xen-4.4.0~rc3+20140210/qemu/xen-config-host.h =================================================================== --- xen-4.4.0~rc3+20140210.orig/qemu/xen-config-host.h 2014-02-10 12:53:53.938045237 +0100 +++ xen-4.4.0~rc3+20140210/qemu/xen-config-host.h 2014-02-10 12:56:26.318790190 +0100 @@ -18,9 +18,6 @@ extern int domid, domid_backend; #include "xenctrl.h" #include "xenstore.h" -#if defined(CONFIG_BLKTAP1) && !defined(CONFIG_STUBDOM) && !defined(__NetBSD__) -#include "blktaplib.h" -#endif #define BIOS_SIZE ((256 + 64) * 1024) Index: xen-4.4.0~rc3+20140210/qemu/xen-hooks.mak =================================================================== --- xen-4.4.0~rc3+20140210.orig/qemu/xen-hooks.mak 2014-02-10 12:56:25.594786651 +0100 +++ xen-4.4.0~rc3+20140210/qemu/xen-hooks.mak 2014-02-10 12:56:26.318790190 +0100 @@ -47,11 +47,6 @@ CONFIG_AUDIO= OBJS += xenfbfront.o else ifndef CONFIG_NetBSD -ifneq ($(CONFIG_BLKTAP1),n) -CPPFLAGS+= -DCONFIG_BLKTAP1 -I$(XEN_ROOT)/tools/blktap/lib -LIBS += -L$(XEN_ROOT)/tools/blktap/lib -lblktap -OBJS += xen_blktap.o -endif OBJS += tpm_tis.o endif endif debian/patches/tools-include-install.diff0000664000000000000000000000202512276137143015703 0ustar Index: xen-4.4.0~rc3+20140210/tools/include/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/include/Makefile 2014-02-10 12:53:55.062050731 +0100 +++ xen-4.4.0~rc3+20140210/tools/include/Makefile 2014-02-10 12:56:19.734757996 +0100 @@ -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 debian/patches/config-prefix.diff0000664000000000000000000000302512276137112014213 0ustar Index: xen-4.4.0~rc3+20140210/config/StdGNU.mk =================================================================== --- xen-4.4.0~rc3+20140210.orig/config/StdGNU.mk 2014-02-10 12:53:58.398067043 +0100 +++ xen-4.4.0~rc3+20140210/config/StdGNU.mk 2014-02-10 12:55:54.674635489 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/Config.mk =================================================================== --- xen-4.4.0~rc3+20140210.orig/Config.mk 2014-02-10 12:55:53.522629857 +0100 +++ xen-4.4.0~rc3+20140210/Config.mk 2014-02-10 12:55:54.674635489 +0100 @@ -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 debian/patches/tools-hotplug-udevrules.diff0000664000000000000000000000240412276137144016314 0ustar Index: xen-4.4.0~rc3+20140210/tools/hotplug/Linux/xen-backend.rules =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/hotplug/Linux/xen-backend.rules 2014-02-10 12:53:54.934050101 +0100 +++ xen-4.4.0~rc3+20140210/tools/hotplug/Linux/xen-backend.rules 2014-02-10 12:56:20.746762945 +0100 @@ -5,11 +5,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-* 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" debian/patches/tools-ocaml-disable-test.patch0000664000000000000000000000145112305652413016451 0ustar From: Stefan Bader Date: Wed, 05 Mar 2014 17:44:11 +0100 Subject: tools/ocaml: Disable test target This currently breaks the build because some xenlight symbols are not found. Might be related to some older ocaml build fix. Before 4.4 libxenlight likely not linked to from ocaml. Signed-off-by: Stefan Bader Index: xen-4.4.0/tools/ocaml/Makefile =================================================================== --- xen-4.4.0.orig/tools/ocaml/Makefile 2014-02-24 17:28:17.000000000 +0100 +++ xen-4.4.0/tools/ocaml/Makefile 2014-03-05 17:43:30.912352382 +0100 @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -SUBDIRS_PROGRAMS = xenstored test +SUBDIRS_PROGRAMS = xenstored SUBDIRS = libs $(SUBDIRS_PROGRAMS) debian/patches/tools-xcutils-rpath.diff0000664000000000000000000000104412276137126015424 0ustar Index: xen-4.4.0~rc3+20140210/tools/xcutils/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xcutils/Makefile 2014-02-10 12:53:56.798059220 +0100 +++ xen-4.4.0~rc3+20140210/tools/xcutils/Makefile 2014-02-10 12:56:06.634693953 +0100 @@ -20,6 +20,8 @@ CFLAGS_xc_save.o := $(CFLAGS_libxenct CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) CFLAGS_lsevtchn.o := $(CFLAGS_libxenctrl) +APPEND_LDFLAGS += $(call LDFLAGS_RPATH,../lib) + .PHONY: all all: build debian/patches/tools-libxl-abiname.diff0000664000000000000000000000654612305377517015340 0ustar Index: xen-4.4.0/tools/libxl/Makefile =================================================================== --- xen-4.4.0.orig/tools/libxl/Makefile 2014-03-04 17:27:46.140995048 +0100 +++ xen-4.4.0/tools/libxl/Makefile 2014-03-04 17:28:59.685354588 +0100 @@ -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,29 +179,23 @@ _libxl_type%.h _libxl_type%_json.h _libx $(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) - ln -sf $< $@ - -libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) +libxenlight.so: libxenlight-$(XEN_VERSION).so 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) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight-$(XEN_VERSION).so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) 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 debian/patches/tools-libfsimage-abiname.diff0000664000000000000000000000347612276137113016320 0ustar Index: xen-4.4.0~rc3+20140210/tools/libfsimage/common/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/libfsimage/common/Makefile 2014-02-10 12:53:58.282066470 +0100 +++ xen-4.4.0~rc3+20140210/tools/libfsimage/common/Makefile 2014-02-10 12:55:55.710640548 +0100 @@ -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 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) debian/patches/tools-firmware-seabios-packaged.diff0000664000000000000000000000323512276137142017613 0ustar Index: xen-4.4.0~rc3+20140210/tools/firmware/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/firmware/Makefile 2014-02-10 12:56:18.042749731 +0100 +++ xen-4.4.0~rc3+20140210/tools/firmware/Makefile 2014-02-10 12:56:18.614752527 +0100 @@ -9,9 +9,6 @@ SUBDIRS-y := ifeq ($(OVMF_PATH),) SUBDIRS-$(CONFIG_OVMF) += ovmf-dir endif -ifeq ($(SEABIOS_PATH),) -SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir -endif SUBDIRS-$(CONFIG_ROMBIOS) += rombios SUBDIRS-$(CONFIG_ROMBIOS) += vgabios SUBDIRS-y += hvmloader @@ -52,9 +49,6 @@ distclean: subdirs-distclean subdir-distclean-ovmf: .phony rm -rf ovmf-dir ovmf-dir-remote -subdir-distclean-seabios-dir: .phony - rm -rf seabios-dir seabios-dir-remote - .PHONY: ovmf-dir-force-update ovmf-dir-force-update: set -ex; \ Index: xen-4.4.0~rc3+20140210/tools/firmware/hvmloader/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/firmware/hvmloader/Makefile 2014-02-10 12:56:18.042749731 +0100 +++ xen-4.4.0~rc3+20140210/tools/firmware/hvmloader/Makefile 2014-02-10 12:56:18.614752527 +0100 @@ -39,7 +39,7 @@ CIRRUSVGA_DEBUG ?= n OVMF_DIR := ../ovmf-dir ROMBIOS_DIR := ../rombios -SEABIOS_DIR := ../seabios-dir +SEABIOS_DIR := /usr/share/seabios ifeq ($(CONFIG_ROMBIOS),y) STDVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.bin @@ -74,11 +74,7 @@ endif ifeq ($(CONFIG_SEABIOS),y) OBJS += seabios.o CFLAGS += -DENABLE_SEABIOS -ifeq ($(SEABIOS_PATH),) - SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin -else - SEABIOS_ROM := $(SEABIOS_PATH) -endif +SEABIOS_ROM := $(SEABIOS_DIR)/bios.bin ROMS += $(SEABIOS_ROM) endif debian/patches/series0000664000000000000000000000351212321772337012044 0ustar version.patch config-etherboot.diff config-prefix.diff tools-libfsimage-abiname.diff tools-libxc-abiname.diff tools-libxl-abiname.diff tools-xenstat-abiname.diff tools-rpath.diff tools-blktap2-prefix.diff tools-console-prefix.diff tools-libfsimage-prefix.diff tools-libfsimage-rpath.diff tools-libxl-prefix.diff tools-misc-prefix.diff tools-misc-rpath.diff tools-pygrub-prefix.diff tools-python-prefix.diff tools-python-rpath.diff tools-xcutils-rpath.diff tools-xenmon-prefix.diff tools-xenmon-rpath.diff tools-xenpaging-prefix.diff tools-xenstat-prefix.diff tools-xenstat-rpath.diff tools-xenstore-prefix.diff tools-xenstore-rpath.diff tools-xentrace-prefix.diff tools-xentrace-rpath.diff tools-flags.diff tools-python-xen-relative-path.diff tools-misc-xend-startup.diff tools-disable.diff tools-examples-xend-disable-network.diff tools-examples-xend-disable-relocation.diff tools-firmware-etherboot-packaged.diff tools-firmware-seabios-packaged.diff tools-pygrub-remove-static-solaris-support.patch tools-include-install.diff tools-xenmon-install.diff tools-hotplug-udevrules.diff tools-python-shebang.diff tools-ocaml-fix-build.diff tools-xenstore-compatibility.diff # FIXME tools-ocaml-disable-test.patch # # Dropped in debian but ulong usage in gdbsx would still break the build. # toolchain.diff # # PXE boot fix for e1000 and ROM paths (likely only Ubuntu) # ubuntu-tools-firmware-etherboot-kvm-ipxe.diff # # Only for Ubuntu: stick with qemu-dm # qemu-prefix.diff qemu-disable-blktap.diff ubuntu-qemu-disable-qemu-upstream.diff ubuntu-qemu-upstream-location.patch # # Disable udev rules using the "socket:" feature unsupported in the # systemd version of udev. # ubuntu-tools-hotplug-disable-xend-rules.patch # # Enable Arm builds # ubuntu-tools-armhf-without-ocaml.patch # # Security fixes not in Debian, yet # ubuntu-arm64-enablement.patch debian/patches/tools-misc-rpath.diff0000664000000000000000000000100712276137123014660 0ustar Index: xen-4.4.0~rc3+20140210/tools/misc/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/misc/Makefile 2014-02-10 12:56:03.094676653 +0100 +++ xen-4.4.0~rc3+20140210/tools/misc/Makefile 2014-02-10 12:56:03.794680069 +0100 @@ -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 debian/patches/config-etherboot.diff0000664000000000000000000000115012276137111014705 0ustar Index: xen-4.4.0~rc3+20140210/Config.mk =================================================================== --- xen-4.4.0~rc3+20140210.orig/Config.mk 2014-02-10 12:53:58.490067486 +0100 +++ xen-4.4.0~rc3+20140210/Config.mk 2014-02-10 12:55:53.522629857 +0100 @@ -239,7 +239,7 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -ETHERBOOT_NICS ?= rtl8139 8086100e +ETHERBOOT_NICS ?= rtl8139 e1000_82540 # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. debian/patches/tools-xenstore-compatibility.diff0000664000000000000000000000355512276137147017347 0ustar Index: xen-4.4.0~rc3+20140210/tools/xenstore/xenstore_client.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstore/xenstore_client.c 2014-02-10 12:53:54.286046943 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstore/xenstore_client.c 2014-02-10 12:56:23.166774780 +0100 @@ -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: Index: xen-4.4.0~rc3+20140210/tools/xenstore/xs.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstore/xs.c 2014-02-10 12:53:54.334047173 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstore/xs.c 2014-02-10 12:56:23.166774780 +0100 @@ -282,17 +282,19 @@ struct xs_handle *xs_daemon_open_readonl 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()); Index: xen-4.4.0~rc3+20140210/tools/xenstore/xenstore.h =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstore/xenstore.h 2014-02-10 12:53:54.306047033 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstore/xenstore.h 2014-02-10 12:56:23.166774780 +0100 @@ -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 debian/patches/tools-blktap2-prefix.diff0000664000000000000000000001150012276137117015445 0ustar Index: xen-4.4.0~rc3+20140210/tools/blktap2/vhd/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/blktap2/vhd/Makefile 2014-02-10 12:53:57.810064163 +0100 +++ xen-4.4.0~rc3+20140210/tools/blktap2/vhd/Makefile 2014-02-10 12:55:59.530659228 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/tools/blktap2/vhd/lib/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/blktap2/vhd/lib/Makefile 2014-02-10 12:53:57.786064048 +0100 +++ xen-4.4.0~rc3+20140210/tools/blktap2/vhd/lib/Makefile 2014-02-10 12:55:59.530659228 +0100 @@ -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) Index: xen-4.4.0~rc3+20140210/tools/blktap2/control/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/blktap2/control/Makefile 2014-02-10 12:53:57.766063952 +0100 +++ xen-4.4.0~rc3+20140210/tools/blktap2/control/Makefile 2014-02-10 12:55:59.530659228 +0100 @@ -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 debian/patches/tools-python-xen-relative-path.diff0000664000000000000000000002157612276137137017507 0ustar Index: xen-4.4.0~rc3+20140210/tools/python/xen/xm/create.py =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/xen/xm/create.py 2014-02-10 12:53:55.870054684 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/xen/xm/create.py 2014-02-10 12:56:14.734733560 +0100 @@ -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: Index: xen-4.4.0~rc3+20140210/tools/python/xen/xend/XendCheckpoint.py =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/xen/xend/XendCheckpoint.py 2014-02-10 12:53:55.834054507 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/xen/xend/XendCheckpoint.py 2014-02-10 12:56:14.734733560 +0100 @@ -118,7 +118,7 @@ def save(fd, dominfo, network, live, dst # 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, paus 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)) Index: xen-4.4.0~rc3+20140210/tools/python/xen/xend/XendConfig.py =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/xen/xend/XendConfig.py 2014-02-10 12:53:55.850054581 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/xen/xend/XendConfig.py 2014-02-10 12:56:14.738733575 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/xen/xend/XendDomainInfo.py 2014-02-10 12:53:55.818054429 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/xen/xend/XendDomainInfo.py 2014-02-10 12:56:14.742733594 +0100 @@ -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'] debian/patches/upstream-25290:7a6dcecb1781-rework0000664000000000000000000000667212254263127016321 0ustar --- a/tools/hotplug/Linux/vif-common.sh +++ b/tools/hotplug/Linux/vif-common.sh @@ -85,12 +85,23 @@ : ${INTERFACE:?} # Get xenbus_path from device name. - # The name is built like that: "tap${domid}.${devid}". - dev_=${dev#tap} + # The name is built like that: "vif${domid}.${devid}-emu". + dev_=${dev#vif} + dev_=${dev_%-emu} domid=${dev_%.*} devid=${dev_#*.} XENBUS_PATH="/local/domain/0/backend/vif/$domid/$devid" + vifname=$(xenstore_read_default "$XENBUS_PATH/vifname" "") + if [ "$vifname" ] + then + vifname="${vifname}-emu" + if [ "$command" == "add" ] && ! ip link show "$vifname" >&/dev/null + then + do_or_die ip link set "$dev" name "$vifname" + fi + dev="$vifname" + fi fi ip=${ip:-} --- a/tools/hotplug/Linux/xen-backend.rules +++ b/tools/hotplug/Linux/xen-backend.rules @@ -13,4 +13,4 @@ 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=="tap*", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" +SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -917,11 +917,7 @@ ret.append("-net") ret.append("nic,vlan=%d,macaddr=%s,model=%s" % (nics, mac, model)) - vifname = devinfo.get('vifname') - if vifname: - vifname = "tap-" + vifname - else: - vifname = "tap%d.%d" % (self.vm.getDomid(), nics-1) + vifname = "vif%d.%d-emu" % (self.vm.getDomid(), nics-1) ret.append("-net") ret.append("tap,vlan=%d,ifname=%s,bridge=%s" % (nics, vifname, bridge)) --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -135,10 +135,7 @@ vifs[i].mac[0], vifs[i].mac[1], vifs[i].mac[2], vifs[i].mac[3], vifs[i].mac[4], vifs[i].mac[5]); char *ifname; - if (!vifs[i].ifname) - ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); - else - ifname = vifs[i].ifname; + ifname = libxl__sprintf(gc, "vif%d.%d-emu", info->domid, vifs[i].devid); flexarray_vappend(dm_args, "-net", libxl__sprintf(gc, "nic,vlan=%d,macaddr=%s,model=%s", vifs[i].devid, smac, vifs[i].model), @@ -272,11 +269,7 @@ vifs[i].mac[0], vifs[i].mac[1], vifs[i].mac[2], vifs[i].mac[3], vifs[i].mac[4], vifs[i].mac[5]); char *ifname; - if (!vifs[i].ifname) { - ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); - } else { - ifname = vifs[i].ifname; - } + ifname = libxl__sprintf(gc, "vif%d.%d-emu", info->domid, vifs[i].devid); flexarray_append(dm_args, "-net"); flexarray_append(dm_args, libxl__sprintf(gc, "nic,vlan=%d,macaddr=%s,model=%s", vifs[i].devid, smac, vifs[i].model)); debian/patches/tools-xenstat-rpath.diff0000664000000000000000000000124112276137132015413 0ustar Index: xen-4.4.0~rc3+20140210/tools/xenstat/xentop/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstat/xentop/Makefile 2014-02-10 12:56:09.582708372 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstat/xentop/Makefile 2014-02-10 12:56:10.330712027 +0100 @@ -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 debian/patches/ubuntu-qemu-disable-qemu-upstream.diff0000664000000000000000000000217012276137153020153 0ustar Description: qemu: Disable build of upstream qemu The Xen make environment would try to get the upstream qemu code as well when the qemu-dm directory is re-added. Right now I think this should be provided by the qemu package. And also it would currently break the build when trying to download code from a git repo. So disable that part. Forwarded: not-needed Origin: vendor, created on merge Author: Stefan Bader Index: xen-4.4.0~rc3+20140210/tools/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/Makefile 2014-02-10 12:56:16.154740499 +0100 +++ xen-4.4.0~rc3+20140210/tools/Makefile 2014-02-10 12:56:26.946793259 +0100 @@ -24,9 +24,10 @@ SUBDIRS-$(CONFIG_Linux) += libvchan # do not recurse in to a dir we are about to delete ifneq "$(MAKECMDGOALS)" "distclean" CONFIG_QEMU = $(CURDIR)/../qemu +#QEMU_UPSTREAM_URL = $(CURDIR)/../qemu-xen ifneq ($(wildcard $(CONFIG_QEMU)),) SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir -SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir +#SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir endif endif debian/patches/tools-misc-prefix.diff0000664000000000000000000000344712276137123015051 0ustar Index: xen-4.4.0~rc3+20140210/tools/misc/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/misc/Makefile 2014-02-10 12:53:57.242061388 +0100 +++ xen-4.4.0~rc3+20140210/tools/misc/Makefile 2014-02-10 12:56:03.094676653 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/tools/python/xen/xend/xend =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/xen/xend/xend 2014-02-10 12:53:57.266061512 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/xen/xend/xend 2014-02-10 12:56:03.094676653 +0100 @@ -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): Index: xen-4.4.0~rc3+20140210/tools/python/xen/xm/xm =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/xen/xm/xm 2014-02-10 12:53:57.302061683 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/xen/xm/xm 2014-02-10 12:56:03.094676653 +0100 @@ -1,6 +1,7 @@ #!/usr/bin/env python # -*- mode: python; -*- import sys, os.path +sys.path.insert(1, sys.path[0] + '/../lib/python') from xen.xm import main debian/patches/tools-libfsimage-prefix.diff0000664000000000000000000000277612276137121016222 0ustar Index: xen-4.4.0~rc3+20140210/tools/libfsimage/Rules.mk =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/libfsimage/Rules.mk 2014-02-10 12:53:57.638063322 +0100 +++ xen-4.4.0~rc3+20140210/tools/libfsimage/Rules.mk 2014-02-10 12:56:00.898665912 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/tools/libfsimage/common/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/libfsimage/common/Makefile 2014-02-10 12:55:55.710640548 +0100 +++ xen-4.4.0~rc3+20140210/tools/libfsimage/common/Makefile 2014-02-10 12:56:00.902665936 +0100 @@ -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) debian/patches/tools-flags.diff0000664000000000000000000000131612276137136013714 0ustar Description: Export flags from configure Author: Bastian Blank Origin: vendor Forwarded: not-needed Index: xen-4.4.0~rc3+20140210/config/Tools.mk.in =================================================================== --- xen-4.4.0~rc3+20140210.orig/config/Tools.mk.in 2014-02-10 12:53:55.942055036 +0100 +++ xen-4.4.0~rc3+20140210/config/Tools.mk.in 2014-02-10 12:56:14.038730150 +0100 @@ -26,6 +26,9 @@ FETCHER := @FETCHER@ SEABIOS_PATH := @seabios_path@ OVMF_PATH := @ovmf_path@ +CFLAGS += @CFLAGS@ +CPPFLAGS += @CPPFLAGS@ + # Extra folder for libs/includes PREPEND_INCLUDES := @PREPEND_INCLUDES@ PREPEND_LIB := @PREPEND_LIB@ debian/patches/tools-xenmon-rpath.diff0000664000000000000000000000076412276137130015240 0ustar Index: xen-4.4.0~rc3+20140210/tools/xenmon/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenmon/Makefile 2014-02-10 12:56:07.358697499 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenmon/Makefile 2014-02-10 12:56:08.110701169 +0100 @@ -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 debian/patches/ubuntu-tools-firmware-etherboot-kvm-ipxe.diff0000664000000000000000000000331512276137150021500 0ustar Description: Use etherboot images from kvm-ipxe Since we do not seem to package qemu-ipxe (as Debian does) we used to build depend on ipxe. But kvm-ipxe seems to be closer to what Debian does as it only contains a small subset of all the rom files. And Xen uses only two of them. This patch changes the Xen code to look for the filenames that kvm-ipxe uses. Forwarded: not-needed Origin: vendor, created on merge Author: Stefan Bader Index: xen-4.4.0~rc3+20140210/Config.mk =================================================================== --- xen-4.4.0~rc3+20140210.orig/Config.mk 2014-02-10 12:55:54.674635489 +0100 +++ xen-4.4.0~rc3+20140210/Config.mk 2014-02-10 12:56:24.498781291 +0100 @@ -239,7 +239,7 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -ETHERBOOT_NICS ?= rtl8139 e1000_82540 +ETHERBOOT_NICS ?= rtl8139 e1000 # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. Index: xen-4.4.0~rc3+20140210/tools/firmware/hvmloader/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/firmware/hvmloader/Makefile 2014-02-10 12:56:18.614752527 +0100 +++ xen-4.4.0~rc3+20140210/tools/firmware/hvmloader/Makefile 2014-02-10 12:56:24.502781306 +0100 @@ -48,7 +48,7 @@ CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl else CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin endif -ETHERBOOT_ROMS := $(addprefix /usr/lib/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS))) +ETHERBOOT_ROMS := $(addprefix /usr/share/qemu/pxe-, $(addsuffix .rom, $(ETHERBOOT_NICS))) endif ROMS := debian/patches/ubuntu-tools-armhf-without-ocaml.patch0000664000000000000000000000216112276137154020215 0ustar From: Stefan Bader Date: Fri, 02 Aug 2013 16:47:22 +0100 Subject: tools: Disable ocaml build on armhf Problem right now is that the ocaml library seems to have hard dependencies on some cpuid related functions which only exist on x86. Until that is sorted out upstream (apparently when they build for Arm they have had no ocaml package installed), prevent the build. This also needs some modifications in debian/rules.real but those won't show up in the patch. Signed-off-by: Stefan Bader Index: xen-4.4.0~rc3+20140210/tools/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/Makefile 2014-02-10 12:56:26.946793259 +0100 +++ xen-4.4.0~rc3+20140210/tools/Makefile 2014-02-10 12:56:28.546801076 +0100 @@ -43,8 +43,10 @@ SUBDIRS-$(CONFIG_TESTS) += tests ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) SUBDIRS-y += python SUBDIRS-y += pygrub +ifeq ($(filter arm32 arm64,$(XEN_COMPILE_ARCH)),) SUBDIRS-$(OCAML_TOOLS) += ocaml endif +endif # For the sake of linking, set the sys-root ifneq ($(CROSS_COMPILE),) debian/patches/ubuntu-tools-hotplug-disable-xend-rules.patch0000664000000000000000000000237612276137154021505 0ustar From: Stefan Bader Date: Tue, 17 Dec 2013 15:28:40 +0100 Subject: [UBUNTU] Disable xend udev socket rules The udev version used in Ubuntu (from systemd) does not support piping messages into named sockets. Since this is not working anyway and only produces ugly messages, disable the rules for now. Note: Not meant for upstream which actually will deprecate xm/xend in the coming 4.4 release. Signed-off-by: Stefan Bader Index: xen-4.4.0~rc3+20140210/tools/hotplug/Linux/xend.rules =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/hotplug/Linux/xend.rules 2014-02-10 12:53:53.630043730 +0100 +++ xen-4.4.0~rc3+20140210/tools/hotplug/Linux/xend.rules 2014-02-10 12:56:28.030798554 +0100 @@ -1,4 +1,4 @@ -SUBSYSTEM=="pci", RUN+="socket:/org/xen/xend/udev_event" -SUBSYSTEM=="scsi", RUN+="socket:/org/xen/xend/udev_event" -SUBSYSTEM=="usb", RUN+="socket:/org/xen/xend/udev_event" +#SUBSYSTEM=="pci", RUN+="socket:/org/xen/xend/udev_event" +#SUBSYSTEM=="scsi", RUN+="socket:/org/xen/xend/udev_event" +#SUBSYSTEM=="usb", RUN+="socket:/org/xen/xend/udev_event" #SUBSYSTEM=="net", KERNEL!="vif[0-9]*.[0-9]*|tap[0-9]*.[0-9]*", RUN+="socket:/org/xen/xend/udev_event" debian/patches/tools-xenmon-prefix.diff0000664000000000000000000000170712276137127015423 0ustar Index: xen-4.4.0~rc3+20140210/tools/xenmon/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenmon/Makefile 2014-02-10 12:53:56.746058967 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenmon/Makefile 2014-02-10 12:56:07.358697499 +0100 @@ -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 debian/patches/tools-xenstat-abiname.diff0000664000000000000000000000355312276137116015703 0ustar Index: xen-4.4.0~rc3+20140210/tools/xenstat/libxenstat/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstat/libxenstat/Makefile 2014-02-10 12:53:58.002065101 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstat/libxenstat/Makefile 2014-02-10 12:55:58.150652482 +0100 @@ -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) $(LDLIB 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) $(>config-host.mak -sed -e 's,qemu,xen/qemu,' config-host.h >config-host.h.new +cat config-host.h >config-host.h.new echo "#define DEFAULT_NETWORK_SCRIPT \"${XEN_SCRIPT_DIR}/qemu-ifup\"" >>config-host.h.new echo "#define DEFAULT_NETWORK_DOWN_SCRIPT \"${XEN_SCRIPT_DIR}/qemu-ifdown\"" >>config-host.h.new echo '#include "xen-config-host.h"' >>config-host.h.new debian/patches/tools-ocaml-fix-build.diff0000664000000000000000000001111712276137146015575 0ustar From: Debian Xen Team 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 --- tools/Rules.mk | 2 ++ tools/ocaml/Makefile.rules | 10 ++-------- tools/ocaml/libs/eventchn/Makefile | 1 + tools/ocaml/libs/xc/Makefile | 3 ++- tools/ocaml/xenstored/Makefile | 4 +++- 5 files changed, 10 insertions(+), 10 deletions(-) Index: xen-4.4.0~rc3+20140210/tools/Rules.mk =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/Rules.mk 2014-02-10 12:56:16.154740499 +0100 +++ xen-4.4.0~rc3+20140210/tools/Rules.mk 2014-02-10 12:56:21.822768211 +0100 @@ -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) Index: xen-4.4.0~rc3+20140210/tools/ocaml/Makefile.rules =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/ocaml/Makefile.rules 2014-02-10 12:53:54.458047776 +0100 +++ xen-4.4.0~rc3+20140210/tools/ocaml/Makefile.rules 2014-02-10 12:56:21.822768211 +0100 @@ -58,14 +58,8 @@ mk-caml-lib-stubs = \ # define a library target .cmxa and .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 Index: xen-4.4.0~rc3+20140210/tools/ocaml/libs/eventchn/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/ocaml/libs/eventchn/Makefile 2014-02-10 12:53:54.410047542 +0100 +++ xen-4.4.0~rc3+20140210/tools/ocaml/libs/eventchn/Makefile 2014-02-10 12:56:21.822768211 +0100 @@ -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) Index: xen-4.4.0~rc3+20140210/tools/ocaml/libs/xc/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/ocaml/libs/xc/Makefile 2014-02-10 12:53:54.394047466 +0100 +++ xen-4.4.0~rc3+20140210/tools/ocaml/libs/xc/Makefile 2014-02-10 12:56:21.822768211 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/tools/ocaml/xenstored/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/ocaml/xenstored/Makefile 2014-02-10 12:53:54.430047638 +0100 +++ xen-4.4.0~rc3+20140210/tools/ocaml/xenstored/Makefile 2014-02-10 12:56:21.826768226 +0100 @@ -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 debian/patches/tools-python-rpath.diff0000664000000000000000000000736212276137126015263 0ustar Index: xen-4.4.0~rc3+20140210/tools/python/setup.py =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/python/setup.py 2014-02-10 12:53:56.854059490 +0100 +++ xen-4.4.0~rc3+20140210/tools/python/setup.py 2014-02-10 12:56:05.922690473 +0100 @@ -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/xenst 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" ], debian/patches/tools-console-prefix.diff0000664000000000000000000000163212276137120015547 0ustar Index: xen-4.4.0~rc3+20140210/tools/console/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/console/Makefile 2014-02-10 12:53:57.706063654 +0100 +++ xen-4.4.0~rc3+20140210/tools/console/Makefile 2014-02-10 12:56:00.190662456 +0100 @@ -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,$(wildcar .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) debian/patches/ubuntu-arm64-enablement.patch0000664000000000000000000000346112321776561016237 0ustar From: Stefan Bader Date: Fri, 11 Apr 2014 16:31:44 +0200 Subject: Enable build of arm64 / aarch64 Beside of packaging changes config.guess needed an update and a block of defines seems to be already done in this file: /usr/include/aarch64-linux-gnu/asm/ptrace.h I am only testing one and skip the whole block, which could be done better... Signed-off-by: Stefan Bader Index: xen-4.4.0/config.guess =================================================================== --- xen-4.4.0.orig/config.guess 2014-03-10 11:43:57.000000000 +0100 +++ xen-4.4.0/config.guess 2014-04-11 15:58:25.787406117 +0200 @@ -872,7 +872,7 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; - arm*:Linux:*:*) + arm*:Linux:*:*|aarch64:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ Index: xen-4.4.0/xen/include/public/arch-arm.h =================================================================== --- xen-4.4.0.orig/xen/include/public/arch-arm.h 2014-03-10 11:43:57.000000000 +0100 +++ xen-4.4.0/xen/include/public/arch-arm.h 2014-04-11 16:30:42.168872602 +0200 @@ -342,6 +342,7 @@ typedef uint64_t xen_callback_t; /* 64 bit modes */ #define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ +#ifndef PSR_MODE_EL3h /* Already defined in .../asm/ptrace. */ #define PSR_MODE_EL3h 0x0d #define PSR_MODE_EL3t 0x0c #define PSR_MODE_EL2h 0x09 @@ -349,6 +350,7 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_EL1h 0x05 #define PSR_MODE_EL1t 0x04 #define PSR_MODE_EL0t 0x00 +#endif #define PSR_GUEST32_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC) #define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h) debian/patches/ubuntu-qemu-upstream-location.patch0000664000000000000000000000242712276137153017607 0ustar From: Stefan Bader Date: Mon, 15 Jul 2013 14:29:52 +0200 Subject: Change qemu-system-i386 paths used to point to the default one Signed-off-by: Stefan Bader Index: xen-4.4.0~rc3+20140210/tools/hotplug/Linux/init.d/sysconfig.xencommons =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/hotplug/Linux/init.d/sysconfig.xencommons 2014-02-10 12:53:53.690044019 +0100 +++ xen-4.4.0~rc3+20140210/tools/hotplug/Linux/init.d/sysconfig.xencommons 2014-02-10 12:56:27.498795960 +0100 @@ -30,4 +30,4 @@ #XENBACKENDD_DEBUG=[yes|on|1] # qemu path -#QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386 +#QEMU_XEN=/usr/bin/qemu-system-i386 Index: xen-4.4.0~rc3+20140210/tools/libxl/libxl_dm.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/libxl/libxl_dm.c 2014-02-10 12:53:53.710044122 +0100 +++ xen-4.4.0~rc3+20140210/tools/libxl/libxl_dm.c 2014-02-10 12:56:27.498795960 +0100 @@ -38,7 +38,7 @@ static const char *qemu_xen_path(libxl__ #ifdef QEMU_XEN_PATH return QEMU_XEN_PATH; #else - return libxl__abs_path(gc, "qemu-system-i386", libxl__libexec_path()); + return libxl__abs_path(gc, "qemu-system-i386", "/usr/bin"); #endif } debian/patches/tools-flask-prefix.diff0000664000000000000000000000073512254263127015213 0ustar --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile @@ -29,9 +29,10 @@ .PHONY: install install: build + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) libflask.so $(DESTDIR)$(LIBDIR) + $(INSTALL_PROG) libflask.so $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) include/libflask.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm debian/patches/tools-libxl-prefix.diff0000664000000000000000000000617412305372154015226 0ustar Index: xen-4.4.0/tools/libxl/Makefile =================================================================== --- xen-4.4.0.orig/tools/libxl/Makefile 2014-03-04 16:36:45.830033949 +0100 +++ xen-4.4.0/tools/libxl/Makefile 2014-03-04 16:42:31.191722330 +0100 @@ -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,10 +185,10 @@ libxenlight.so: libxenlight-$(XEN_VERSIO 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-$(XEN_VERSION).so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight-$(XEN_VERSION).so $(LDFLAGS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -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 libxenli .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 Index: xen-4.4.0/tools/xenstat/libxenstat/Makefile =================================================================== --- xen-4.4.0.orig/tools/xenstat/libxenstat/Makefile 2014-03-04 16:37:02.198113965 +0100 +++ xen-4.4.0/tools/xenstat/libxenstat/Makefile 2014-03-04 16:37:08.482144687 +0100 @@ -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 debian/patches/tools-pygrub-prefix.diff0000664000000000000000000000241212276137124015416 0ustar Index: xen-4.4.0~rc3+20140210/tools/pygrub/src/pygrub =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/pygrub/src/pygrub 2014-02-10 12:53:57.034060369 +0100 +++ xen-4.4.0~rc3+20140210/tools/pygrub/src/pygrub 2014-02-10 12:56:04.486683459 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/tools/pygrub/setup.py =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/pygrub/setup.py 2014-02-10 12:53:57.050060447 +0100 +++ xen-4.4.0~rc3+20140210/tools/pygrub/setup.py 2014-02-10 12:56:04.486683459 +0100 @@ -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"], debian/patches/toolchain.diff0000664000000000000000000000211712276137150013436 0ustar Index: xen-4.4.0~rc3+20140210/tools/debugger/gdbsx/xg/xg_main.c =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/debugger/gdbsx/xg/xg_main.c 2014-02-10 12:53:54.238046699 +0100 +++ xen-4.4.0~rc3+20140210/tools/debugger/gdbsx/xg/xg_main.c 2014-02-10 12:56:23.874778237 +0100 @@ -180,7 +180,7 @@ _domctl_hcall(uint32_t cmd, / hypercall.op = __HYPERVISOR_domctl; hypercall.arg[0] = (unsigned long)&domctl; - rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (ulong)&hypercall); + rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (unsigned long)&hypercall); if (domctlarg && sz) munlock(domctlarg, sz); return rc; @@ -220,7 +220,7 @@ _check_hyp(int guest_bitness) hypercall.arg[0] = (unsigned long)XENVER_capabilities; hypercall.arg[1] = (unsigned long)&xen_caps; - rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (ulong)&hypercall); + rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (unsigned long)&hypercall); munlock(&xen_caps, sizeof(xen_caps)); XGTRC("XENCAPS:%s\n", xen_caps); debian/patches/tools-disable.diff0000664000000000000000000000325712276137140014224 0ustar Index: xen-4.4.0~rc3+20140210/tools/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/Makefile 2014-02-10 12:53:55.702053860 +0100 +++ xen-4.4.0~rc3+20140210/tools/Makefile 2014-02-10 12:56:16.154740499 +0100 @@ -16,11 +16,6 @@ SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xenstat 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 @@ -28,9 +23,12 @@ SUBDIRS-$(CONFIG_Linux) += libvchan # do not recurse in to a dir we are about to delete ifneq "$(MAKECMDGOALS)" "distclean" +CONFIG_QEMU = $(CURDIR)/../qemu +ifneq ($(wildcard $(CONFIG_QEMU)),) SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir endif +endif SUBDIRS-y += xenpmd SUBDIRS-y += libxl Index: xen-4.4.0~rc3+20140210/tools/Rules.mk =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/Rules.mk 2014-02-10 12:55:58.834655821 +0100 +++ xen-4.4.0~rc3+20140210/tools/Rules.mk 2014-02-10 12:56:16.154740499 +0100 @@ -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) debian/patches/tools-xenstore-prefix.diff0000664000000000000000000000362612276137133015765 0ustar Index: xen-4.4.0~rc3+20140210/tools/xenstore/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstore/Makefile 2014-02-10 12:53:56.266056614 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstore/Makefile 2014-02-10 12:56:11.026715430 +0100 @@ -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) debian/patches/tools-pygrub-remove-static-solaris-support.patch0000664000000000000000000000527512276137143022271 0ustar Index: xen-4.4.0~rc3+20140210/tools/pygrub/src/pygrub =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/pygrub/src/pygrub 2014-02-10 12:56:04.486683459 +0100 +++ xen-4.4.0~rc3+20140210/tools/pygrub/src/pygrub 2014-02-10 12:56:19.170755239 +0100 @@ -17,7 +17,6 @@ import os, sys, string, struct, tempfile 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"]) debian/patches/tools-examples-xend-disable-relocation.diff0000664000000000000000000000145512276137141021130 0ustar Index: xen-4.4.0~rc3+20140210/tools/examples/xend-config.sxp =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/examples/xend-config.sxp 2014-02-10 12:56:16.794743624 +0100 +++ xen-4.4.0~rc3+20140210/tools/examples/xend-config.sxp 2014-02-10 12:56:17.438746778 +0100 @@ -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) debian/patches/tools-xentrace-prefix.diff0000664000000000000000000000175712276137134015733 0ustar Index: xen-4.4.0~rc3+20140210/tools/xentrace/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xentrace/Makefile 2014-02-10 12:53:56.094055779 +0100 +++ xen-4.4.0~rc3+20140210/tools/xentrace/Makefile 2014-02-10 12:56:12.526722759 +0100 @@ -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) debian/patches/tools-xenstat-prefix.diff0000664000000000000000000000246712276137131015604 0ustar Index: xen-4.4.0~rc3+20140210/tools/xenstat/xentop/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstat/xentop/Makefile 2014-02-10 12:53:56.430057415 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstat/xentop/Makefile 2014-02-10 12:56:09.582708372 +0100 @@ -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 Index: xen-4.4.0~rc3+20140210/tools/xenstat/libxenstat/Makefile =================================================================== --- xen-4.4.0~rc3+20140210.orig/tools/xenstat/libxenstat/Makefile 2014-02-10 12:56:02.394673225 +0100 +++ xen-4.4.0~rc3+20140210/tools/xenstat/libxenstat/Makefile 2014-02-10 12:56:09.582708372 +0100 @@ -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) debian/xen-utils-common.postrm0000664000000000000000000000053211756646550013673 0ustar #!/bin/sh set -e case "$1" in purge) rmdir --ignore-fail-on-non-empty /var/log/xen ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit ;; esac dpkg-maintscript-helper mv_conffile /etc/init.d/xend /etc/init.d/xen 4.1.2-4~ -- "$@" #DEBHELPER# exit 0 debian/xen-utils-common.ucf0000664000000000000000000000007111755460744013120 0ustar /usr/share/xen-utils-common/default.xen /etc/default/xen debian/rules.gen0000664000000000000000000002005312322026612011011 0ustar .NOTPARALLEL: binary-arch: binary-arch_amd64 binary-arch_i386 binary-arch_armhf binary-arch_arm64 binary-arch_amd64: binary-arch_amd64_none binary-arch_amd64_real binary-arch_amd64_none: binary-arch_amd64_none_amd64 binary-arch_amd64_none_real binary-arch_amd64_none_amd64:: binary-arch_amd64_none_amd64_real binary-arch_amd64_none_amd64:: $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-amd64' ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-hypervisor-4.1-amd64' ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' VERSION='4.1' XEN_ARCH='x86_64' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-hypervisor-4.3-amd64' ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' VERSION='4.3' XEN_ARCH='x86_64' binary-arch_amd64_none_amd64_real: binary-arch_amd64_none_real: binary-arch_amd64_real:: $(MAKE) -f debian/rules.real binary-arch-arch ARCH='amd64' VERSION='4.4' XEN_ARCH='x86_64' binary-arch_i386: binary-arch_i386_none binary-arch_i386_real binary-arch_i386_none: binary-arch_i386_none_amd64 binary-arch_i386_none_i386 binary-arch_i386_none_real binary-arch_i386_none_amd64:: binary-arch_i386_none_amd64_real binary-arch_i386_none_amd64:: $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-amd64' ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-hypervisor-4.1-amd64' ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.1' XEN_ARCH='x86_64' binary-arch_i386_none_amd64_real: binary-arch_i386_none_i386:: binary-arch_i386_none_i386_real binary-arch_i386_none_i386:: binary-arch_i386_none_i386_real: binary-arch_i386_none_real: binary-arch_i386_real:: $(MAKE) -f debian/rules.real binary-arch-arch ARCH='i386' VERSION='4.4' XEN_ARCH='x86_32' binary-indep:: $(MAKE) -f debian/rules.real binary-indep VERSION='4.4' build-arch: build-arch_amd64 build-arch_i386 build-arch_armhf build-arch_arm64 build-arch_amd64: build-arch_amd64_none build-arch_amd64_real build-arch_amd64_none: build-arch_amd64_none_amd64 build-arch_amd64_none_real build-arch_amd64_none_amd64:: build-arch_amd64_none_amd64_real build-arch_amd64_none_amd64:: $(MAKE) -f debian/rules.real build-arch-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' build-arch_amd64_none_amd64_real: build-arch_amd64_none_real: build-arch_amd64_real:: $(MAKE) -f debian/rules.real build-arch-arch ARCH='amd64' VERSION='4.4' XEN_ARCH='x86_64' build-arch_i386: build-arch_i386_none build-arch_i386_real build-arch_i386_none: build-arch_i386_none_amd64 build-arch_i386_none_i386 build-arch_i386_none_real build-arch_i386_none_amd64:: build-arch_i386_none_amd64_real build-arch_i386_none_amd64:: $(MAKE) -f debian/rules.real build-arch-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' build-arch_i386_none_amd64_real: build-arch_i386_none_i386:: build-arch_i386_none_i386_real build-arch_i386_none_i386:: build-arch_i386_none_i386_real: build-arch_i386_none_real: build-arch_i386_real:: $(MAKE) -f debian/rules.real build-arch-arch ARCH='i386' VERSION='4.4' XEN_ARCH='x86_32' build-indep:: $(MAKE) -f debian/rules.real build-indep VERSION='4.4' setup: setup_amd64 setup_i386 setup_armhf setup_arm64 setup_amd64: setup_amd64_none setup_amd64_real setup_amd64_none: setup_amd64_none_amd64 setup_amd64_none_real setup_amd64_none_amd64:: setup_amd64_none_amd64_real setup_amd64_none_amd64:: $(MAKE) -f debian/rules.real setup-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' setup_amd64_none_amd64_real: setup_amd64_none_real: setup_amd64_real:: $(MAKE) -f debian/rules.real setup-arch ARCH='amd64' VERSION='4.4' XEN_ARCH='x86_64' setup_i386: setup_i386_none setup_i386_real setup_i386_none: setup_i386_none_amd64 setup_i386_none_i386 setup_i386_none_real setup_i386_none_amd64:: setup_i386_none_amd64_real setup_i386_none_amd64:: $(MAKE) -f debian/rules.real setup-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.4' XEN_ARCH='x86_64' setup_i386_none_amd64_real: setup_i386_none_i386:: setup_i386_none_i386_real setup_i386_none_i386:: setup_i386_none_i386_real: setup_i386_none_real: setup_i386_real:: $(MAKE) -f debian/rules.real setup-arch ARCH='i386' VERSION='4.4' XEN_ARCH='x86_32' binary-arch_armhf: binary-arch_armhf_none binary-arch_armhf_real binary-arch_armhf_none: binary-arch_armhf_none_armhf binary-arch_armhf_none_real binary-arch_armhf_none_armhf:: binary-arch_armhf_none_armhf_real binary-arch_armhf_none_armhf:: $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' VERSION='4.4' XEN_ARCH='arm32' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-armhf' ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' VERSION='4.4' XEN_ARCH='arm32' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-hypervisor-4.3-armhf' ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' VERSION='4.3' XEN_ARCH='arm32' binary-arch_armhf_none_armhf_real: binary-arch_armhf_none_real: binary-arch_armhf_real:: $(MAKE) -f debian/rules.real binary-arch-arch ARCH='armhf' VERSION='4.4' XEN_ARCH='arm32' build-arch_armhf: build-arch_armhf_none build-arch_armhf_real build-arch_armhf_none: build-arch_armhf_none_armhf build-arch_armhf_none_real build-arch_armhf_none_armhf:: build-arch_armhf_none_armhf_real build-arch_armhf_none_armhf:: $(MAKE) -f debian/rules.real build-arch-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' VERSION='4.4' XEN_ARCH='arm32' build-arch_armhf_none_armhf_real: build-arch_armhf_none_real: build-arch_armhf_real:: $(MAKE) -f debian/rules.real build-arch-arch ARCH='armhf' VERSION='4.4' XEN_ARCH='arm32' setup_armhf: setup_armhf_none setup_armhf_real setup_armhf_none: setup_armhf_none_armhf setup_armhf_none_real setup_armhf_none_armhf:: setup_armhf_none_armhf_real setup_armhf_none_armhf:: $(MAKE) -f debian/rules.real setup-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' VERSION='4.4' XEN_ARCH='arm32' setup_armhf_none_armhf_real: setup_armhf_none_real: setup_armhf_real:: $(MAKE) -f debian/rules.real setup-arch ARCH='armhf' VERSION='4.4' XEN_ARCH='arm32' binary-arch_arm64: binary-arch_arm64_none binary-arch_arm64_real binary-arch_arm64_none: binary-arch_arm64_none_arm64 binary-arch_arm64_none_real binary-arch_arm64_none_arm64:: binary-arch_arm64_none_arm64_real binary-arch_arm64_none_arm64:: $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' VERSION='4.4' XEN_ARCH='arm64' $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-arm64' ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' VERSION='4.4' XEN_ARCH='arm64' binary-arch_arm64_none_arm64_real: binary-arch_arm64_none_real: binary-arch_arm64_real:: $(MAKE) -f debian/rules.real binary-arch-arch ARCH='arm64' VERSION='4.4' XEN_ARCH='arm32' build-arch_arm64: build-arch_arm64_none build-arch_arm64_real build-arch_arm64_none: build-arch_arm64_none_arm64 build-arch_arm64_none_real build-arch_arm64_none_arm64:: build-arch_arm64_none_arm64_real build-arch_arm64_none_arm64:: $(MAKE) -f debian/rules.real build-arch-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' VERSION='4.4' XEN_ARCH='arm64' build-arch_arm64_none_arm64_real: build-arch_arm64_none_real: build-arch_arm64_real:: $(MAKE) -f debian/rules.real build-arch-arch ARCH='arm64' VERSION='4.4' XEN_ARCH='arm64' setup_arm64: setup_arm64_none setup_arm64_real setup_arm64_none: setup_arm64_none_arm64 setup_arm64_none_real setup_arm64_none_arm64:: setup_arm64_none_arm64_real setup_arm64_none_arm64:: $(MAKE) -f debian/rules.real setup-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' VERSION='4.4' XEN_ARCH='arm64' setup_arm64_none_arm64_real: setup_arm64_none_real: setup_arm64_real:: $(MAKE) -f debian/rules.real setup-arch ARCH='arm64' VERSION='4.4' XEN_ARCH='arm64' debian/xen-sxp2xm0000775000000000000000000002311212317541001011140 0ustar #! /usr/bin/python # -*- mode: python; -*- #============================================================================== # Copyright (C) 2013 Canonical Inc., Stefan Bader #============================================================================== """Conversion tool for domain configurations in sxp format. Provides a way to convert xend managed domains into xm style config file which the xl command can handle. Run: xen-sxp2xm [] Reads the config.sxp and either writes the xm configuration to stdout or creates a .cfg in the given directory if that file does not yet exist. WARNING: The conversion is not perfect. Manual inspection of the result is highly recommended. """ import sys, os.path import types import tempfile sys.path.insert(1, sys.path[0] + '/../lib/python') from xen.xend import XendDomain from xen.xend import XendConfig # # Pop a key off the directory (if it exists) and if that is not the # default setting, emit the data using newkey as the new key name. # def show_cfg_nondefault(cfg, key, newkey, out=sys.stdout): value = None if cfg.has_key(key): defaults = cfg._defaults() if defaults.has_key(key): if defaults[key] != cfg[key]: value = cfg[key] else: value = cfg[key] cfg.pop(key) if value: if not isinstance(value, (types.IntType, types.FloatType)): value = "'%s'" % value out.write("%s=%s\n" % (newkey, value)) def get_vif_string(devcfg): vifstr = "" sep = "" for key in devcfg.iterkeys(): if key == "uuid": continue elif key == "backend": val = devcfg[key] if val != "0": diskstr += "%sbackend=%s" % (sep, val) else: vifstr += "%s%s=%s" % (sep, key, devcfg[key]) sep = "," return vifstr def get_disk_string(devcfg): diskstr = "" sep = "" target="" for key in devcfg.iterkeys(): if key == "uuid": continue elif key == "bootable": continue elif key == "driver": continue elif key == "VDI": continue elif key == "protocol": continue elif key == "backend": val = devcfg[key] if val != "0": diskstr += "%sbackend=%s" % (sep, val) elif key == "dev": val = devcfg[key].split(":", 1) diskstr += "%svdev=%s" % (sep, val[0]) if len(val) > 1 and val[1] == "cdrom": diskstr += ",devtype=cdrom" elif key == "mode": val = devcfg[key] if val == "w": val = "rw" elif val == "r": val = "ro" diskstr += "%saccess=%s" % (sep, val) elif key == "uname": val = devcfg[key] target = "target=%s" % val.split(":")[1] else: diskstr += "%s%s=%s" % (sep, key, devcfg[key]) sep = "," if target != "": diskstr += "%s%s" % (sep, target) return diskstr def get_vfb_string(devcfg): vfbstr = "" sep = "" for key in devcfg.iterkeys(): if key == "uuid": continue if key == "other_config": # other = devcfg[key] continue if key == "keymap": vfbstr += "%s%s=\"%s\"" % (sep, key, devcfg[key]) else: vfbstr += "%s%s=%s" % (sep, key, devcfg[key]) sep = "," return vfbstr def show_dev_list(name, devlist, out=sys.stdout): if len(devlist) > 0: s = "%s=[" % name sep = "" for devstr in devlist: s = s + "%s '%s'" % (sep, devstr) sep = "," s = s + " ]\n" out.write(s) def show_cfg_devices(devices, out=sys.stdout): vifs = [] vfbs = [] disks = [] vtpms = [] for uuid in devices.iterkeys(): (devclass, devcfg) = devices[uuid] if devclass == "vif": vifs.append(get_vif_string(devcfg)) elif devclass == "vbd": disks.append(get_disk_string(devcfg)) elif devclass == "vfb": vfbs.append(get_vfb_string(devcfg)) else: out.write("# WARNING: Unhandled device: %s\n" \ % devclass) for key in devcfg.iterkeys(): out.write("# - %s=%s\n" % (key, devcfg[key])) show_dev_list("vfb", vfbs, out) show_dev_list("vif", vifs, out) show_dev_list("disk", disks, out) show_dev_list("vtpm", vtpms, out) def show_cfg_xm(cfg, out=sys.stdout): hvm = False if cfg['platform'].has_key('loader') and \ "hvmloader" in cfg['platform']['loader']: hvm = True if hvm: out.write("#\n# Autogenerated HVM configuration\n") else: out.write("#\n# Autogenerated PV configuration\n") val = cfg.pop("description") if val != "": out.write("#\n#\n", val) val = cfg.pop("Description") if val != "": out.write("#\n#\n", val) out.write("#\n") if hvm: out.write("builder='hvm'\n") show_cfg_nondefault(cfg, "name_label", "name", out) show_cfg_nondefault(cfg, "uuid", "uuid", out) # # CPU options. Looks like the vcpu_avail bitmap maps best to # vpcus and VCPUs_max # if cfg.has_key('vcpu_avail'): val = int(cfg.pop('vcpu_avail')) n = 0 while val: if val & 1: n += 1 val /= 2 out.write("vcpus=%i\n" % n) out.write("maxvcpus=%i\n" % cfg.pop('VCPUs_max')) else: val = int(cfg.pop('VCPUs_max', 1)) out.write("vcpus=%i\n" % val) out.write("maxvcpus=%i\n" % val) # # Optionally show the weight and cap VCPU option # val = cfg.pop('vcpus_params') n = val.pop('weight', 256) if n != 256: out.write("cpu_weight=%i\n" % n) n = val.pop('cap', 0) if n > 0: out.write("cap=%i\n" % n) show_cfg_nondefault(cfg, "pool_name", "pool", out) # Ignored cfg.pop("VCPUs_live") cfg.pop("VCPUs_at_startup") # # Memory allocation. There seem to be memory_static_(min|max) and # memory_dynamic_(min|max). It looks a bit like static min might be # always 0... # val = cfg.pop('memory_static_min', 0) if val: out.write("WARNING: memory_static_min != 0 was not expected!\n") minmem = cfg.pop('memory_dynamic_min', 0) val = cfg.pop('memory_static_max', 0) val1 = cfg.pop('memory_dynamic_max', 0) if val != val1: out.write("# WARNING: dynamic/static max memory mismatch " \ "(%i/%i)\n" % (val1, val)) maxmem = max(val, val1) if minmem != maxmem: out.write("memory=%i\n" % (minmem / 1024 / 1024)) out.write("maxmem=%i\n" % (maxmem / 1024 / 1024)) else: out.write("memory=%i\n" % (minmem / 1024 / 1024)) val = cfg.pop("shadow_memory") if hvm and val > 0: out.write("shadow_memory=%i\n" % (val)) show_cfg_nondefault(cfg, "actions_after_shutdown", "on_poweroff", out) show_cfg_nondefault(cfg, "actions_after_reboot", "on_reboot", out) show_cfg_nondefault(cfg, "actions_after_crash", "on_crash", out) # Ignored cfg.pop("actions_after_suspend") cfg.pop("on_xend_start") cfg.pop("on_xend_stop") # # Devices # devices = cfg.pop("devices") if devices: show_cfg_devices(devices, out) # # Platform # val = cfg.pop("platform") if val.pop("nomigrate", "0") != "0": out.write("nomigrate=1\n") if cfg.pop("is_control_domain", False): out.write("driver_domain=1\n") # # PV guest specific # val = cfg.pop("PV_kernel") if not hvm: out.write("kernel='%s'\n" % val) val = cfg.pop("PV_ramdisk") if not hvm and val != "": out.write("ramdisk='%s'\n" % val) val = cfg.pop("PV_bootloader") if not hvm and val != "": out.write("bootloader='%s'\n" % val) val = cfg.pop("PV_bootloader_args") if not hvm and val != "": out.write("bootloader_args='%s'\n" % val) val = cfg.pop("PV_args") if not hvm and val != "": out.write("extra='%s'\n" % val) # # HVM guest specific # val = cfg.pop("HVM_boot_params") val = val.pop("order", "c") if hvm: out.write("boot=%s\n" % val) # Ignore cfg.pop("HVM_boot_policy") # # Things just ignored without complaint # cfg.pop("vbd_refs") cfg.pop("vif_refs") cfg.pop("console_refs") cfg.pop("auto_power_on") cfg.pop("status") cfg.pop("use_tmp_kernel") cfg.pop("use_tmp_ramdisk") out.write("#\n# The following options were not converted:\n#\n") for k in cfg.iterkeys(): out.write("# %s=%s\n" % (k, cfg[k])) # # Check for one argument (the filename) # if len(sys.argv) < 2: print "Usage: %s " % os.path.basename(sys.argv[0]) sys.exit(1) cfgname = sys.argv[1] # # If a second argument is given, make sure this is pointing to a directory. # outdir = None if len(sys.argv) == 3: outdir = sys.argv[2] if not os.path.isdir(outdir): print "Error: %s is not a directory!" % outdir sys.exit(1) # # Special pre-processing as it turned out that the sanity check of # XendConfig object does not like the device_model or loader path # to be wrong. # For device_model just filter out the line to make the resulting # config go for the default. # For the loader, strip the pathname # (tmpfd, tmpname) = tempfile.mkstemp() try: cfgfile = open(cfgname) except: print "Failed to open %s" % cfgname tmpfd.close() unlink(tmpname) sys.exit(1) for line in cfgfile: if "(device_model" in line: continue if "(loader" in line: idx = line.index("(loader") val = os.path.basename(line[idx+8:-1]) line = "%s%s" % (line[:idx+8], val) os.write(tmpfd, line) cfgfile.close() os.close(tmpfd) # # Let XenConfig parse the pre-processed sxp file. Note to self: the raise # is there because otherwise its pretty much impossible to find out what # went wrong if things go wrong. # try: cfg = XendConfig.XendConfig(filename = tmpname) except Exception: print('Unable to open of parse sxp file: %s' % cfgfile) os.unlink(tmpname) raise os.unlink(tmpname) if cfg.pop("is_a_template", False): print "Skipping %s (template)" % cfgname sys.exit(2) # # If this should go into an output directory, check whether that file # actually is there already. # outfile = sys.stdout if outdir: if not cfg.has_key("name_label"): print "Skipping %s without name defined." % cfgname sys.exit(2) outname = os.path.join(outdir, cfg["name_label"] + ".cfg") if os.path.exists(outname): print "Config %s already exists." % outname sys.exit(3) try: outfile = open(outname, "w") except: print "Failed to create %s!" % outname sys.exit(1) if outdir: print "Creating %s" % outname show_cfg_xm(cfg, outfile) sys.exit(0) debian/xen-utils.NEWS0000664000000000000000000000045711230344377011630 0ustar xen-3.0 (3.4.0-1) UNRELEASED; urgency=low This version does not longer ship the ioemu part, aka the patched qemu. So it does not support * full virtualized domains and * virtual console support for paravirtualized domains. -- Bastian Blank Sat, 18 Jul 2009 15:05:31 +0200 debian/libxenstore3.0.install0000664000000000000000000000003110746736114013342 0ustar usr/lib/libxenstore.so.* debian/bin/0000775000000000000000000000000012212071061007730 5ustar debian/bin/genorig.py0000775000000000000000000000601211556215027011752 0ustar #!/usr/bin/env python import sys sys.path.append(sys.path[0] + '/../lib/python') import itertools import os, os.path import shutil import subprocess from debian_xen.debian import VersionXen from debian_linux.debian import Changelog class RepoHg(object): def __init__(self, repo, options): self.repo = repo self.tag = options.tag or 'tip' def do_archive(self, info): orig_dir = os.path.join(info.temp_dir, info.orig_dir) args = ('hg', 'archive', '-r', self.tag, os.path.realpath(orig_dir)) subprocess.check_call(args, cwd=self.repo) class RepoGit(object): def __init__(self, repo, options): self.repo = repo self.tag = options.tag or 'HEAD' def do_archive(self, info): temp_tar = os.path.join(info.temp_dir, 'orig.tar') args = ('git', 'archive', '--prefix', '%s/' % info.orig_dir, '-o', os.path.realpath(temp_tar), self.tag) subprocess.check_call(args, cwd=self.repo) subprocess.check_call(('tar', '-C', info.temp_dir, '-xf', temp_tar)) class Main(object): log = sys.stdout.write def __init__(self, options, repo): self.options = options self.changelog_entry = Changelog(version=VersionXen)[0] self.source = self.changelog_entry.source if options.version: self.version = options.version else: raise NotImplementedError if os.path.exists(os.path.join(repo, '.hg')): self.repo = RepoHg(repo, options) elif os.path.exists(os.path.join(repo, '.git')): self.repo = RepoGit(repo, options) else: raise NotImplementedError if options.component: self.orig_dir = options.component self.orig_tar = '%s_%s.orig-%s.tar.gz' % (self.source, self.version, options.component) else: self.orig_dir = '%s-%s' % (self.source, self.version) self.orig_tar = '%s_%s.orig.tar.gz' % (self.source, self.version) def __call__(self): import tempfile self.temp_dir = tempfile.mkdtemp(prefix='genorig', dir='debian') try: self.do_archive() self.do_tar() finally: shutil.rmtree(self.temp_dir) def do_archive(self): self.log("Create archive.\n") self.repo.do_archive(self) def do_tar(self): out = "../orig/%s" % self.orig_tar self.log("Generate tarball %s\n" % out) try: os.stat(out) raise RuntimeError("Destination already exists") except OSError: pass subprocess.check_call(('tar', '-C', self.temp_dir, '-czf', out, self.orig_dir)) if __name__ == '__main__': from optparse import OptionParser p = OptionParser(prog=sys.argv[0], usage='%prog [OPTION]... DIR') p.add_option('-c', '--component', dest='component') p.add_option('-t', '--tag', dest='tag') p.add_option('-v', '--version', dest='version') options, args = p.parse_args() if len(args) != 1: raise RuntimeError Main(options, *args)() debian/bin/gencontrol.py0000775000000000000000000001202012012256702012457 0ustar #!/usr/bin/env python import os, sys sys.path.append(os.path.join(sys.path[0], "../lib/python")) from debian_xen.debian import VersionXen from debian_linux.config import ConfigCoreHierarchy from debian_linux.debian import Changelog, PackageArchitecture from debian_linux.gencontrol import Gencontrol as Base from debian_linux.utils import Templates class Gencontrol(Base): config_schema = { 'description': { } } def __init__(self): super(Gencontrol, self).__init__(ConfigCoreHierarchy(self.config_schema, ["debian/arch"]), Templates(["debian/templates"])) self.process_changelog() def do_main_setup(self, vars, makeflags, extra): makeflags.update({ 'VERSION': self.version.xen_version, }) def do_arch_setup(self, vars, makeflags, arch, extra): config_entry = self.config.merge('base', arch) config_entry_description = self.config.merge('description', arch) for i in ( ('xen-arch', 'XEN_ARCH'), ): makeflags[i[1]] = config_entry[i[0]] def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra): packages_main = self.process_packages(self.templates["control.main"], vars) packages_utils = self.process_packages(self.templates["control.utils"], vars) for package in packages_main + packages_utils: name = package['Package'] if name in packages: package = packages.get(name) else: packages.append(package) arches = package.setdefault('Architecture', PackageArchitecture()) if 'all' not in arches: arches.add(arch) package_utils_name = packages_utils[0]['Package'] for i in ('postinst', 'prerm', 'lintian-overrides'): j = self.substitute(self.templates["xen-utils.%s" % i], vars) file("debian/%s.%s" % (package_utils_name, i), 'w').write(j) cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags] cmds_build = ["$(MAKE) -f debian/rules.real build-arch-arch %s" % makeflags] cmds_setup = ["$(MAKE) -f debian/rules.real setup-arch %s" % makeflags] makefile.add('binary-arch_%s_real' % arch, cmds = cmds_binary_arch) makefile.add('build-arch_%s_real' % arch, cmds = cmds_build) makefile.add('setup_%s_real' % arch, cmds = cmds_setup) def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra): config_entry = self.config.merge('base', arch, featureset, flavour) config_description = self.config.merge('description', arch, featureset, flavour) vars['class'] = config_description['hardware'] vars['longclass'] = config_description.get('hardware-long') or vars['class'] for i in ( ('xen-arch', 'XEN_ARCH'), ): if config_entry.has_key(i[0]): makeflags[i[1]] = config_entry[i[0]] def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra): hypervisor = self.templates["control.hypervisor"] system_latest = self.templates["control.system.latest"] if not vars.has_key('desc'): vars['desc'] = '' packages_own = [] packages_own.extend(self.process_packages(hypervisor, vars)) packages_dummy = self.process_packages(system_latest, vars) for package in packages_own + packages_dummy: name = package['Package'] package.setdefault('Architecture', PackageArchitecture()).add(arch) if name in packages: package = packages.get(name) else: packages.append(package) arches = package.setdefault('Architecture', PackageArchitecture()) if 'all' not in arches: arches.add(arch) package_name = packages_own[0]['Package'] for i in ('postinst', 'postrm'): j = self.substitute(self.templates["xen-hypervisor.%s" % i], vars) file("debian/%s.%s" % (package_name, i), 'w').write(j) cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags] cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour %s" % makeflags] cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags] cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (u' '.join([u"-p%s" % i['Package'] for i in packages_dummy]), makeflags)] makefile.add("binary-arch_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_binary_arch) makefile.add("build-arch_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_build) makefile.add("setup_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_setup) def process_changelog(self): changelog = Changelog(version = VersionXen) self.version = changelog[0].version self.vars = { 'version': self.version.xen_version, } if __name__ == '__main__': Gencontrol()() debian/bin/check-patches.sh0000775000000000000000000000062011207041024012766 0ustar #!/bin/sh -e TMPDIR=$(mktemp -d) trap "rm -rf $TMPDIR" EXIT grep -v "^#" debian/patches/series | awk '{if (NF == 1) print "debian/patches/" $1}' | sort -u > $TMPDIR/used find debian/patches -type f -name "*.diff" -printf "%p\n" | sort > $TMPDIR/avail echo "Used patches" echo "==============" cat $TMPDIR/used echo echo "Unused patches" echo "==============" fgrep -v -f $TMPDIR/used $TMPDIR/avail debian/tree/0000775000000000000000000000000012212071061010117 5ustar debian/tree/xen-utils-common/0000775000000000000000000000000012212071061013335 5ustar debian/tree/xen-utils-common/usr/0000775000000000000000000000000012212071061014146 5ustar debian/tree/xen-utils-common/usr/share/0000775000000000000000000000000012212071061015250 5ustar debian/tree/xen-utils-common/usr/share/xen-utils-common/0000775000000000000000000000000012316237263020503 5ustar debian/tree/xen-utils-common/usr/share/xen-utils-common/default.xen0000664000000000000000000000045412307374333022646 0ustar # Configuration for Xen system # ---------------------------- # There exists several tool stacks to configure a Xen system. # xm: This is the old, deprecated toolstack (xend) # xl: This is the new toolstack using libxenlight/libxl # # Attention: You need to reboot after changing this! TOOLSTACK=xl debian/xenstore-utils.install0000664000000000000000000000002411201567406013563 0ustar usr/sbin/xenstore-* debian/pycompat0000664000000000000000000000000210470376574010754 0ustar 2 debian/xen-utils-4.4.postinst0000664000000000000000000000055312321467057013242 0ustar #!/bin/sh set -e case "$1" in configure) if [ -x "/etc/init.d/xen" ]; then invoke-rc.d xen start || exit $? fi /usr/lib/xen-4.4/bin/xen-migrate-xend-managed-domains ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/xen-utils.README.Debian0000664000000000000000000000430711402217463013164 0ustar Xen for Debian ============== Config behaviour ---------------- The Debian packages changes the behaviour of some config options. The options "kernel", "initrd" and "loader" searches in the Xen private boot directory (/usr/lib/xen-$version/boot) first. "bootloader" and "device_model" also searches the Xen private bin directory (/usr/lib/xen-$version/bin). This means that the following entries will properly find anything: loader = 'hvmloader' bootloader = 'pygrub' Network setup ------------- The Debian package of Xen don't change the network setup in any way. This differs from the upstream version, which overwrites the main network card (eth0) with a bridge setup and may break the network at this point.. To setup a bridge please follow the instructions in the manpage for bridge-utils-interfaces(5). You can also change the /etc/xen/xend-config.sxp file and re-enable the Xen included network setup by adding (network-script network-bridge) to the file. But please note that this may or may not work. Loop devices ------------ If you plan hosting virtual domains with file backed block devices (ie. the ones xen-tools creates by default) be careful about two issues: 1. Maximum number of loop devices By default the loop driver supports a maximum of 8 loop devices. Of course since every Xen domain uses at least two (one for the data and one for the swap) this number is absolutely insufficient. You should increase it by adding a file named local-loop in /etc/modprobe.d containing the string "options loop max_loop=128", if the loop driver is compiled as a module, or by appending the string max_loop=128 to your kernel parameters if the driver is in-kernel. Of course you can increase or decrease the number 128 as you see fit. 2. Driver loading (only if loop is compiled as a module) Normally the loop driver gets loaded when the first loop device is accessed. When using udev, though, the loop devices get created only after the driver gets loaded. This means that Xen will fail if the loop driver is not already loaded when it tries to start a file-backed virtual domain. To fix this just add "loop" in your /etc/modules file, thus forcing it to be loaded at boot time. debian/rules.real0000664000000000000000000002400412322026766011175 0ustar include /usr/share/dpkg/default.mk include /usr/share/ocaml/ocamlvars.mk export DH_OPTIONS setup_env := env -u ARCH -u FLAVOUR -u VERSION -u MAKEFLAGS MAKE_CLEAN = $(setup_env) $(MAKE) V=1 MAKE_SELF = $(MAKE) -f debian/rules.real include debian/rules.defs stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@ binary-arch-arch: install-libxen_$(ARCH) binary-arch-arch: install-libxen-dev_$(ARCH) binary-arch-arch: install-libxenstore_$(ARCH) binary-arch-arch: install-utils_$(ARCH) binary-arch-arch: install-xenstore-utils_$(ARCH) ifeq (,$(findstring $(ARCH),armhf arm64)) binary-arch-arch: install-lib-ocaml-dev_$(ARCH) binary-arch-arch: install-lib-ocaml_$(ARCH) endif binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR) binary-indep: install-utils-common build-arch-arch: $(STAMPS_DIR)/build-utils_$(ARCH) build-arch-flavour: $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) build-indep: $(STAMPS_DIR)/build-docs setup-arch: $(STAMPS_DIR)/setup-utils_$(ARCH) setup-flavour: $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR) $(STAMPS_DIR)/setup-docs: SOURCE_FILES = $(filter-out debian, $(wildcard *)) $(STAMPS_DIR)/setup-docs: DIR=$(BUILD_DIR)/build-docs $(STAMPS_DIR)/setup-docs: @rm -rf $(DIR) mkdir -p $(DIR) cp -al $(SOURCE_FILES) $(DIR) cd $(DIR)/docs; ./configure --enable-xend --prefix=/usr cd $(DIR)/tools; \ WGET=/bin/false \ ./configure --enable-xend --prefix=/usr @$(stamp) $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): SOURCE_FILES = $(filter-out debian, $(wildcard *)) $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): @rm -rf $(DIR) mkdir -p $(DIR) cp -al $(SOURCE_FILES) $(DIR) echo "XEN_VENDORVERSION := $(EXTRAVERSION)" > $(DIR)/xen/xen-version @$(stamp) $(STAMPS_DIR)/setup-utils_$(ARCH): SOURCE_FILES = $(filter-out debian, $(wildcard *)) $(STAMPS_DIR)/setup-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH) $(STAMPS_DIR)/setup-utils_$(ARCH): @rm -rf $(DIR) mkdir -p $(DIR) cp -al $(SOURCE_FILES) $(DIR) cd $(DIR)/tools; \ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ WGET=/bin/false \ ./configure \ --enable-xend \ --prefix=/usr \ --includedir=$${prefix}/include \ --mandir=$${prefix}/share/man \ --infodir=$${prefix}/share/info \ --sysconfdir=/etc \ --localstatedir=/var @$(stamp) $(STAMPS_DIR)/build-docs: DIR=$(BUILD_DIR)/build-docs $(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs +$(MAKE_CLEAN) -C $(DIR)/docs touch $@ $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR) +$(MAKE_CLEAN) -C $(DIR)/xen \ XEN_COMPILE_ARCH=$(XEN_ARCH) \ XEN_TARGET_ARCH=$(XEN_ARCH) touch $@ $(STAMPS_DIR)/build-utils_$(ARCH) \ $(STAMPS_DIR)/install-utils_$(ARCH): CONFIG = \ debug=n \ XEN_COMPILE_ARCH=$(XEN_ARCH) \ XEN_TARGET_ARCH=$(XEN_ARCH) \ XEN_VERSION=$(VERSION) \ OCAMLDESTDIR=$(CURDIR)/$(BUILD_DIR)/install-utils_$(ARCH)/$(OCAML_STDLIB_DIR) \ PYTHON=$(shell pyversions -r) $(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH) $(STAMPS_DIR)/build-utils_$(ARCH): $(STAMPS_DIR)/setup-utils_$(ARCH) +$(MAKE_CLEAN) -C $(DIR)/tools $(CONFIG) touch $@ $(STAMPS_DIR)/install-utils_$(ARCH): DIR = $(BUILD_DIR)/build-utils_$(ARCH) $(STAMPS_DIR)/install-utils_$(ARCH): INSTALL_DIR = $(BUILD_DIR)/install-utils_$(ARCH) $(STAMPS_DIR)/install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH) @rm -rf $(INSTALL_DIR) mkdir -p $(INSTALL_DIR)/$(OCAML_DLL_DIR) +$(MAKE_CLEAN) -C $(DIR)/tools install DESTDIR=$(CURDIR)/$(INSTALL_DIR) $(CONFIG) ifeq (,$(findstring $(ARCH),armhf arm64)) # hvmloader strip --remove-section=.comment --remove-section=.note $(INSTALL_DIR)/usr/lib/xen*/boot/* endif touch $@ $(STAMPS_DIR)/install-utils-common: DIR = $(BUILD_DIR)/build-docs $(STAMPS_DIR)/install-utils-common: INSTALL_DIR = $(BUILD_DIR)/install-utils-common $(STAMPS_DIR)/install-utils-common: export DESTDIR = $(CURDIR)/$(INSTALL_DIR) $(STAMPS_DIR)/install-utils-common: $(STAMPS_DIR)/build-docs @rm -rf $(INSTALL_DIR) +$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/examples install-configs +$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/hotplug/common install-scripts +$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/hotplug/Linux install-udev install-scripts UDEV_RULES_DIR=/lib/udev +$(MAKE_CLEAN) -C debian/scripts install touch $@ install-base: dh_installchangelogs -XChangelog dh_installdirs dh_installdocs dh_installexamples dh_compress dh_fixperms dh_installdeb dh_gencontrol -- $(GENCONTROL_ARGS) dh_md5sums dh_builddeb install-dummy: dh_testdir dh_testroot dh_prep +$(MAKE_SELF) install-base install-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) install-hypervisor_$(ARCH)_$(FLAVOUR): PACKAGE_NAME = xen-hypervisor-$(VERSION)-$(FLAVOUR) install-hypervisor_$(ARCH)_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME) install-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) dh_testdir dh_testroot dh_prep dh_installdirs boot dh_installdirs etc/default/grub.d install -D -m644 debian/xen-hypervisor-$(VERSION).xen.cfg \ debian/$(PACKAGE_NAME)/etc/default/grub.d/xen.cfg ifeq (,$(findstring $(ARCH),armhf arm64)) cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).gz else cp $(DIR)/xen/xen debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR) endif +$(MAKE_SELF) install-base install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH): DH_OPTIONS = -plibxen-$(VERSION) install-libxen_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxenstore_$(ARCH) dh_testdir dh_testroot dh_prep dh_install --sourcedir=$(DIR) usr/lib/lib*-$(VERSION).so dh_strip dh_makeshlibs -V dh_shlibdeps +$(MAKE_SELF) install-base install-libxen-dev_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) install-libxen-dev_$(ARCH): PACKAGE_NAME = libxen-dev install-libxen-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-libxen-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) dh_testdir dh_testroot dh_prep dh_install --sourcedir=$(DIR) dh_strip dh_shlibdeps +$(MAKE_SELF) install-base install-lib-ocaml_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) install-lib-ocaml_$(ARCH): PACKAGE_NAME = libxen-ocaml install-lib-ocaml_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-lib-ocaml_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) dh_testdir dh_testroot dh_prep dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/META dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cma dh_install --sourcedir=$(DIR) -X.so.owner ./$(OCAML_DLL_DIR)/* dh_strip dh_shlibdeps dh_ocaml +$(MAKE_SELF) install-base install-lib-ocaml-dev_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) install-lib-ocaml-dev_$(ARCH): PACKAGE_NAME = libxen-ocaml-dev install-lib-ocaml-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-lib-ocaml-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) dh_testdir dh_testroot dh_prep dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cmx dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cmxa dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cmi dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.a dh_strip dh_shlibdeps dh_ocaml +$(MAKE_SELF) install-base install-libxenstore_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) install-libxenstore_$(ARCH): PACKAGE_NAME = libxenstore3.0 install-libxenstore_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-libxenstore_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) dh_testdir dh_testroot dh_prep dh_install --sourcedir=$(DIR) dh_strip dh_makeshlibs -V dh_shlibdeps +$(MAKE_SELF) install-base install-utils_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH) install-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) install-utils_$(ARCH): PACKAGE_NAME = xen-utils-$(VERSION) install-utils_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME) install-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxenstore_$(ARCH) dh_testdir dh_testroot dh_prep install -D -m644 debian/xen-utils.NEWS $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian install -D -m644 debian/xen-utils-$(VERSION).lintian-overrides $(PACKAGE_DIR)/usr/share/lintian/overrides/$(PACKAGE_NAME) dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION) # Hack around usr/sbin dh_install --sourcedir=$(DIR) usr/sbin/* /usr/lib/xen-$(VERSION)/bin/ install -m 755 debian/xen-sxp2xm \ $(PACKAGE_DIR)/usr/lib/xen-$(VERSION)/bin install -m 755 debian/xen-migrate-xend-managed-domains \ $(PACKAGE_DIR)/usr/lib/xen-$(VERSION)/bin ( echo -n "misc:Built-Using="; dpkg-query -f='$${source:Package} (= $${source:Version}), ' -W ipxe-qemu seabios; echo ) >> debian/$(PACKAGE_NAME).substvars dh_python2 -V$(shell pyversions -rv) /usr/lib/xen-$(VERSION) dh_strip dh_makeshlibs -V dh_shlibdeps +$(MAKE_SELF) install-base install-utils-common: SOURCE_DIR = $(BUILD_DIR)/build-docs install-utils-common: DIR = $(BUILD_DIR)/install-utils-common install-utils-common: PACKAGE_NAME = xen-utils-common install-utils-common: DH_OPTIONS = -p$(PACKAGE_NAME) install-utils-common: $(STAMPS_DIR)/install-utils-common dh_testdir dh_testroot dh_prep dh_install -X .svn --sourcedir=$(DIR) dh_installinit --name xen -- defaults 20 21 dh_installinit --name xend dh_installinit --name xendomains --no-start -- defaults 21 20 dh_installman $(SOURCE_DIR)/docs/man1/* $(SOURCE_DIR)/docs/man5/* dh_link dh_ucf +$(MAKE_SELF) install-base install-xenstore-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) install-xenstore-utils_$(ARCH): PACKAGE_NAME = xenstore-utils install-xenstore-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-xenstore-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxenstore_$(ARCH) dh_testdir dh_testroot dh_prep dh_install --sourcedir=$(DIR) dh_strip dh_shlibdeps +$(MAKE_SELF) install-base # vim: filetype=make debian/source/0000775000000000000000000000000012212071062010461 5ustar debian/source/format0000664000000000000000000000001411343011431011665 0ustar 3.0 (quilt) debian/arch/0000775000000000000000000000000012212071061010075 5ustar debian/arch/defines0000664000000000000000000000004311201572564011445 0ustar [abi] [base] arches: amd64 i386 debian/arch/i386/0000775000000000000000000000000012221302632010567 5ustar debian/arch/i386/defines0000664000000000000000000000004212221321177012130 0ustar [base] flavours: xen-arch: x86_32 debian/arch/amd64/0000775000000000000000000000000012212071061011010 5ustar debian/arch/amd64/defines0000664000000000000000000000022111341232036012346 0ustar [base] flavours: amd64 xen-arch: x86_64 [amd64_description] hardware: AMD64 hardware-long: all 64bit single- and multiprocessor AMD and Intel debian/libxen-dev.install0000664000000000000000000000067312175760301012625 0ustar usr/lib/libxenctrl.a usr/lib/libxenctrl.so usr/lib/libxenguest.a usr/lib/libxenguest.so usr/lib/libxenlight.a usr/lib/libxenlight.so usr/lib/libxenstore.a usr/lib/libxenstore.so usr/lib/libxlutil.a usr/lib/libxlutil.so usr/include/_libxl*.h usr/include/libxl*.h usr/include/xenctrl.h usr/include/xenguest.h usr/include/xenstore*.h usr/include/xenstore-compat/xs* usr/include usr/include/xentoollog.h usr/include/xenctrlosdep.h usr/include/xen debian/libxenstore3.0.symbols0000664000000000000000000000243411767702363013400 0ustar libxenstore.so.3.0 libxenstore3.0 #MINVER# expanding_buffer_ensure@Base 3.2.0 sanitise_value@Base 3.2.0 unsanitise_value@Base 3.2.0 xprintf@Base 3.2.0 xs_check_watch@Base 4.2~ xs_close@Base 4.1.0~rc6 xs_count_strings@Base 3.2.0 xs_daemon_close@Base 3.2.0 xs_daemon_destroy_postfork@Base 4.0.1~rc4 xs_daemon_open@Base 3.2.0 xs_daemon_open_readonly@Base 3.2.0 xs_daemon_rootdir@Base 3.2.0 xs_daemon_rundir@Base 3.2.0 xs_daemon_socket@Base 3.2.0 xs_daemon_socket_ro@Base 3.2.0 xs_daemon_tdb@Base 3.2.0 xs_debug_command@Base 3.2.0 xs_directory@Base 3.2.0 xs_domain_dev@Base 3.2.0 xs_domain_open@Base 3.2.0 xs_fileno@Base 3.2.0 xs_get_domain_path@Base 3.2.0 xs_get_permissions@Base 3.2.0 xs_introduce_domain@Base 3.2.0 xs_is_domain_introduced@Base 3.2.0 xs_mkdir@Base 3.2.0 xs_open@Base 4.1.0~rc6 xs_path_is_subpath@Base 4.2~ xs_perm_to_string@Base 3.2.0 xs_read@Base 3.2.0 xs_read_watch@Base 3.2.0 xs_release_domain@Base 3.2.0 xs_restrict@Base 4.1.0~rc6 xs_resume_domain@Base 3.2.0 xs_rm@Base 3.2.0 xs_set_permissions@Base 3.2.0 xs_set_target@Base 3.4.0 xs_strings_to_perms@Base 3.2.0 xs_suspend_evtchn_port@Base 3.4.0 xs_transaction_end@Base 3.2.0 xs_transaction_start@Base 3.2.0 xs_unwatch@Base 3.2.0 xs_watch@Base 3.2.0 xs_write@Base 3.2.0 xs_write_all@Base 3.2.0 debian/xen-utils-common.xendomains.init0000664000000000000000000001125512222512661015442 0ustar #!/bin/bash ### BEGIN INIT INFO # Provides: xendomains # Required-Start: $syslog $remote_fs xen # Required-Stop: $syslog $remote_fs xen # Should-Start: drbd iscsi openvswitch-switch # Should-Stop: drbd iscsi openvswitch-switch # X-Start-Before: corosync heartbeat # X-Stop-After: corosync heartbeat # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop secondary xen domains # Description: Start / stop domains automatically when domain 0 # boots / shuts down. ### END INIT INFO . /lib/init/vars.sh . /lib/lsb/init-functions TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null) if [ $? -ne 0 ]; then log_warning_msg "No usable Xen toolstack selected" exit 0 fi if [ "$(basename "$TOOLSTACK")" != xm ] && [ "$(basename "$TOOLSTACK")" != xl ]; then exit 0 fi xen list &> /dev/null if test $? -ne 0 then exit 0; fi if ! [ -e /proc/xen/privcmd ]; then exit 0 fi [ -r /etc/default/xendomains ] && . /etc/default/xendomains shopt -s nullglob check_config_name() { xen create --quiet --dryrun --defconfig "$1" | sed -n 's/^.*(name \(.*\))$/\1/p' } check_running() { xen domid "$1" > /dev/null 2>&1 return $? } timeout_coproc() { local TIMEOUT=$1 shift coproc "$@" 2>&1 1>/dev/null local COPROC_OUT exec {COPROC_OUT}<&"${COPROC[0]}" local PID="$COPROC_PID" for no in $(seq 0 $TIMEOUT); do if [ -z "$COPROC_PID" ]; then break; fi sleep 1 log_action_cont_msg done kill -INT "$COPROC_PID" >/dev/null 2>&1 wait $PID local rc=$? log_action_end_msg $rc [ $rc -gt 0 ] && cat <&$COPROC_OUT exec <&$COPROC_OUT- } timeout_domain() { name="$1" TIMEOUT="$2" for no in $(seq 0 $TIMEOUT); do if ! check_running "$name"; then return 0; fi sleep 1 log_action_cont_msg done return 1 } do_start_restore() { [ -n "$XENDOMAINS_SAVE" ] || return [ -d "$XENDOMAINS_SAVE" ] || return [ -n "$XENDOMAINS_RESTORE" ] || return for file in $XENDOMAINS_SAVE/*; do if [ -f $file ] ; then name="${file##*/}" log_action_begin_msg "Restoring Xen domain $name (from $file)" out=$(xen restore "$file" 2>&1 1>/dev/null) case "$?" in 0) rm "$file" domains[$name]='started' log_action_end_msg 0 ;; *) domains[$name]='failed' log_action_end_msg 1 echo "$out" ;; esac fi done } do_start_auto() { [ -n "$XENDOMAINS_AUTO" ] || return [ -d "$XENDOMAINS_AUTO" ] || return for file in $XENDOMAINS_AUTO/*; do name="$(check_config_name $file)" if [ "${domains[$name]}" = started ]; then : elif check_running "$name"; then log_action_msg "Xen domain $name already running" else log_action_begin_msg "Starting Xen domain $name (from $file)" if [ "${domains[$name]}" = failed ]; then log_action_end_msg 1 "restore failed" else out=$(xen create --quiet --defconfig "$file" 2>&1 1>/dev/null) case "$?" in 0) log_action_end_msg 0 ;; *) log_action_end_msg 1 echo "$out" ;; esac fi fi done } do_start() { declare -A domains do_start_restore do_start_auto } do_stop_migrate() { [ -n "$XENDOMAINS_MIGRATE" ] || return while read id name rest; do log_action_begin_msg "Migrating Xen domain $name ($id)" (timeout_coproc "$XENDOMAINS_STOP_MAXWAIT" xen migrate $id $XENDOMAINS_MIGRATE) done < <(/usr/lib/xen-common/bin/xen-init-list) } do_stop_save() { [ -n "$XENDOMAINS_SAVE" ] || return [ -d "$XENDOMAINS_SAVE" ] || mkdir -m 0700 -p "$XENDOMAINS_SAVE" while read id name rest; do log_action_begin_msg "Saving Xen domain $name ($id)" (timeout_coproc "$XENDOMAINS_STOP_MAXWAIT" xen save $id $XENDOMAINS_SAVE/$name) done < <(/usr/lib/xen-common/bin/xen-init-list) } do_stop_shutdown() { while read id name rest; do log_action_begin_msg "Shutting down Xen domain $name ($id)" xen shutdown $id 2>&1 1>/dev/null log_action_end_msg $? done < <(/usr/lib/xen-common/bin/xen-init-list) while read id name rest; do log_action_begin_msg "Waiting for Xen domain $name ($id) to shut down" timeout_domain "$name" "$XENDOMAINS_STOP_MAXWAIT" log_action_end_msg $? done < <(/usr/lib/xen-common/bin/xen-init-list) } do_stop() { do_stop_migrate do_stop_save do_stop_shutdown } case "$1" in start) do_start ;; stop) do_stop ;; restart) do_stop do_start ;; reload|force-reload) do_stop do_start ;; *) echo "Usage: $0 {start|stop|restart|reload|force-reload}" exit 3 ;; esac exit 0 debian/rules.defs0000664000000000000000000000015512212071014011154 0ustar KERNELVERSION := 3.10-2 BUILD_DIR = debian/build STAMPS_DIR = debian/stamps TEMPLATES_DIR = debian/templates debian/xen-utils-common.preinst0000664000000000000000000000046511743751336014033 0ustar #!/bin/sh set -e case "$1" in install|upgrade) ;; abort-upgrade) ;; *) echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac dpkg-maintscript-helper mv_conffile /etc/init.d/xend /etc/init.d/xen 4.1.2-4~ -- "$@" update-rc.d -f xend remove >/dev/null #DEBHELPER# exit 0 debian/control.md5sum0000664000000000000000000000176712221321221012003 0ustar ac0eaaff8a41be34286540b920471a29 debian/changelog c379f09bde66561f34d361dd9f89e345 debian/bin/gencontrol.py a4fad0ec66d977759a362165bf8aa31d debian/templates/control.hypervisor.in e9166b8a1e6e9ac9e2fba6050a59fbdb debian/templates/control.main.in d9d85cc5f2ddd8c23cc860bb4b1b3fe5 debian/templates/control.source.in fe9f3e8a9c9b716f7b4c5b7d7aec3128 debian/templates/control.system.latest.in 7f13b99c446eb6cf64d21a2de26b9460 debian/templates/control.utils.in a15fa64ce6deead28d33c1581b14dba7 debian/templates/xen-hypervisor.postinst.in 22492e0565a4754b5e008ca7cac871da debian/templates/xen-hypervisor.postrm.in dcabf82578122540e0534f72750698d5 debian/templates/xen-utils.lintian-overrides.in 03f63e67cf2d915bfbb535f8c9d9e2e4 debian/templates/xen-utils.postinst.in b6acd21c3924e6ec6f9c547afbbc7d9e debian/templates/xen-utils.prerm.in 2f0cc6973a228e4002e5b89f756e3d58 debian/arch/defines 7eec83f6c765a660ebaeb80dc4b433ad debian/arch/amd64/defines ea4d950fe2490d8a019d069852c8ffd3 debian/arch/i386/defines debian/templates/0000775000000000000000000000000012212071061011156 5ustar debian/templates/control.main.in0000664000000000000000000000342012173476022014124 0ustar Package: libxen-@version@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Public libs for Xen This package contains the shared libraries for Xen. Package: libxenstore3.0 Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Xenstore communications library for Xen This package contains the public libxenstore. Package: libxen-dev Section: libdevel Depends: libxen-@version@ (= ${binary:Version}), libxenstore3.0 (= ${binary:Version}), ${misc:Depends} Description: Public headers and libs for Xen This package contains the public headers and static libraries for Xen. Package: xenstore-utils Section: admin Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: xen-utils-common (<= 3.1.0-1) Replaces: xen-utils-common (<= 3.1.0-1) Description: Xenstore utilities for Xen This package contains the Xenstore utilities. Package: libxen-ocaml Section: ocaml Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends} Provides: ${ocaml:Provides} Description: OCaml libraries for controlling Xen This package contains the runtime libraries required for the ocaml bindings to the Xen control libraries. Package: libxen-ocaml-dev Section: ocaml Depends: libxen-ocaml (= ${binary:Version}), libxen-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends} Provides: ${ocaml:Provides} Description: OCaml libraries for controlling Xen (devel package) This package contains the ocaml findlib packages for compiling applications that are designed to control the Xen hypervisor. Package: xen-utils-common Architecture: all Depends: gawk, lsb-base, python, udev, xenstore-utils, ${misc:Depends} Description: Xen administrative tools - common files The userspace tools to manage a system virtualized through the Xen virtual machine monitor. debian/templates/control.source.in0000664000000000000000000000110512201772203014466 0ustar Section: kernel Priority: optional Maintainer: Debian Xen Team Uploaders: Guido Trotter , Bastian Blank Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.16.0~), lsb-release, python-dev, bcc, gcc-multilib, e2fslibs-dev, iasl, ipxe-qemu, seabios, libaio-dev, libglib2.0-dev, libgnutls-dev, liblzma-dev, libncurses5-dev, libpci-dev, libyajl-dev, libssl-dev, pkg-config, uuid-dev, zlib1g-dev, ocaml-nox, dh-ocaml, ocaml-findlib Standards-Version: 3.9.4 XS-Python-Version: current debian/templates/control.hypervisor.in0000664000000000000000000000114112173476022015410 0ustar Package: xen-hypervisor-@version@@localversion@ Depends: ${misc:Depends} Provides: xen-hypervisor, xen-hypervisor-@version@, xen-hypervisor@localversion@ Recommends: xen-utils-@version@ Description: Xen Hypervisor on @class@ The hypervisor is the "core" for XEN itself. It gets booted by the boot loader and controls cpu and memory, sharing them between your administrative domain (Domain 0) and the virtual guest systems. . @desc@ . In order to boot a XEN system along with this package you also need a kernel specifically crafted to work as the Domain 0, mediating hardware access for XEN itself. debian/templates/xen-utils.lintian-overrides.in0000664000000000000000000000007611535641643017116 0ustar statically-linked-binary usr/lib/xen-@version@/boot/hvmloader debian/templates/xen-utils.postinst.in0000664000000000000000000000057411767451052015346 0ustar #!/bin/sh set -e case "$1" in configure) update-alternatives --remove xen-default /usr/lib/xen-@version@ if [ -x "/etc/init.d/xen" ]; then invoke-rc.d xen start || exit $? fi ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/templates/control.system.latest.in0000664000000000000000000000044412012256702016013 0ustar Package: xen-system@localversion@ Depends: xen-hypervisor-@version@@localversion@, xen-utils-@version@, ${misc:Depends} Provides: xen-system Description: Xen System on @class@ (meta-package) This package depends on the latest Xen hypervisor for use on @class@ and the Xen utils. . @desc@ debian/templates/xen-hypervisor.postrm.in0000664000000000000000000000055310514156522016047 0ustar #!/bin/bash set -e case "$1" in remove) if command -v update-grub > /dev/null && [ -d /boot/grub ]; then update-grub || : fi ;; purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/templates/xen-hypervisor.postinst.in0000664000000000000000000000051410514156522016403 0ustar #!/bin/bash set -e case "$1" in configure) if command -v update-grub > /dev/null && [ -d /boot/grub ]; then update-grub || : fi ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/templates/xen-utils.prerm.in0000664000000000000000000000060211767451052014600 0ustar #!/bin/bash set -e case "$1" in remove|upgrade) update-alternatives --remove xen-default /usr/lib/xen-@version@ if [ -x "/etc/init.d/xen" ]; then invoke-rc.d xen stop || exit $? fi ;; deconfigure|failed-upgrade) ;; *) echo "prerm called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/templates/control.utils.in0000664000000000000000000000062512175203560014341 0ustar Package: xen-utils-@version@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-utils-common (>= ${source:Version}) Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-@version@, qemu-system-x86 Provides: xen-utils Built-Using: ${misc:Built-Using} Description: XEN administrative tools The userspace tools to manage a system virtualized through the XEN virtual machine monitor. debian/copyright0000664000000000000000000003221111556260647011136 0ustar This work was downloaded from http://xenbits.xensource.com/ Copyright: Copyright (C) 1998-2005 Hewlett-Packard Co 1999-2006 Silicon Graphics, Inc 2001-2006 IBM Corporation 2005-2006 XenSource Inc 2006-2010 Citrix Systems Inc. and many others License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". The bundled qemu is: Copyright (C) 2007 Alexander Graf 2005,2007 Alex Beregszaszi 2005-2008 Andrzej Zaborowski 2005-2007 Anthony Liguori 2004 Antony T Curtis 2007 Arastra, Inc. 2007 Armin Kuster or 1999 AT&T Laboratories Cambridge 2006,2007 Aurelien Jarno 2007-2008 AXIS Communications AB 2007-2008 Bull S.A.S. 2006 Christian Limpach 2008 Citrix Systems, Inc. 2005-2008 CodeSourcery 2007 Dan Aloni 1995,1996 Danny Gasparovski 2000-2003 David McCullough 2008 Dmitry Baryshkov 2007-2009 Edgar E. Iglesias, Axis Communications AB. 1996-1999 Eduardo Horvath 1998,2003-2008 Fabrice Bellard 2005 Filip Navara 2006 Frederick Reeve 2009 Freescale Semiconductor 1986-2007 Free Software Foundation, Inc. 2004 Gianni Tedesco 2008 Gleb Natapov 2002 Greg Ungerer 2007-2009 Hervé Poussineau 2005,2007,2008 IBM Corporation 2008 IBM Corporation 2006 Igor Kovalenko 2006 InnoTek Systemberatung GmbH 1999-2008 Intel Corporation 2009 Isaku Yamahata 2003-2004 James Yonan 2008 Jan Kiszka 2006 Joachim Henke 2003-2007 Jocelyn Mayer 2004,2005 Johannes E. Schindelin 2005 Julian Chesterfield and Andrew Warfield. 2008 Kamala Narasimhan 1998 Kenneth Albanowski 2008 Kevin Wolf 2009 Kevin Wolf 2009 Laurent Vivier 2007-2008 Lauro Ramos Venancio 2000,2001 Lineo, by David McCullough 1991,1992,1996 Linus Torvalds 2006 Lonnie Mendez 2008 Lubomir Rintel 2004,2007 Magnus Damm 2004 Makoto Suzuki (suzu) 2002-2006 Marcel Holtmann 2006 Marius Groeger (FPU operations) 2007 Marko Kohtala 2002-2003 Maxim Krasnyansky 2008 Max Krasnyansky 2005,2008 Mike Kronenberg 2007 MontaVista Software, Inc 2007 Neocleus Corporation. 2007-2008 Nokia Corporation 2001 OKTET Ltd., St.-Petersburg, Russia 2006-2008 Openedhand Ltd. 2007-2008 OpenMoko, Inc. 1996 Paul Mackerras. 2008 Paul Mundt 2006 Pierre d'Herbemont 2000-2001 Qualcomm Incorporated 2006-2008 Qumranet Technologies 1997-1999,2001,2009 Red Hat, Inc. 1988,1989,1990,1991,1992 Richard Outerbridge 2007 Robert Reif 1998-2004 Samuel Rydh (samuel@ibrium.se) 2005 Samuel Tardieu 2007,2008 Samuel Thibault 2008 Semihalf 2008 Shin-ichiro KAWASAKI 2002 SnapGear, by Paul Dale 2006-2007 Stefan Weil 2008 Takashi YOSHII 1999,2000 Tatsuyuki Satoh , MultiArcadeMachineEmurator development 1993 Theodore Ts'o 2006,2007 Thiemo Seufer 2003 Thomas M. Ogrisegg 2006 Thomas Sailer 1998-2001,2003 Thomas Sailer (t.sailer@alumni.ethz.ch) 2006,2007 Thorsten Zitterell 2000-2007 Tibor "TS" Schütz 2008 TJ 2002-2005 Vassili Karpov (malc) 2005 Vassili Karpov (malc) 2007 Vladimir Ananiev 2006 XenSource The Debian packaging is: Copyright (C) 2008-2010 Bastian Blank you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. The following parts are subject of a different license: * tools/firmware/vgabios * tools/libaio * tools/libxen * tools/xenstat/libxenstat * tools/xenstore This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-2". Files in xen/include/public are subject to the following license: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files in extra/mini-os are subject to the following license: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files in tools/vtpm_manager are subject to the following license: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of Intel Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. File tools/python/test.py is subject to the following license: This software is Copyright (c) Zope Corporation (tm) and Contributors. All rights reserved. This license has been certified as open source. It has also been designated as GPL compatible by the Free Software Foundation (FSF). Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions in source code must retain the above copyright notice, this list of conditions, and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name Zope Corporation (tm) must not be used to endorse or promote products derived from this software without prior written permission from Zope Corporation. 4. The right to distribute this software or to use it for any purpose does not give you the right to use Servicemarks (sm) or Trademarks (tm) of Zope Corporation. Use of them is covered in a separate agreement (see http://www.zope.com/Marks). 5. If any files are modified, you must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. Disclaimer THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of contributions made by Zope Corporation and many individuals on behalf of Zope Corporation. Specific attributions are listed in the accompanying credits file. debian/xen-utils-common.postinst0000664000000000000000000000102412221316141014201 0ustar #!/bin/sh set -e case "$1" in configure) install -d -m 2750 -g adm /var/log/xen ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac dpkg-maintscript-helper mv_conffile /etc/init.d/xend /etc/init.d/xen 4.1.2-4~ -- "$@" # Somehow the private lib path which is versioned ends up in the xend # domain configs. But the tools will automatically prefix the current # tools path. /usr/lib/xen-common/bin/xend-domain-config-path-strip #DEBHELPER# exit 0 debian/xen-hypervisor-4.4.xen.cfg0000664000000000000000000000336512316303457013762 0ustar # # Uncomment the following variable and set to 0 or 1 to avoid warning. # #XEN_OVERRIDE_GRUB_DEFAULT=0 echo "Including Xen overrides from /etc/default/grub.d/xen.cfg" # # When running update-grub with the Xen hypervisor installed, there are # some additional variables that can be used to pass options to the # hypervisor or the dom0 kernel. # The following two are used to generate arguments for the hypervisor: # #GRUB_CMDLINE_XEN_DEFAULT="" #GRUB_CMDLINE_XEN="" # # For example: # # dom0_mem=[M]:max=[M] # Sets the amount of memory dom0 uses (max prevents balloning for more) # com[12]=, # Initialize a serial console from in the hypervisor (eg. 115200,8n1) # Note that com1 would be ttyS0 in Linux. # console=[, ...] # Redirects Xen hypervisor console (eg. com1,vga) # # The next two lines are used for creating kernel arguments for the dom0 # kernel. This allows to have different options for the same kernel used # natively or as dom0 kernel. # #GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT" #GRUB_CMDLINE_LINUX_XEN_REPLACE="$GRUB_CMDLINE_LINUX" # # For example: # # earlyprintk=xenboot # Allows to send early printk messages to the Xen hypervisor console # console=hvc0 # Redirects the Linux console to the hypervisor console # # Make booting into Xen the default if not changed above. Finding the # current string for it always has been a problem. # if [ "$XEN_OVERRIDE_GRUB_DEFAULT" = "" ]; then echo "WARNING: GRUB_DEFAULT changed to boot into Xen by default!" echo " Edit /etc/default/grub.d/xen.cfg to avoid this warning." XEN_OVERRIDE_GRUB_DEFAULT=1 fi if [ "$XEN_OVERRIDE_GRUB_DEFAULT" = "1" ]; then GRUB_DEFAULT="Ubuntu GNU/Linux, with Xen hypervisor" fi debian/xen-utils-common.install0000664000000000000000000000017711742263066014012 0ustar etc/xen/scripts etc/xen/xl* etc/xen/xend* lib/udev/rules.d/*.rules usr/lib/xen-common usr/sbin ../../tree/xen-utils-common/* / debian/rules0000775000000000000000000000552612173475050010264 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 include /usr/share/dpkg/default.mk SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p') VERSION_BINNMU := $(shell echo "$(DEB_VERSION)" | sed -ne 's,.*\+b\(.*\)$$,\1,p') include debian/rules.defs setup: debian/control dh_testdir $(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH) build: build-arch build-indep build-arch: setup dh_testdir $(MAKE) -f debian/rules.gen build-arch_$(DEB_HOST_ARCH) build-indep: setup dh_testdir $(MAKE) -f debian/rules.gen build-indep maintainerclean: rm -f debian/control* debian/rules.gen debian/xen-hypervisor-* debian/xen-utils-[0-9]* rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*)) clean: debian/control dh_testdir rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_xen/*.pyc dh_clean binary-indep: dh_testdir $(MAKE) -f debian/rules.gen binary-indep binary-arch: dh_testdir $(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH) binary: binary-indep binary-arch DIR_ORIG = ../orig/$(SOURCE)-$(DEB_VERSION_EPOCH_UPSTREAM) TAR_ORIG_MAIN_NAME = $(SOURCE)_$(DEB_VERSION_EPOCH_UPSTREAM).orig.tar.gz TAR_ORIG_MAIN = $(firstword $(wildcard ../$(TAR_ORIG_MAIN_NAME)) $(wildcard ../orig/$(TAR_ORIG_MAIN_NAME))) TAR_ORIG_QEMU_NAME = $(SOURCE)_$(DEB_VERSION_EPOCH_UPSTREAM).orig-qemu.tar.gz TAR_ORIG_QEMU = $(firstword $(wildcard ../$(TAR_ORIG_QEMU_NAME)) $(wildcard ../orig/$(TAR_ORIG_QEMU_NAME))) orig: $(DIR_ORIG) rsync --delete --exclude debian --exclude .svk --exclude .svn -a $(DIR_ORIG)/ . $(DIR_ORIG): ifeq ($(TAR_ORIG_MAIN),) $(error Cannot find main orig tarball $(TAR_ORIG_MAIN_NAME)) else mkdir -p ../orig tar -C ../orig -xzf $(TAR_ORIG_MAIN) endif ifeq ($(TAR_ORIG_QEMU),) $(warning Cannot find qemu orig tarball $(TAR_ORIG_QEMU_NAME)) else tar -C $@ -xzf $(TAR_ORIG_QEMU) endif CONTROL_FILES += debian/changelog debian/bin/gencontrol.py $(wildcard debian/templates/*.in) CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines) GENCONTROL = $(__MODULES_DIR)gencontrol.py debian/control debian/rules.gen: $(CONTROL_FILES) ifeq ($(wildcard debian/control.md5sum),) $(MAKE) -f debian/rules debian/control-real else ifeq ($(VERSION_BINNMU),) md5sum --check debian/control.md5sum --status || \ $(MAKE) -f debian/rules debian/control-real else grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \ $(MAKE) -f debian/rules debian/control-real endif debian/control-real: $(CONTROL_FILES) debian/bin/gencontrol.py md5sum $^ > debian/control.md5sum @echo @echo This target is made to fail intentionally, to make sure @echo that it is NEVER run during the automated build. Please @echo ignore the following error, the debian/control file has @echo been generated SUCCESSFULLY. @echo exit 1 .PHONY: clean build binary-indep binary-arch binary debian/xen-utils-common.README.Debian0000664000000000000000000000200011751503221014433 0ustar Xen for Debian ============== Config behaviour ---------------- The Debian packages changes the behaviour of some config options. The options "kernel", "initrd" and "loader" searches in the Xen private boot directory (/usr/lib/xen-$version/boot) first. "bootloader" and "device_model" also searches the Xen private bin directory (/usr/lib/xen-$version/bin). This means that the following entries will properly find anything: loader = 'hvmloader' bootloader = 'pygrub' Network setup ------------- The Debian package of Xen don't change the network setup in any way. This differs from the upstream version, which overwrites the main network card (eth0) with a bridge setup and may break the network at this point.. To setup a bridge please follow the instructions in the manpage for bridge-utils-interfaces(5). You can also change the /etc/xen/xend-config.sxp file and re-enable the Xen included network setup by adding (network-script network-bridge) to the file. But please note that this may or may not work. debian/xen-hypervisor-4.4-amd64.postinst0000664000000000000000000000051412212071167015212 0ustar #!/bin/bash set -e case "$1" in configure) if command -v update-grub > /dev/null && [ -d /boot/grub ]; then update-grub || : fi ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/xen-hypervisor-4.4-amd64.postrm0000664000000000000000000000055312212071167014656 0ustar #!/bin/bash set -e case "$1" in remove) if command -v update-grub > /dev/null && [ -d /boot/grub ]; then update-grub || : fi ;; purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/xen-utils-4.4.lintian-overrides0000664000000000000000000000007012314615614015003 0ustar statically-linked-binary usr/lib/xen-4.4/boot/hvmloader debian/xen-utils-common.xend.default0000664000000000000000000000004211711764012014705 0ustar XENCONSOLED_ARGS= XENSTORED_ARGS= debian/xen-utils-4.4.prerm0000664000000000000000000000047212321466516012503 0ustar #!/bin/bash set -e case "$1" in remove|upgrade) if [ -x "/etc/init.d/xen" ]; then invoke-rc.d xen stop || exit $? fi ;; deconfigure|failed-upgrade) ;; *) echo "prerm called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/xen-utils-common.xen.init0000664000000000000000000001163412307607107014074 0ustar #!/bin/sh ### BEGIN INIT INFO # Provides: xen xend # Required-Start: $syslog $remote_fs # Required-Stop: $syslog $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Xen daemons # Description: Xen daemons ### END INIT INFO . /lib/init/vars.sh . /lib/lsb/init-functions # Default variables XENSTORED_DIR="/var/run/xenstored" [ -r /etc/default/xen ] && . /etc/default/xen [ -r /etc/default/xend ] && . /etc/default/xend PATH=/sbin:/bin:/usr/sbin:/usr/bin DESC="Xen daemons" ROOT=$(/usr/lib/xen-common/bin/xen-dir 2>/dev/null) if [ $? -ne 0 ]; then log_warning_msg "Not running within Xen or no compatible utils" exit 0 fi TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null) if [ $? -ne 0 ]; then log_warning_msg "No usable Xen toolstack selected" exit 0 fi [ -e "$ROOT"/bin/xend ] && XEND="$ROOT"/bin/xend XENCONSOLED="$ROOT"/bin/xenconsoled XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid" XENSTORED="$ROOT"/bin/xenstored XENSTORED_PIDFILE="/var/run/xenstore.pid" modules_setup() { modprobe xenfs 2>/dev/null modprobe xen-evtchn 2>/dev/null modprobe xen-gntdev 2>/dev/null } xenfs_setup() { [ -e "/proc/xen/capabilities" ] && return 0 log_progress_msg "xenfs" [ -d "/proc/xen" ] || return 1 mount -t xenfs xenfs /proc/xen || return 1 return 0 } capability_check() { [ -e "/proc/xen/capabilities" ] || return 1 grep -q "control_d" /proc/xen/capabilities || return 1 return 0 } env_setup() { [ -d /run/xen ] && return 0 mkdir -m 700 /run/xen } xend_start() { if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then return 0 fi log_progress_msg "xend" xend_start_real return $? } xend_stop() { if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then return 0 fi log_progress_msg "xend" xend_stop_real return $? } xend_restart() { if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then return 0 fi log_progress_msg "xend" xend_stop_real case "$?" in 0|1) xend_start_real case "$?" in 0) ;; *) return 2 ;; esac ;; *) return 2 ;; esac return 0 } xend_start_real() { $XEND status && return 1 $XEND start || return 2 i=0 while [ $i -lt 10 ]; do $XEND status && return 0 || true i=$(($i + 1)) sleep 1 done return 2 } xend_stop_real() { log_progress_msg "xend" $XEND status || return 0 $XEND stop || return 1 } xenconsoled_start() { log_progress_msg "xenconsoled" xenconsoled_start_real return $? } xenconsoled_stop() { log_progress_msg "xenconsoled" xenconsoled_stop_real return $? } xenconsoled_restart() { log_progress_msg "xenconsoled" xenconsoled_stop_real case "$?" in 0|1) xenconsoled_start_real case "$?" in 0) ;; *) return 2 ;; esac ;; *) return 2 ;; esac return 0 } xenconsoled_start_real() { start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" -- \ $XENCONSOLED_ARGS --pid-file="$XENCONSOLED_PIDFILE" \ || return 2 } xenconsoled_stop_real() { start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile "$XENCONSOLED_PIDFILE" --name xenconsoled RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec "$XENCONSOLED" [ "$?" = 2 ] && return 2 rm -f $PIDFILE return "$RETVAL" } xenstored_start() { log_progress_msg "xenstored" start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" --test > /dev/null \ || return 1 [ -d "$XENSTORED_DIR" ] || mkdir -p "$XENSTORED_DIR" export XENSTORED_ROOTDIR="$XENSTORED_DIR" start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" -- \ $XENSTORED_ARGS --pid-file="$XENSTORED_PIDFILE" \ || return 2 xenstore-write "/local/domain/0/name" "Domain-0" xenstore-write "/local/domain/0/domid" "0" } case "$1" in start) log_daemon_msg "Starting $DESC" modules_setup xenfs_setup case "$?" in 0) ;; *) log_end_msg 1; exit ;; esac capability_check case "$?" in 0) ;; *) log_end_msg 255; exit ;; esac env_setup xenstored_start case "$?" in 0|1) ;; *) log_end_msg 1; exit ;; esac xenconsoled_start case "$?" in 0|1) ;; *) log_end_msg 1; exit ;; esac xend_start case "$?" in 0|1) ;; *) log_end_msg 1; exit ;; esac log_end_msg 0 ;; stop) capability_check case "$?" in 0) ;; *) exit ;; esac log_daemon_msg "Stopping $DESC" ret=0 xend_stop case "$?" in 0|1) ;; *) ret=1 ;; esac xenconsoled_stop case "$?" in 0|1) ;; *) ret=1 ;; esac log_end_msg $ret ;; restart|force-reload) capability_check case "$?" in 0) ;; *) exit ;; esac log_daemon_msg "Restarting $DESC" ret=0 xend_restart case "$?" in 0|1) ;; *) ret=1 ;; esac xenconsoled_restart case "$?" in 0|1) ;; *) ret=1 ;; esac log_end_msg $ret ;; *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2 exit 3 ;; esac exit 0 debian/changelog0000664000000000000000000020523712322726675011067 0ustar xen (4.4.0-0ubuntu5) trusty; urgency=low * Minimal changes to make arm64 build. It produces packages, whatever can be done with those is somebody elses problem. -- Stefan Bader Fri, 11 Apr 2014 15:12:47 +0200 xen (4.4.0-0ubuntu4) trusty; urgency=low * Fix up some more stale 4.3 references in xen-utils-4.4 debian packaging files. * Remove update-alternatives for postinst and prerm of xen-utils- as there is no xen-default anymore. * debian/rules.real: Add etc/default/grub.d and install xen.cfg into it. This adds a place to set Xen grub arguments and makes booting into Xen the default (with a warning message on running update-grub). * debian/rules.real, debian/xen-utils-$(VERSION).postinst, xen-sxp2xm, and xen-migrate-xend-managed-domains: Add migration scripts to the xen-utils-$(VERSION) package (LP: #1303886). * Add transitional packages for migrating xen-hypervisor-4.1-(i386|amd64) and xen-hypervisor-4.3-amd64 to add the xen-system-amd64 meta-package which is the preferred/recommeded way of installing Xen now. -- Stefan Bader Wed, 26 Mar 2014 19:25:53 +0100 xen (4.4.0-0ubuntu3) trusty; urgency=low * Fixing up changelog history and preparing for FFE (LP: #1290743). -- Stefan Bader Thu, 20 Mar 2014 12:53:21 +0100 xen (4.4.0-0ubuntu2) trusty; urgency=low * debian/patches/tools-ocaml-disable-test.patch: This disables the ocaml test build for now until linking issues are resolved. * debian/xen-utils-common.xen.init: Write domid for dom0 into xenstore (now required). -- Stefan Bader Tue, 11 Mar 2014 14:26:58 +0100 xen (4.4.0-0ubuntu1) trusty; urgency=low * New upstream release (Xen.4.4) * Refreshed patches: - debian/patches/tools-libxc-abiname.diff - debian/patches/tools-libxl-abiname.diff - debian/patches/tools-libxl-prefix.diff * debian/rules.real: Force xend to be built. * debian/rules.real: For utils_ installation move binaries from usr/sbin/ to usr/lib/xen-/bin. Several that used to go into the private bin directory moved to the public sbin directory. Not ideal but quicker to do without side-effects. * debian/rules.real: Hypervisor has no .gz type on armhf. * debian/control, debian/rules.gen: Manually update version from 4.3 to 4.4. * debian/control: Add build dependency for libfdt-dev on armhf. * debian/control: Only depend on qemu-system-x86 for i386 and amd64 builds. * debian/*: Also rename several versioned packaging files. * debian/tree/xen-utils-common/usr/share/xen-utils-common/default.xen: Add comment about toolstack names and make xl the default. -- Stefan Bader Tue, 11 Mar 2014 09:54:35 +0100 xen (4.3.0-1ubuntu5) trusty; urgency=low * Applying Xen Security Advisories: - CVE-2014-1642 / XSA-83 * x86/irq: avoid use-after-free on error path in pirq_guest_bind() - CVE-2014-1891 / XSA-84 * flask: fix reading strings from guest memory - CVE-2014-1895 / XSA-85 * xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check - CVE-2014-1896 / XSA-86 * libvchan: Fix handling of invalid ring buffer indices - CVE-2014-1666 / XSA-87 * x86: PHYSDEVOP_{prepare,release}_msix are privileged - CVE-2014-1950 / XSA-88 * libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() -- Stefan Bader Mon, 17 Feb 2014 13:54:15 +0100 xen (4.3.0-1ubuntu4) trusty; urgency=medium * Rebuild for ocaml-4.01. -- Matthias Klose Mon, 23 Dec 2013 16:18:35 +0000 xen (4.3.0-1ubuntu3) trusty; urgency=low * Applying Xen Security Advisories: - CVE-2013-4553 / XSA-74 * Lock order reversal between page_alloc_lock and mm_rwlock - CVE-2013-4551 / XSA-75 * Host crash due to guest VMX instruction execution - CVE-2013-4554 / XSA-76 * Hypercalls exposed to privilege rings 1 and 2 of HVM guests - CVE-????-???? / XSA-77 * Disaggregated domain management security status - CVE-2013-6375 / XSA-78 * Insufficient TLB flushing in VT-d (iommu) code - CVE-2013-6400 / XSA-80 * IOMMU TLB flushing may be inadvertently suppressed - CVE-2013-6885 / XSA-82 * Guest triggerable AMD CPU erratum may cause host hang -- Stefan Bader Fri, 06 Dec 2013 17:51:24 +0100 xen (4.3.0-1ubuntu2) trusty; urgency=low * Applying Xen Security Advisories: - CVE-2013-1442 / XSA-62 * Information leak on AVX and/or LWP capable CPUs - CVE-2013-4355 / XSA-63 * Information leaks through I/O instruction emulation - CVE-2013-4356 / XSA-64 * Memory accessible by 64-bit PV guests under live migration - CVE-2013-4361 / XSA-66 Information leak through fbld instruction emulation - CVE-2013-4368 / XSA-67 * Information leak through outs instruction emulation - CVE-2013-4369 / XSA-68 * possible null dereference when parsing vif ratelimiting info - CVE-2013-4370 / XSA-69 * misplaced free in ocaml xc_vcpu_getaffinity stub - CVE-2013-4371 / XSA-70 * use-after-free in libxl_list_cpupool under memory pressure - CVE-2013-4416 / XSA-72 * ocaml xenstored mishandles oversized message replies - CVE-2013-4494 / XSA-73 * Lock order reversal between page allocation and grant table locks -- Stefan Bader Tue, 05 Nov 2013 16:16:05 +0100 xen (4.3.0-1ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - Add armhf to packages (except ocaml related) and create hypervisor and system-meta package. Modify build environment to produce Arm packages. * debian/control * debian/rules.gen * debian/rules.real * debian/patches/ubuntu-tools-armhf-without-ocaml.patch Ocaml source fail to build on Arm. - Re-introduce xen-hypervisor-amd64 for i386 builds. Otherwise i386 would be rendered uninstallable. * debian/arch/i386/defines * debian/control - Keep qemu-dm for now (upstream qemu would not support migration, yet). Forward-port some patches from the old Debian package which still included qemu-dm: * debian/patches/qemu-prefix.diff Modify LDFLAGS to point to lib dir for qemu-dm. * debian/patches/qemu-disable-blktap.diff Blktap never went upstream. * debian/patches/ubuntu-qemu-disable-qemu-upstream.diff We want to use the binary from qemu-system-x86. * debian/patches/ubuntu-qemu-upstream-location.patch Modify tools to look for qemu-system-i386 in public path. - Fixup hvmloader build to find the correct PXE boot roms. * ubuntu-tools-firmware-etherboot-kvm-ipxe.diff - Add packaging dependency on libxenstore to libxen (otherwise libtool fails to find references for libxenlight). * debian/rules.real - Add migration helper that removes private paths from xend domain configs. * debian/scripts/Makefile * debian/scripts/xend-domain-config-path-strip * debian/xen-utils-common.postinst - Fix for using ulong instead of unsigned long in gdbsx. * debian/patches/toolchain.diff * First test for suitable toolstack in xendomains before using the list command as that causes the xapi daemon to hang. - debian/xen-utils-common.xendomains.init -- Stefan Bader Fri, 27 Sep 2013 15:12:17 +0200 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 Thu, 05 Sep 2013 13:54:03 +0200 xen (4.3.0-0ubuntu4) saucy; urgency=low * Re-introduce xen-hypervisor-amd64 for i386 builds. Otherwise i386 would be rendered uninstallable. -- Stefan Bader Thu, 19 Sep 2013 15:28:06 -0500 xen (4.3.0-0ubuntu3) saucy; urgency=low * Avoid building libxenlight with blktap support (at least for now). - ubuntu-tools-force-build-without-blktap2.patch - debian/rules.real: Do not install libblktapctl - debian/libxen-dev.install: Do not package libblktapctl -- Stefan Bader Thu, 15 Aug 2013 10:07:46 +0200 xen (4.3.0-0ubuntu2) saucy; urgency=low * debian/rules.real: Avoid ocaml install and trying to strip hvmload which does not exist on Arm. * debian/rules.gen: Remove i386 related rules for arch-flavour which would try to build the hypervisor (not supported anymore). * debian/rules.gen: Add rules for armhf builds. * debian/control: Add armhf to packages (except ocaml related) and create hypervisor and system-meta package. -- Stefan Bader Sat, 03 Aug 2013 10:23:42 +0100 xen (4.3.0-0ubuntu1) saucy; urgency=low * debian/rules.real: Drop installing pdf for docs. Upstream dropped the xen-abi documentation. * debian/rules.real: Add --prefix=/usr to configure calls. (Default prefix is now /usr/local) * debian/rules -> debian/rules.real: Move modification of LDFLAGS as the latter does the compile and since 4.2.2 includes default.mk which would set the values back (either to the gcc version or to nothing). * debian/rules.real: Hack around checks for wget which the Debian build does not allow to use. * debian/control: Drop i386 versions of xen-hypervisor and xen-system. Upstream dropped i386 support for those. * debian/control: Add recommends for qemu-system-x86 to xen-utils-4.3. Utils (xl stack) will use the generic qemu-system-i386 when being told to use qemu-xen and qemu-dm for qemu-xen-traditional. * xen-utils-common.xen.init: Create /var/run/xen if not present on startup (this directory is used by libxl for qmp sockets). * Add support to allow libvirt to build the libxl driver: - tools/libxl: Create versioned variants of libxenlight.so and libblktapctl.so - debian/rules.real: Add packaging dependency on libxenstore to libxen (otherwise libtool fails to find references). - debian/libxen-dev.install: Package headers and library files of libxenlight. * Carried over from previous versions: - Keep qemu-dm for now (upstream qemu would not support migration, yet). Forward-port some patches from the old Debian package which still included qemu-dm: - qemu-prefix (modify LDFLAGS to point to lib dir for qemu-dm) - qemu-disable-blktap (this is not present in upstream) - ubuntu-qemu-disable-qemu-upstream (breaks build and also should be provided by qemu/kvm package) -- Stefan Bader Tue, 25 Jun 2013 16:39:42 +0200 xen (4.2.2-1ubuntu1) saucy; urgency=low * Merge with Debian unstable. Dropping the following patches in favour of Debian ones: - xsa52-4.2-unstable.patch - xsa53-4.2.patch - xsa54.patch - xsa56.patch * Remaining changes: - Use dpkg-buildflags and strip the gcc prefix for getting LDFLAGS. This will again use the Ubuntu specific LDFLAGS (using some hardening options). Older releases would always pass those options in the environment but that changed. - Ressurrect qemu-dm for now (upstream qemu would not support migration, yet). Forward-port some patches from the old Debian package which still included qemu-dm: - qemu-prefix (modify LDFLAGS to point to lib dir for qemu-dm) - qemu-disable-blktap (this is not present in upstream) - ubuntu-qemu-disable-qemu-upstream (breaks build and also should be provided by qemu/kvm package) * Remaining additional patches: - qemu-fix-librt-test.patch Fix build regression caused by glibc not requiring to link against librt for the clock_gettime function. Patch picked from xen-devel mailing list. - tools-gdbsx-fix-build-failure-with-glibc-2.17.patch Add direct include to sys/types.h for xg_main.c which likely was indirectly done before. Needed to get ulong type definition. - tools-ocaml-fix-build: refresh and reenable (and fix the description of) this patch. Without it the ocam native libraries (*.cmxa) build in /build local paths rather than appropriatly versioned library references. - APIC Register Virtualization (backported from Xen 4.3) - 0001-xen-enable-APIC-Register-Virtualization.patch - 0002-xen-enable-Virtual-interrupt-delivery.patch - 0003-xen-add-virtual-x2apic-support-for-apicv.patch - TSC Adjust Support (backported from Xen 4.3) - 0004-x86-Implement-TSC-adjust-feature-for-HVM-guest.patch - 0005-x86-Save-restore-TSC-adjust-during-HVM-guest-migrati.patch - 0006-x86-Expose-TSC-adjust-to-HVM-guest.patch - Fix FTBS on i386 - 0007-x86-Fix-i386-virtual-apic.patch - silence-gcc-warnings.patch: Silence gcc warnings. -- Stefan Bader Wed, 17 Jul 2013 09:41:37 +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 Thu, 11 Jul 2013 00:28:24 +0200 xen (4.2.1-2ubuntu2) saucy; urgency=low * Applying Xen Security Advisories: - CVE-2013-2194, CVE-2013-2195, CVE-2013-2196 / XSA55 * libelf: abolish libelf-relocate.c * libxc: introduce xc_dom_seg_to_ptr_pages * libxc: Fix range checking in xc_dom_pfn_to_ptr etc. * libelf: add `struct elf_binary*' parameter to elf_load_image * libelf: abolish elf_sval and elf_access_signed * libelf: move include of to top of file * libelf/xc_dom_load_elf_symtab: Do not use "syms" uninitialised * libelf: introduce macros for memory access and pointer handling * tools/xcutils/readnotes: adjust print_l1_mfn_valid_note * libelf: check nul-terminated strings properly * libelf: check all pointer accesses * libelf: Check pointer references in elf_is_elfbinary * libelf: Make all callers call elf_check_broken * libelf: use C99 bool for booleans * libelf: use only unsigned integers * libelf: check loops for running away * libelf: abolish obsolete macros * libxc: Add range checking to xc_dom_binloader * libxc: check failure of xc_dom_*_to_ptr, xc_map_foreign_range * libxc: check return values from malloc * libxc: range checks in xc_dom_p2m_host and _guest * libxc: check blob size before proceeding in xc_dom_check_gzip * libxc: Better range check in xc_dom_alloc_segment - CVE-XXXX-XXXX / XSA57 * libxl: Restrict permissions on PV console device xenstore nodes -- Stefan Bader Fri, 21 Jun 2013 14:23:14 +0200 xen (4.2.1-2ubuntu1) saucy; urgency=low * Merge with Debian unstable. Dropping the following patches in favour of Debian ones: - xsa33-4.2-unstable.patch - xsa36-4.2.patch - xsa44-4.2.patch - xsa45-4.2-01-vcpu-destroy-pagetables-preemptible.patch - xsa45-4.2-02-new-guest-cr3-preemptible.patch - xsa45-4.2-03-new-user-base-preemptible.patch - xsa45-4.2-04-vcpu-reset-preemptible.patch - xsa45-4.2-05-set-info-guest-preemptible.patch - xsa45-4.2-06-unpin-preemptible.patch - xsa45-4.2-07-mm-error-paths-preemptible.patch - xsa46-4.2.patch - xsa47-4.2-unstable.patch - xsa49-4.2.patch * Remaining changes: - debian/control: Depend on libssl-dev - Use dpkg-buildflags and strip the gcc prefix for getting LDFLAGS. This will again use the Ubuntu specific LDFLAGS (using some hardening options). Older releases would always pass those options in the environment but that changed. - Ressurrect qemu-dm for now (upstream qemu would not support migration, yet). Forward-port some patches from the old Debian package which still included qemu-dm: - qemu-prefix (modify LDFLAGS to point to lib dir for qemu-dm) - qemu-disable-blktap (this is not present in upstream) - ubuntu-qemu-disable-qemu-upstream (breaks build and also should be provided by qemu/kvm package) * Remaining additional patches: - qemu-cve-2012-6075-1.patch / qemu-cve-2012-6075-2.patch - xsa34-4.2.patch - xsa35-4.2-with-xsa34.patch - xsa38.patch - xsa52-4.2-unstable.patch - xsa53-4.2.patch - xsa54.patch - xsa56.patch - qemu-fix-librt-test.patch Fix build regression caused by glibc not requiring to link against librt for the clock_gettime function. Patch picked from xen-devel mailing list. - tools-gdbsx-fix-build-failure-with-glibc-2.17.patch Add direct include to sys/types.h for xg_main.c which likely was indirectly done before. Needed to get ulong type definition. - tools-ocaml-fix-build: refresh and reenable (and fix the description of) this patch. Without it the ocam native libraries (*.cmxa) build in /build local paths rather than appropriatly versioned library references. - APIC Register Virtualization (backported from Xen 4.3) - 0001-xen-enable-APIC-Register-Virtualization.patch - 0002-xen-enable-Virtual-interrupt-delivery.patch - 0003-xen-add-virtual-x2apic-support-for-apicv.patch - TSC Adjust Support (backported from Xen 4.3) - 0004-x86-Implement-TSC-adjust-feature-for-HVM-guest.patch - 0005-x86-Save-restore-TSC-adjust-during-HVM-guest-migrati.patch - 0006-x86-Expose-TSC-adjust-to-HVM-guest.patch - Fix FTBS on i386 - 0007-x86-Fix-i386-virtual-apic.patch - Fix HVM regression when host supports SMEP - 0008-vmx-Simplify-cr0-update-handling-by-deferring-cr4-ch.patch - 0009-VMX-disable-SMEP-feature-when-guest-is-in-non-paging.patch - 0010-VMX-Always-disable-SMEP-when-guest-is-in-non-paging-.patch - silence-gcc-warnings.patch: Silence gcc warnings. - gcc48-ftbfs.patch - gcc48-ftbfs-2.patch -- Stefan Bader Fri, 14 Jun 2013 10:01:32 +0200 xen (4.2.1-2) unstable; urgency=low * Actually upload to unstable. -- Bastian Blank 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 Sat, 11 May 2013 23:55:46 +0200 xen (4.2.1-0ubuntu4) saucy; urgency=low [ Stefan Bader ] * Applying Xen Security Advisories: - CVE-2013-1918 / XSA-45 * x86: make vcpu_destroy_pagetables() preemptible * x86: make new_guest_cr3() preemptible * x86: make MMUEXT_NEW_USER_BASEPTR preemptible * x86: make vcpu_reset() preemptible * x86: make arch_set_info_guest() preemptible * x86: make page table unpinning preemptible * x86: make page table handling error paths preemptible - CVE-2013-1952 / XSA-49 * VT-d: don't permit SVT_NO_VERIFY entries for known device types - CVE-2013-2076 / XSA-52 * x86/xsave: fix information leak on AMD CPUs - CVE-2013-2077 / XSA-53 * x86/xsave: recover from faults on XRSTOR - CVE-2013-2078 / XSA-54 * x86/xsave: properly check guest input to XSETBV - CVE-2013-2072 / XSA-56 * libxc: limit cpu values when setting vcpu affinity [ Marc Deslauriers ] * debian/patches/gcc48-ftbfs.patch: Add -Wno-unused-local-typedefs to CFLAGS. * debian/patches/gcc48-ftbfs-2.patch: fix memset(&p,0,sizeof(p)) idiom in several places. -- Marc Deslauriers Mon, 10 Jun 2013 15:03:13 -0400 xen (4.2.1-0ubuntu3.1) raring-security; urgency=low * Applying Xen Security Advisories: - CVE-2013-1917 / XSA-44 x86: clear EFLAGS.NT in SYSENTER entry path - CVE-2013-1919 / XSA-46 x86: fix various issues with handling guest IRQs - CVE-2013-1920 / XSA-47 defer event channel bucket pointer store until after XSM checks -- Stefan Bader Wed, 10 Apr 2013 14:21:15 +0200 xen (4.2.1-0ubuntu3) raring; urgency=low * Fix FTBS on i386 - 0007-x86-Fix-i386-virtual-apic.patch * Fix HVM VCPUs getting stuck on boot when host supports SMEP (LP: #1157757) - 0008-vmx-Simplify-cr0-update-handling-by-deferring-cr4-ch.patch - 0009-VMX-disable-SMEP-feature-when-guest-is-in-non-paging.patch - 0010-VMX-Always-disable-SMEP-when-guest-is-in-non-paging-.patch -- Stefan Bader Fri, 05 Apr 2013 16:39:45 +0200 xen (4.2.1-0ubuntu2) raring; urgency=low * Backporting support for Intel APIC virtualization (LP: #1160373) - 0001-xen-enable-APIC-Register-Virtualization.patch - 0002-xen-enable-Virtual-interrupt-delivery.patch - 0003-xen-add-virtual-x2apic-support-for-apicv.patch * Backporting support for Intel TSC adjust (LP: #1160378) - 0004-x86-Implement-TSC-adjust-feature-for-HVM-guest.patch - 0005-x86-Save-restore-TSC-adjust-during-HVM-guest-migrati.patch - 0006-x86-Expose-TSC-adjust-to-HVM-guest.patch -- Stefan Bader Tue, 26 Mar 2013 09:41:25 +0100 xen (4.2.1-0ubuntu1) raring; urgency=low * New upstream stable release. Remaining changes: - Fix to qemu for CVE-2012-6075 - Patches for XSA33-36 and 38 - qemu-fix-librt-test.patch Fix build regression caused by glibc not requiring to link against librt for the clock_gettime function. Patch picked from xen-devel mailing list. - tools-gdbsx-fix-build-failure-with-glibc-2.17.patch Add direct include to sys/types.h for xg_main.c which likely was indirectly done before. Needed to get ulong type definition. - tools-ocaml-fix-build: refresh and reenable (and fix the description of) this patch. Without it the ocam native libraries (*.cmxa) build in /build local paths rather than appropriatly versioned library references. - Use dpkg-buildflags and strip the gcc prefix for getting LDFLAGS. This will again use the Ubuntu specific LDFLAGS (using some hardening options). Older releases would always pass those options in the environment but that changed. - Ressurrect qemu-dm for now (upstream qemu would not support migration, yet). Forward-port some patches from the old Debian package which still included qemu-dm: - qemu-prefix (modify LDFLAGS to point to lib dir for qemu-dm) - qemu-disable-blktap (this is not present in upstream) - ubuntu-qemu-disable-qemu-upstream (breaks build and also should be provided by qemu/kvm package) - Build depend on kvm-ipxe (instead of ipxe) as it is smaller and fix up hvmloader build. kvm-ipxe contains a subset of the rom files from which the Xen build only uses two to be embedded in the hvmloader. - debian/patches/silence-gcc-warnings.patch: Silence gcc warnings. -- Stefan Bader Fri, 08 Mar 2013 10:34:54 +0100 xen (4.2.0-2) experimental; urgency=low * Support JSON output in domain init script helper. -- Bastian Blank Mon, 01 Oct 2012 15:11:30 +0200 xen (4.2.0-1ubuntu6) raring; urgency=low * Applying Xen Security Advisory: - VT-d: fix interrupt remapping source validation for devices behind legacy bridges CVE-2012-5634 / XSA-33 - x86_32: don't allow use of nested HVM CVE-2013-0151 / XSA-34 - xen: Do not allow guests to enable nested HVM on themselves CVE-2013-0152 / XSA-35 - ACPI: acpi_table_parse() should return handler's error code CVE-2013-0153 / XSA-36 - oxenstored incorrect handling of certain Xenbus ring states CVE-2013-0215 / XSA-38 * Applying qemu security fixes: - e1000: Discard packets that are too long if !SBP and !LPE CVE-2012-6075 / XSA-41 - Discard packets longer than 16384 when !SBP to match the hardware behavior. CVE-2012-6075 / XSA-41 * qemu-fix-librt-test.patch Fix build regression caused by glibc not requiring to link against librt for the clock_gettime function. Patch picked from xen-devel mailing list. * tools-gdbsx-fix-build-failure-with-glibc-2.17.patch Add direct include to sys/types.h for xg_main.c which likely was indirectly done before. Needed to get ulong type definition. -- Stefan Bader Tue, 29 Jan 2013 15:48:47 +0100 xen (4.2.0-1ubuntu5) raring; urgency=low * Add libssl-dev to Build-Depends. -- Chris J Arges Tue, 15 Jan 2013 11:13:48 -0600 xen (4.2.0-1ubuntu4) raring; urgency=low * Applying Xen Security fixes (LP: #1086875) - gnttab: fix releasing of memory upon switches between versions CVE-2012-5510 - hvm: Limit the size of large HVM op batches CVE-2012-5511 - xen: add missing guest address range checks to XENMEM_exchange handlers CVE-2012-5513 - xen: fix error handling of guest_physmap_mark_populate_on_demand() CVE-2012-5514 - memop: limit guest specified extent order CVE-2012-5515 - x86: get_page_from_gfn() must return NULL for invalid GFNs CVE-2012-5525 -- Stefan Bader Wed, 05 Dec 2012 18:13:25 +0100 xen (4.2.0-1ubuntu3) raring; urgency=low * tools-ocaml-fix-build: refresh and reenable (and fix the description of) this patch. Without it the ocam native libraries (*.cmxa) build in /build local paths rather than appropriatly versioned library references. -- Andy Whitcroft Thu, 29 Nov 2012 21:49:00 +0000 xen (4.2.0-1ubuntu2) raring; urgency=low * Drop replaces and conflicts for xen3 packages (they are no longer in the upgrade path) from debian/control: - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3 - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-3.3 * Use dpkg-buildflags and strip the gcc prefix for getting LDFLAGS. This will again use the Ubuntu specific LDFLAGS (using some hardening options). Older releases would always pass those options in the environment but that changed. * Ressurrect qemu-dm for now (upstream qemu would not support migration, yet). Forward-port some patches from the old Debian package which still included qemu-dm: - qemu-prefix (modify LDFLAGS to point to lib dir for qemu-dm) - qemu-disable-blktap (this is not present in upstream) - ubuntu-qemu-disable-qemu-upstream (breaks build and also should be provided by qemu/kvm package) * Build depend on kvm-ipxe (instead of ipxe) as it is smaller and fix up hvmloader build. kvm-ipxe contains a subset of the rom files from which the Xen build only uses two to be embedded in the hvmloader. * XSA-20: Prevent overflow in calculations, leading to DoS vulnerability - CVE-2012-4535 * XSA-22: Prevent incorrect updates of m2p mappings - CVE-2012-4537 * XSA-23: check toplevel pagetables are present before unhooking them - CVE-2012-4538 * XSA-24: Prevent infinite loop in compat code - CVE-2012-4539 * XSA-25: limit maximum size of kernel/ramdisk - CVE-2012-4544 -- Stefan Bader Tue, 13 Nov 2012 09:03:58 +0100 xen (4.2.0-1ubuntu1) raring; urgency=low * Merge from Debian Experimental, Remaining changes: - debian/control: - Build depends on ipxe-qemu. - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3 - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-4.1. - Make sure the LDFLAGS value passed is suitable for use by ld rather than gcc. - disable debian/patches/config-etherboot.diff. - debian/patches/silence-gcc-warnings.patch: Silence gcc warnings. -- Chuck Short Thu, 08 Nov 2012 12:14:30 -0600 xen (4.2.0-1) experimental; urgency=low * New upstream release. -- Bastian Blank Tue, 18 Sep 2012 13:54:30 +0200 xen (4.2.0~rc3-1) experimental; urgency=low * New upstream snapshot. -- Bastian Blank 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 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 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 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 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 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 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 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 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 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 Tue, 20 Nov 2012 15:51:01 +0100 xen (4.1.3-3ubuntu1) quantal; urgency=low * Merge from Debian unstable. Remaining changes: - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3. - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-4.1. - Change depend back to ipxe as we do not have ipxe-qemu. - etherboot: Change the config back to include the 8086100e.rom - Dropped: - Make sure the LDFLAGS value passed is suitable for use by ld rather than gcc. Right now there seem to be no LDFLAGS passed. * Backported AMD specific improvements from upstream Xen (LP: #1009098): - svm: Do not intercept RDTSC(P) when TSC scaling is supported by hardware - x86: Use deep C states for off-lined CPUs - x86/AMD: Add support for AMD's OSVW feature in guests. - hvm: vpmu: Enable HVM VPMU for AMD Family 12h and 14h processors -- Stefan Bader Thu, 27 Sep 2012 21:27:44 +0200 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 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 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 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 Sat, 28 Jul 2012 10:23:26 +0200 xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-4ubuntu1) quantal; urgency=low [ Ubuntu Merge-o-Matic ] * Merge from Debian unstable. Remaining changes: - Thanks to Stefan Bader. - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3. - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-4.1. - Change depend back to ipxe as we do not have ipxe-qemu. - etherboot: Change the config back to include the 8086100e.rom - Dropped: - Make sure the LDFLAGS value passed is suitable for use by ld rather than gcc. Right now there seem to be no LDFLAGS passed. -- Chuck Short Tue, 03 Jul 2012 08:43:03 -0400 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 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 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 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 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 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 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 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 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 Wed, 01 Feb 2012 19:28:28 +0100 xen (4.1.2-2ubuntu2) precise; urgency=low * etherboot: Change the config back to include the 8086100e.rom (LP: #948333) -- Stefan Bader Tue, 06 Mar 2012 20:58:14 +0100 xen (4.1.2-2ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3. - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-4.1. - Make sure the LDFLAGS value passed is suitable for use by ld rather than gcc. - Dropped: - debian/patches/upstream-23044:d4ca456c0c25 - debian/patches/upstream-23104:1976adbf2b80 - debian/patches/upstream-changeset-23146.patch - debian/patches/upstream-changeset-23147.patch - debian/patches/xen-pirq-resubmit-irq.patch -- Chuck Short Thu, 22 Dec 2011 04:53:35 +0000 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 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 Sat, 26 Nov 2011 18:28:06 +0100 xen (4.1.1-3ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3. - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-4.1. - Make sure the LDFLAGS value passed is suitable for use by ld rather than gcc. - debian/patches/upstream-changeset-23146.patch, debian/patches/upstream-changeset-23147.patch: Fix booting with hvm domU. (LP: #832207) - debian/patches/xen-pirq-resubmit-irq.patch: Retrigger pirq events when asserted while processing. (LP: #854829) -- Chuck Short Sun, 06 Nov 2011 05:51:08 +0000 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 Wed, 26 Oct 2011 14:42:33 +0200 xen (4.1.1-2ubuntu4.1) oneiric-proposed; urgency=low * debian/patches/xen-pirq-resubmit-irq.patch: Retrigger pirq events when asserted while processing. Thanks to Stefan Bader (LP: #854829) -- Chuck Short Mon, 10 Oct 2011 19:30:09 -0400 xen (4.1.1-2ubuntu4) oneiric; urgency=low * Rebuild to drop build records on armel and powerpc. LP: #823714. -- Matthias Klose Thu, 06 Oct 2011 14:15:35 +0200 xen (4.1.1-2ubuntu2) oneiric; urgency=low * Clean up patches. * debian/patches/upstream-changeset-23146.patch, debian/patches/upstream-changeset-23147.patch: Fix booting with hvm domU. (LP: #832207) -- Chuck Short Thu, 01 Sep 2011 13:13:47 -0400 xen (4.1.1-2ubuntu1) oneiric; urgency=low * Merge from debian unstable. Remaining changes: - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3. - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-4.1. + Make sure the LDFLAGS value passed is suitable for use by ld rather than gcc. -- Chuck Short Thu, 11 Aug 2011 14:18:41 +0000 xen (4.1.1-2) unstable; urgency=low * Fix hvmloader with gcc 4.6. -- Bastian Blank Fri, 05 Aug 2011 23:58:36 +0200 xen (4.1.1-1ubuntu1) oneiric; urgency=low * Merge from debian unstable. Remaining changes: + Xen 3.3 -> Xen 4.1 migration: - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-utils: Conflict and replaces libxen3. - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3, and xen-utils-4.1. + Make sure the LDFLAGS value passed is suitable for use by ld rather than gcc. + Dropped upstream patches: - debian/patches/disable-unused-but-not-set-error.patch: Applied upstream. - debian/patches/xc-dom-restore-set-but-not-used.patch: Applied upstream. - debian/patches/xc-dom-restore-set-but-not-used.patch: Applied upstream. -- Chuck Short Tue, 19 Jul 2011 00:11:08 +0000 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 Mon, 18 Jul 2011 19:38:38 +0200 xen (4.1.0-3ubuntu4) oneiric; urgency=low * Fix xen 3.3 -> xen 4.1 migration. -- Chuck Short Sat, 04 Jun 2011 15:37:17 -0400 xen (4.1.0-3ubuntu3) oneiric; urgency=low * debian/control: Use python2.7 as a build dependency. -- Chuck Short Tue, 31 May 2011 14:50:03 -0400 xen (4.1.0-3ubuntu2) oneiric; urgency=low * debian/control: + Move to python 2.7. + Xen 3.3 -> Xen4.1 migration: - libxenstore3.0: Conflict and replaces libxen3. - libxen-dev: Conflict and replaces libxen3-dev. - xenstore-tuils: Conflict and replaces libxen3 - xen-utils-4.1: Confflict and replaces libxen3, python-xen3.3, and xen-utils-3.3 -- Chuck Short Tue, 31 May 2011 13:15:08 -0400 xen (4.1.0-3ubuntu1) oneiric; urgency=low * Make sure the LDFLAGS value passed is suitable for use by ld, rather than gcc. * Import a set of gcc 4.6 related build fixes from upstream hg. (disable-unused-but-not-set-error.patch, ioapic-uninitialised-variables.patch, patches/xc-dom-restore-set-but-not-used.patch, xc-tmem-set-but-not-used.patch) -- Soren Hansen Thu, 26 May 2011 14:27:18 +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 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 Fri, 15 Apr 2011 11:38:25 +0200 xen (4.1.0-1) unstable; urgency=low * New upstream release. -- Bastian Blank 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 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 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 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 Tue, 17 Aug 2010 23:15:34 +0200 xen (4.0.1~rc5-1) unstable; urgency=low * New upstream release candidate. -- Bastian Blank 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 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 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 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 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 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 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 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 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 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 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 Mon, 16 Nov 2009 20:57:07 +0100 xen-3 (3.4.1-1) unstable; urgency=low * New upstream version. -- Bastian Blank 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 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 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 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 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 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 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 Tue, 12 Feb 2008 12:40:56 +0000 xen-3 (3.2.0-2) unstable; urgency=low * Fix broken patch. (closes: #462522) -- Bastian Blank 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 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 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 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 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 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 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 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 Thu, 2 Nov 2006 16:38:02 +0000 xen-3.0 (3.0.3-0-1) unstable; urgency=low * New upstream version. -- Bastian Blank 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 18 Mar 2005 12:43:50 -0600 xen (2.0.5-2) experimental; urgency=low * Mike McCallister , Tommi Virtanen , Tom Hibbert : Fix missing '.' in update-rc.d call in xen.postinst. Closes: #299384 -- Adam Heath 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 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 . -- Adam Heath 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 . -- Adam Heath 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 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 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 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 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 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 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 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 Thu, 04 Mar 2004 12:47:47 -0600 xen (1.2-1) unstable; urgency=low * Initial version. -- Adam Heath Tue, 02 Mar 2004 13:21:52 -0600