diff -Nru xen-4.3.0/debian/arch/i386/defines xen-4.3.0/debian/arch/i386/defines --- xen-4.3.0/debian/arch/i386/defines 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/arch/i386/defines 2013-09-27 16:21:35.000000000 +0100 @@ -1,14 +1,3 @@ [base] flavours: - amd64 - i386 xen-arch: x86_32 - -[amd64_description] -hardware: AMD64 - -[amd64_base] -xen-arch: x86_64 - -[i386_description] -hardware: i386 diff -Nru xen-4.3.0/debian/changelog xen-4.3.0/debian/changelog --- xen-4.3.0/debian/changelog 2013-09-19 21:29:45.000000000 +0100 +++ xen-4.3.0/debian/changelog 2013-10-01 10:43:10.000000000 +0100 @@ -1,3 +1,69 @@ +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 diff -Nru xen-4.3.0/debian/control xen-4.3.0/debian/control --- xen-4.3.0/debian/control 2013-09-19 23:31:28.000000000 +0100 +++ xen-4.3.0/debian/control 2013-09-27 14:33:45.000000000 +0100 @@ -4,20 +4,10 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Xen Team Uploaders: Guido Trotter , Bastian Blank -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 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 -Build-Depends-Indep: graphviz, ghostscript, texlive-fonts-recommended, texlive-font-utils, texlive-latex-recommended XS-Python-Version: current -Package: xen-docs-4.3 -Architecture: all -Section: doc -Depends: ${misc:Depends} -Description: Documentation for Xen - This package contains all the large documentation files for Xen. This - includes a description interface (both the API, and a nice explanation of - how XEN works). - Package: libxen-4.3 Architecture: amd64 i386 armhf Section: libs @@ -77,8 +67,7 @@ Architecture: amd64 i386 armhf Provides: xen-utils Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-utils-common (>= ${source:Version}) -Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-4.3, qemu-keymaps, qemu-utils, qemu-system-x86 -Suggests: xen-docs-4.3 +Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-4.3, qemu-system-x86 Description: XEN administrative tools The userspace tools to manage a system virtualized through the XEN virtual machine monitor. @@ -89,7 +78,6 @@ Provides: xen-hypervisor, xen-hypervisor-4.3, xen-hypervisor-amd64 Depends: ${misc:Depends} Recommends: xen-utils-4.3 -Suggests: xen-docs-4.3 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 @@ -107,13 +95,11 @@ This package depends on the latest Xen hypervisor for use on AMD64 and the Xen utils. - Package: xen-hypervisor-4.3-armhf Architecture: armhf Provides: xen-hypervisor, xen-hypervisor-4.3, xen-hypervisor-armhf Depends: ${misc:Depends} Recommends: xen-utils-4.3 -Suggests: xen-docs-4.3 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 @@ -130,4 +116,3 @@ 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. - diff -Nru xen-4.3.0/debian/control.md5sum xen-4.3.0/debian/control.md5sum --- xen-4.3.0/debian/control.md5sum 2013-07-17 14:08:44.000000000 +0100 +++ xen-4.3.0/debian/control.md5sum 2013-09-27 16:21:53.000000000 +0100 @@ -1,10 +1,10 @@ -7e72ba05972200e16b9c4d5fa8597ffb debian/changelog +ac0eaaff8a41be34286540b920471a29 debian/changelog c379f09bde66561f34d361dd9f89e345 debian/bin/gencontrol.py -667edd28bcda9cd243bb69c78e452aad debian/templates/control.hypervisor.in -4106f2621fc4dad25c0d6569b51cbce3 debian/templates/control.main.in -11147464711eedca0cd3908109a4a3f4 debian/templates/control.source.in +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 -d8a4fc67d96fd893d002d956dcf8c220 debian/templates/control.utils.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 @@ -12,4 +12,4 @@ b6acd21c3924e6ec6f9c547afbbc7d9e debian/templates/xen-utils.prerm.in 2f0cc6973a228e4002e5b89f756e3d58 debian/arch/defines 7eec83f6c765a660ebaeb80dc4b433ad debian/arch/amd64/defines -5441af74c3b47034f0efb0226b9c3723 debian/arch/i386/defines +ea4d950fe2490d8a019d069852c8ffd3 debian/arch/i386/defines diff -Nru xen-4.3.0/debian/libxen-dev.install xen-4.3.0/debian/libxen-dev.install --- xen-4.3.0/debian/libxen-dev.install 2013-08-15 09:28:24.000000000 +0100 +++ xen-4.3.0/debian/libxen-dev.install 2013-07-30 16:50:25.000000000 +0100 @@ -2,8 +2,14 @@ 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 @@ -11,7 +17,3 @@ usr/include/xentoollog.h usr/include/xenctrlosdep.h usr/include/xen -usr/include/*libxl*.h -usr/lib/libxenlight.a -usr/lib/libxenlight.so -#usr/lib/libblktapctl.a diff -Nru xen-4.3.0/debian/patches/config-etherboot.diff xen-4.3.0/debian/patches/config-etherboot.diff --- xen-4.3.0/debian/patches/config-etherboot.diff 2013-07-09 16:47:50.000000000 +0100 +++ xen-4.3.0/debian/patches/config-etherboot.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0/Config.mk -=================================================================== ---- xen-4.3.0.orig/Config.mk 2013-07-09 17:46:41.812512904 +0200 -+++ xen-4.3.0/Config.mk 2013-07-09 17:47:37.960787392 +0200 -@@ -217,7 +217,7 @@ SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af +--- a/Config.mk ++++ b/Config.mk +@@ -217,7 +217,7 @@ # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. diff -Nru xen-4.3.0/debian/patches/config-prefix.diff xen-4.3.0/debian/patches/config-prefix.diff --- xen-4.3.0/debian/patches/config-prefix.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/config-prefix.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/config/StdGNU.mk -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/config/StdGNU.mk 2013-06-17 17:13:35.926963186 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/config/StdGNU.mk 2013-06-17 17:14:09.435127001 +0200 -@@ -30,16 +30,19 @@ INSTALL_PROG = $(INSTALL) -m0755 -p +--- a/config/StdGNU.mk ++++ b/config/StdGNU.mk +@@ -30,16 +30,19 @@ PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include @@ -25,11 +23,9 @@ CONFIG_DIR = /etc XEN_LOCK_DIR = /var/lock -Index: xen-4.3.0~rc4+38+gb03165b/Config.mk -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/Config.mk 2013-06-17 17:13:53.775050444 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/Config.mk 2013-06-17 17:14:09.435127001 +0200 -@@ -77,7 +77,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib +--- a/Config.mk ++++ b/Config.mk +@@ -77,7 +77,7 @@ endif PYTHON ?= python diff -Nru xen-4.3.0/debian/patches/docs-pdflatex.patch xen-4.3.0/debian/patches/docs-pdflatex.patch --- xen-4.3.0/debian/patches/docs-pdflatex.patch 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/docs-pdflatex.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ ---- a/docs/Docs.mk -+++ b/docs/Docs.mk -@@ -1,7 +1,5 @@ --PS2PDF := ps2pdf --DVIPS := dvips --LATEX := latex --FIG2DEV := fig2dev -+PDFLATEX := pdflatex -+EPSTOPDF := epstopdf - LATEX2HTML := latex2html - DOXYGEN := doxygen - POD2MAN := pod2man ---- a/docs/xen-api/Makefile -+++ b/docs/xen-api/Makefile -@@ -6,35 +6,30 @@ - - - TEX := $(wildcard *.tex) --EPS := $(wildcard *.eps) --EPSDOT := $(patsubst %.dot,%.eps,$(wildcard *.dot)) -+PDFEPS := $(patsubst %.eps,%.pdf,$(wildcard *.eps)) -+PDFDOT := $(patsubst %.dot,%.pdf,$(wildcard *.dot)) - - .PHONY: all - all: build - - .PHONY: build --build: xenapi.pdf xenapi.ps -+build: xenapi.pdf - - install: -- $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/ps -- $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/pdf -+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - -- [ -e xenapi.ps ] && cp xenapi.ps $(DESTDIR)$(DOCDIR)/ps || true -- [ -e xenapi.pdf ] && cp xenapi.pdf $(DESTDIR)$(DOCDIR)/pdf || true -+ [ -e xenapi.pdf ] && cp xenapi.pdf $(DESTDIR)$(DOCDIR) || true - --xenapi.dvi: $(TEX) $(EPS) $(EPSDOT) -- $(LATEX) xenapi.tex -- $(LATEX) xenapi.tex -+xenapi.pdf: $(TEX) $(PDFEPS) $(PDFDOT) -+ $(PDFLATEX) xenapi.tex -+ $(PDFLATEX) xenapi.tex - rm -f *.aux *.log - --%.pdf: %.ps -- $(PS2PDF) $< $@ -+%.pdf: %.eps -+ $(EPSTOPDF) $< - --%.ps: %.dvi -- $(DVIPS) $< -o $@ -- --%.eps: %.dot -- $(DOT) -Tps $< >$@ -+%.pdf: %.dot -+ $(DOT) -Tpdf $< >$@ - - xenapi-datamodel-graph.eps: xenapi-datamodel-graph.dot - $(NEATO) -Goverlap=false -Tps $< >$@ ---- a/docs/xen-api/xenapi-coversheet.tex -+++ b/docs/xen-api/xenapi-coversheet.tex -@@ -14,7 +14,7 @@ - %% Document title - \newcommand{\doctitle}{Xen Management API} - --\newcommand{\coversheetlogo}{xen.eps} -+\newcommand{\coversheetlogo}{xen} - - %% Document date - \newcommand{\datestring}{10th January 2010} diff -Nru xen-4.3.0/debian/patches/series xen-4.3.0/debian/patches/series --- xen-4.3.0/debian/patches/series 2013-08-15 17:20:16.000000000 +0100 +++ xen-4.3.0/debian/patches/series 2013-10-01 10:32:18.000000000 +0100 @@ -1,7 +1,5 @@ version.patch -#docs-pdflatex.patch - config-etherboot.diff config-prefix.diff @@ -32,6 +30,9 @@ tools-xentrace-prefix.diff tools-xentrace-rpath.diff +tools-flags.diff +tools-tests-hardening-fallout.patch + tools-python-xen-relative-path.diff tools-misc-xend-startup.diff tools-libxl-nopidfile.diff @@ -44,7 +45,6 @@ tools-pygrub-remove-static-solaris-support.patch -#tools-hotplug-install.diff tools-include-install.diff tools-xenmon-install.diff @@ -52,34 +52,33 @@ tools-python-shebang.diff -# tools-ocaml-fix-build.diff was refreshed in Ubuntu tools-ocaml-fix-build.diff tools-xenstore-compatibility.diff + +# +# 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 -# Do a versioned install of libxenlight and libblktapctl in order to -# get them into the public lib dir for libvirt to find on compile. -ubuntu-tools-move-xllibs.patch - +# # Enable Arm builds +# ubuntu-tools-armhf-without-ocaml.patch -# Rip out blktap completely for the moment -ubuntu-tools-force-build-without-blktap2.patch - -# Some failures with recent toolchain -silence-gcc-warnings.patch - -# FTBS when actually passing on the LDFLAGS we usually use. -ubuntu-tools-efi-ldflags.patch - +# # Security fixes not in Debian, yet +# + diff -Nru xen-4.3.0/debian/patches/silence-gcc-warnings.patch xen-4.3.0/debian/patches/silence-gcc-warnings.patch --- xen-4.3.0/debian/patches/silence-gcc-warnings.patch 2013-07-23 13:20:13.000000000 +0100 +++ xen-4.3.0/debian/patches/silence-gcc-warnings.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -Description: Workaround for ignored return value - This otherwise breaks the compile with hardening options turned on. Since - the resulting tool is not packaged anyway this is a quick and dirty hack. - Not meant for upstream. -Forwarded: not-applicable -Origin: Ubuntu -Author: ???Chuck Short - -diff -Naurp xen-4.2.0.orig/tools/tests/mce-test/tools/xen-mceinj.c xen-4.2.0/tools/tests/mce-test/tools/xen-mceinj.c ---- xen-4.2.0.orig/tools/tests/mce-test/tools/xen-mceinj.c 2012-09-18 02:34:54.000000000 -0500 -+++ xen-4.2.0/tools/tests/mce-test/tools/xen-mceinj.c 2012-11-10 14:14:11.266255396 -0600 -@@ -90,9 +90,10 @@ static void Lprintf(const char *fmt, ... - { - char *buf; - va_list args; -+ int result; - - va_start(args, fmt); -- vasprintf(&buf, fmt, args); -+ result = vasprintf(&buf, fmt, args); - fprintf(LOGFILE, "%s", buf); - va_end(args); - free(buf); -@@ -102,9 +103,10 @@ static void err(xc_interface *xc_handle, - { - char *buf; - va_list args; -+ int result; - - va_start(args, fmt); -- vasprintf(&buf, fmt, args); -+ result = vasprintf(&buf, fmt, args); - perror(buf); - va_end(args); - free(buf); diff -Nru xen-4.3.0/debian/patches/tools-blktap2-prefix.diff xen-4.3.0/debian/patches/tools-blktap2-prefix.diff --- xen-4.3.0/debian/patches/tools-blktap2-prefix.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-blktap2-prefix.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/blktap2/vhd/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/blktap2/vhd/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/blktap2/vhd/Makefile 2013-06-25 15:55:14.699544569 +0200 -@@ -12,6 +12,7 @@ CFLAGS += -Werror +--- a/tools/blktap2/vhd/Makefile ++++ b/tools/blktap2/vhd/Makefile +@@ -12,6 +12,7 @@ CFLAGS += -Wno-unused CFLAGS += -I../include CFLAGS += -D_GNU_SOURCE @@ -10,11 +8,9 @@ ifeq ($(CONFIG_X86_64),y) CFLAGS += -fPIC -Index: xen-4.3.0~rc4+38+gb03165b/tools/blktap2/vhd/lib/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/blktap2/vhd/lib/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/blktap2/vhd/lib/Makefile 2013-06-25 16:00:58.789226745 +0200 -@@ -2,26 +2,20 @@ XEN_ROOT=$(CURDIR)/../../../.. +--- a/tools/blktap2/vhd/lib/Makefile ++++ b/tools/blktap2/vhd/lib/Makefile +@@ -2,26 +2,20 @@ BLKTAP_ROOT := ../.. include $(XEN_ROOT)/tools/Rules.mk @@ -43,7 +39,7 @@ ifeq ($(CONFIG_LIBICONV),y) LIBS += -liconv -@@ -51,27 +45,24 @@ LIB-OBJS += $(LVM-UTIL-OBJ) +@@ -51,27 +45,22 @@ LIB-PICOBJS = $(patsubst %.o,%.opic,$(LIB-OBJS)) @@ -64,8 +60,7 @@ - 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) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) \ -+ $(LDFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(SHLIB_LDFLAGS) $(LDFLAGS) -o libvhd.so $^ $(LIBS) install: all - $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR) @@ -74,16 +69,13 @@ - 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_DIR) -p $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(INSTALL_PROG) libvhd.a $(DESTDIR)$(LIBDIR) -+ $(INSTALL_PROG) libvhd.so $(DESTDIR)$(PRIVATE_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.3.0~rc4+38+gb03165b/tools/blktap2/control/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/blktap2/control/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/blktap2/control/Makefile 2013-06-25 15:55:14.703544581 +0200 +--- a/tools/blktap2/control/Makefile ++++ b/tools/blktap2/control/Makefile @@ -1,10 +1,7 @@ XEN_ROOT := $(CURDIR)/../../../ include $(XEN_ROOT)/tools/Rules.mk @@ -95,7 +87,7 @@ IBIN = tap-ctl -@@ -38,39 +35,32 @@ OBJS = $(CTL_OBJS) tap-ctl.o +@@ -38,39 +35,32 @@ PICS = $(CTL_PICS) LIB_STATIC = $(LIBNAME).a diff -Nru xen-4.3.0/debian/patches/tools-disable.diff xen-4.3.0/debian/patches/tools-disable.diff --- xen-4.3.0/debian/patches/tools-disable.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-disable.diff 2013-07-28 12:24:02.000000000 +0100 @@ -1,7 +1,5 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/Makefile 2013-06-25 16:07:38.131179024 +0200 +--- a/tools/Makefile ++++ b/tools/Makefile @@ -1,10 +1,6 @@ XEN_ROOT = $(CURDIR)/.. include $(XEN_ROOT)/tools/Rules.mk @@ -13,17 +11,22 @@ SUBDIRS-y := SUBDIRS-y += include SUBDIRS-y += libxc -@@ -21,9 +17,6 @@ SUBDIRS-y += xenmon +@@ -19,14 +15,7 @@ + SUBDIRS-y += console + SUBDIRS-y += xenmon SUBDIRS-y += xenstat - SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) +-SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) SUBDIRS-$(CONFIG_Linux) += memshr -ifeq ($(CONFIG_X86),y) -SUBDIRS-$(CONFIG_Linux) += blktap -endif - SUBDIRS-$(CONFIG_Linux) += blktap2 - SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) - SUBDIRS-$(CONFIG_NetBSD) += blktap2 -@@ -34,9 +27,12 @@ SUBDIRS-$(CONFIG_Linux) += libvchan +-SUBDIRS-$(CONFIG_Linux) += blktap2 +-SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) +-SUBDIRS-$(CONFIG_NetBSD) += blktap2 + SUBDIRS-$(CONFIG_NetBSD) += xenbackendd + SUBDIRS-y += libfsimage + SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen +@@ -34,9 +23,12 @@ # do not recurse in to a dir we are about to delete ifneq "$(MAKECMDGOALS)" "distclean" @@ -36,3 +39,17 @@ SUBDIRS-y += xenpmd SUBDIRS-y += libxl +--- a/tools/Rules.mk ++++ b/tools/Rules.mk +@@ -41,11 +41,7 @@ + LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan + SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) + +-ifeq ($(CONFIG_Linux),y) +-LIBXL_BLKTAP ?= y +-else + LIBXL_BLKTAP ?= n +-endif + + ifeq ($(LIBXL_BLKTAP),y) + CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) diff -Nru xen-4.3.0/debian/patches/tools-flags.diff xen-4.3.0/debian/patches/tools-flags.diff --- xen-4.3.0/debian/patches/tools-flags.diff 1970-01-01 01:00:00.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-flags.diff 2013-08-11 21:19:40.000000000 +0100 @@ -0,0 +1,16 @@ +Description: Export flags from configure +Author: Bastian Blank +Origin: vendor +Forwarded: not-needed +--- a/config/Tools.mk.in ++++ b/config/Tools.mk.in +@@ -24,6 +24,9 @@ + IASL := @IASL@ + FETCHER := @FETCHER@ + ++CFLAGS += @CFLAGS@ ++CPPFLAGS += @CPPFLAGS@ ++ + # Extra folder for libs/includes + PREPEND_INCLUDES := @PREPEND_INCLUDES@ + PREPEND_LIB := @PREPEND_LIB@ diff -Nru xen-4.3.0/debian/patches/tools-flask-prefix.diff xen-4.3.0/debian/patches/tools-flask-prefix.diff --- xen-4.3.0/debian/patches/tools-flask-prefix.diff 1970-01-01 01:00:00.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-flask-prefix.diff 2011-03-09 17:20:43.000000000 +0000 @@ -0,0 +1,14 @@ +--- 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 + diff -Nru xen-4.3.0/debian/patches/tools-hotplug-install.diff xen-4.3.0/debian/patches/tools-hotplug-install.diff --- xen-4.3.0/debian/patches/tools-hotplug-install.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-hotplug-install.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- a/tools/hotplug/common/Makefile -+++ b/tools/hotplug/common/Makefile -@@ -6,8 +6,8 @@ - # OS-independent hotplug scripts go in this directory - - # Xen scripts to go there. --XEN_SCRIPTS = $(HOTPLUGPATH) --XEN_SCRIPT_DATA = -+XEN_SCRIPTS = -+XEN_SCRIPT_DATA = $(HOTPLUGPATH) - - genpath-target = $(call buildmakevars2file,$(HOTPLUGPATH)) - $(eval $(genpath-target)) ---- a/tools/hotplug/Linux/vtpm-impl -+++ b/tools/hotplug/Linux/vtpm-impl -@@ -1,4 +1,3 @@ --#!/bin/bash - # =================================================================== - # - # Copyright (c) 2005, Intel Corp. diff -Nru xen-4.3.0/debian/patches/tools-hotplug-udevrules.diff xen-4.3.0/debian/patches/tools-hotplug-udevrules.diff --- xen-4.3.0/debian/patches/tools-hotplug-udevrules.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-hotplug-udevrules.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/hotplug/Linux/xen-backend.rules -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/hotplug/Linux/xen-backend.rules 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/hotplug/Linux/xen-backend.rules 2013-06-25 16:13:06.344783571 +0200 -@@ -5,11 +5,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-* +--- a/tools/hotplug/Linux/xen-backend.rules ++++ b/tools/hotplug/Linux/xen-backend.rules +@@ -5,11 +5,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="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" diff -Nru xen-4.3.0/debian/patches/tools-include-install.diff xen-4.3.0/debian/patches/tools-include-install.diff --- xen-4.3.0/debian/patches/tools-include-install.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-include-install.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/include/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/include/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/include/Makefile 2013-06-25 16:11:05.456192578 +0200 -@@ -11,7 +11,6 @@ xen-foreign: +--- a/tools/include/Makefile ++++ b/tools/include/Makefile +@@ -11,7 +11,6 @@ xen/.dir: @rm -rf xen mkdir -p xen/libelf @@ -10,7 +8,7 @@ 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 +@@ -28,7 +27,6 @@ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/sys $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm diff -Nru xen-4.3.0/debian/patches/tools-libfsimage-abiname.diff xen-4.3.0/debian/patches/tools-libfsimage-abiname.diff --- xen-4.3.0/debian/patches/tools-libfsimage-abiname.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-libfsimage-abiname.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,7 +1,5 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/libfsimage/common/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/libfsimage/common/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/libfsimage/common/Makefile 2013-06-17 17:16:02.775681109 +0200 +--- a/tools/libfsimage/common/Makefile ++++ b/tools/libfsimage/common/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/libfsimage/Rules.mk @@ -12,7 +10,7 @@ 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 +@@ -15,7 +12,7 @@ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) @@ -21,7 +19,7 @@ .PHONY: all all: $(LIB) -@@ -24,9 +21,7 @@ all: $(LIB) +@@ -24,9 +21,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) @@ -32,7 +30,7 @@ $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR) -@@ -34,13 +29,8 @@ install: all +@@ -34,13 +29,8 @@ clean distclean:: rm -f $(LIB) diff -Nru xen-4.3.0/debian/patches/tools-libxc-abiname.diff xen-4.3.0/debian/patches/tools-libxc-abiname.diff --- xen-4.3.0/debian/patches/tools-libxc-abiname.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-libxc-abiname.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,7 +1,5 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/libxc/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/libxc/Makefile 2013-06-17 17:22:28.421566424 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/libxc/Makefile 2013-06-17 17:30:31.271926949 +0200 +--- a/tools/libxc/Makefile ++++ b/tools/libxc/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk @@ -12,7 +10,7 @@ CTRL_SRCS-y := CTRL_SRCS-y += xc_core.c CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c -@@ -108,12 +105,12 @@ OSDEP_PIC_OBJS := $(patsubst %.c,%.opic, +@@ -108,12 +105,12 @@ LIB := libxenctrl.a ifneq ($(stubdom),y) @@ -27,7 +25,7 @@ endif ifneq ($(stubdom),y) -@@ -134,15 +131,13 @@ libs: $(LIB) +@@ -134,15 +131,13 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) @@ -47,7 +45,7 @@ $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS -@@ -171,22 +166,18 @@ rpm: build +@@ -171,22 +166,18 @@ libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ @@ -74,7 +72,7 @@ ln -sf $< $@ ifeq ($(CONFIG_MiniOS),y) -@@ -198,9 +189,9 @@ endif +@@ -198,9 +189,9 @@ xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) diff -Nru xen-4.3.0/debian/patches/tools-libxl-abiname.diff xen-4.3.0/debian/patches/tools-libxl-abiname.diff --- xen-4.3.0/debian/patches/tools-libxl-abiname.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-libxl-abiname.diff 2013-07-30 16:50:25.000000000 +0100 @@ -1,7 +1,5 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/libxl/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/libxl/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/libxl/Makefile 2013-06-25 15:54:11.819237164 +0200 +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile @@ -5,12 +5,6 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk @@ -15,7 +13,7 @@ CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral CFLAGS += -I. -fPIC -@@ -164,26 +158,14 @@ _libxl_type%.h _libxl_type%_json.h _libx +@@ -164,26 +158,20 @@ $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h) $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) @@ -23,11 +21,12 @@ - ln -sf $< $@ - -libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) -- ln -sf $< $@ -- ++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.so: $(LIBXL_OBJS) ++libxenlight-$(XEN_VERSION).so: $(LIBXL_OBJS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight.a: $(LIBXL_OBJS) @@ -37,28 +36,31 @@ - ln -sf $< $@ - -libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) -- ln -sf $< $@ -- ++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.so: $(LIBXLU_OBJS) ++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 $^ -@@ -207,13 +189,9 @@ install: all +@@ -207,13 +195,11 @@ $(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.so $(DESTDIR)$(LIBDIR) ++ $(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.so $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libxlutil-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR) ++ ln -sf libxlutil-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh diff -Nru xen-4.3.0/debian/patches/tools-libxl-nopidfile.diff xen-4.3.0/debian/patches/tools-libxl-nopidfile.diff --- xen-4.3.0/debian/patches/tools-libxl-nopidfile.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-libxl-nopidfile.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/libxl/libxl.c -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/libxl/libxl.c 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/libxl/libxl.c 2013-06-25 16:03:17.473904734 +0200 -@@ -25,7 +25,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in +--- a/tools/libxl/libxl.c ++++ b/tools/libxl/libxl.c +@@ -25,7 +25,6 @@ unsigned flags, xentoollog_logger * lg) { libxl_ctx *ctx = NULL; @@ -10,7 +8,7 @@ int rc; if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; } -@@ -82,12 +81,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in +@@ -82,12 +81,6 @@ rc = libxl__poller_init(ctx, &ctx->poller_app); if (rc) goto out; @@ -23,11 +21,9 @@ ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno, -Index: xen-4.3.0~rc4+38+gb03165b/tools/libxl/libxl_internal.h -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/libxl/libxl_internal.h 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/libxl/libxl_internal.h 2013-06-25 16:04:04.486134556 +0200 -@@ -377,7 +377,6 @@ typedef struct { +--- a/tools/libxl/libxl_internal.h ++++ b/tools/libxl/libxl_internal.h +@@ -377,7 +377,6 @@ #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) #define AUTO_PHP_SLOT 0x100 diff -Nru xen-4.3.0/debian/patches/tools-libxl-prefix.diff xen-4.3.0/debian/patches/tools-libxl-prefix.diff --- xen-4.3.0/debian/patches/tools-libxl-prefix.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-libxl-prefix.diff 2013-07-30 16:50:25.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/libxl/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/libxl/Makefile 2013-06-25 15:54:11.819237164 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/libxl/Makefile 2013-06-25 16:01:40.089428639 +0200 -@@ -12,6 +12,8 @@ CFLAGS += -I. -fPIC +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile +@@ -12,6 +12,8 @@ ifeq ($(CONFIG_Linux),y) LIBUUID_LIBS += -luuid endif @@ -11,16 +9,16 @@ LIBXL_LIBS = LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) -@@ -159,7 +161,7 @@ _libxl_type%.h _libxl_type%_json.h _libx - $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) +@@ -162,7 +164,7 @@ + ln -sf $< $@ - libxenlight.so: $(LIBXL_OBJS) + 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.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ -@@ -171,7 +173,7 @@ libxlutil.a: $(LIBXLU_OBJS) +@@ -177,7 +179,7 @@ $(AR) rcs libxlutil.a $^ xl: $(XL_OBJS) libxlutil.so libxenlight.so @@ -29,13 +27,11 @@ libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) -@@ -181,17 +183,18 @@ testidl: testidl.o libxlutil.so libxenli +@@ -187,13 +189,12 @@ .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) -+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) -+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) @@ -44,19 +40,11 @@ - $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) -- $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(LIBDIR) -+ $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(PRIVATE_LIBDIR) - $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) -- $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR) -+ $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(PRIVATE_LIBDIR) - $(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 -Index: xen-4.3.0~rc4+38+gb03165b/tools/xenstat/libxenstat/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/xenstat/libxenstat/Makefile 2013-06-25 15:54:35.651353660 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/xenstat/libxenstat/Makefile 2013-06-25 16:01:40.089428639 +0200 -@@ -53,7 +53,7 @@ $(SHLIB): $(OBJECTS-y) + $(INSTALL_PROG) libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR) + ln -sf libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenlight.so +--- a/tools/xenstat/libxenstat/Makefile ++++ b/tools/xenstat/libxenstat/Makefile +@@ -53,7 +53,7 @@ install: all $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a diff -Nru xen-4.3.0/debian/patches/tools-misc-prefix.diff xen-4.3.0/debian/patches/tools-misc-prefix.diff --- xen-4.3.0/debian/patches/tools-misc-prefix.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-misc-prefix.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/misc/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/misc/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/misc/Makefile 2013-06-25 16:01:56.821510433 +0200 -@@ -43,12 +43,8 @@ build: $(TARGETS) +--- a/tools/misc/Makefile ++++ b/tools/misc/Makefile +@@ -43,12 +43,8 @@ .PHONY: install install: build @@ -16,11 +14,9 @@ set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done .PHONY: clean -Index: xen-4.3.0~rc4+38+gb03165b/tools/misc/lomount/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/misc/lomount/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/misc/lomount/Makefile 2013-06-25 16:01:56.833510513 +0200 -@@ -11,7 +11,7 @@ build: lomount +--- a/tools/misc/lomount/Makefile ++++ b/tools/misc/lomount/Makefile +@@ -11,7 +11,7 @@ .PHONY: install install install-recurse: build @@ -29,18 +25,16 @@ .PHONY: clean clean: -@@ -20,4 +20,4 @@ clean: +@@ -20,4 +20,4 @@ lomount: lomount.o $(CC) $(CFLAGS) -o $@ $< --include $(DEPS) \ No newline at end of file +-include $(DEPS) -Index: xen-4.3.0~rc4+38+gb03165b/tools/misc/xend -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/misc/xend 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/misc/xend 2013-06-25 16:01:56.841510529 +0200 -@@ -33,6 +33,8 @@ import signal +--- a/tools/misc/xend ++++ b/tools/misc/xend +@@ -33,6 +33,8 @@ import time import commands @@ -49,10 +43,8 @@ from xen.xend.server import SrvDaemon class CheckError(ValueError): -Index: xen-4.3.0~rc4+38+gb03165b/tools/misc/xm -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/misc/xm 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/misc/xm 2013-06-25 16:01:56.845510544 +0200 +--- a/tools/misc/xm ++++ b/tools/misc/xm @@ -1,6 +1,7 @@ #!/usr/bin/env python # -*- mode: python; -*- diff -Nru xen-4.3.0/debian/patches/tools-misc-rpath.diff xen-4.3.0/debian/patches/tools-misc-rpath.diff --- xen-4.3.0/debian/patches/tools-misc-rpath.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-misc-rpath.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/misc/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/misc/Makefile 2013-06-25 16:01:56.821510433 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/misc/Makefile 2013-06-25 16:02:04.221546630 +0200 -@@ -34,6 +34,8 @@ INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y) +--- a/tools/misc/Makefile ++++ b/tools/misc/Makefile +@@ -34,6 +34,8 @@ # Include configure output (config.h) to headers search path CFLAGS += -I$(XEN_ROOT)/tools diff -Nru xen-4.3.0/debian/patches/tools-ocaml-fix-build.diff xen-4.3.0/debian/patches/tools-ocaml-fix-build.diff --- xen-4.3.0/debian/patches/tools-ocaml-fix-build.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-ocaml-fix-build.diff 2013-07-23 13:51:13.000000000 +0100 @@ -2,10 +2,7 @@ Date: Tue, 29 Nov 2011 11:45:27 +0000 Subject: tools-ocaml-fix-build.diff -Fix the build of the ocaml libraries such that the cmxa files contain -appropriately versioned linker references (-lxenctrl-4.2) rather than -relative path in the build directory, enabling xen-api and friends to -build correctly. +Fix the build of the ocaml libraries Signed-off-by: Jon Ludlam --- @@ -16,28 +13,24 @@ tools/ocaml/xenstored/Makefile | 4 +++- 5 files changed, 10 insertions(+), 10 deletions(-) -Index: xen-4.3.0~rc4+38+gb03165b/tools/Rules.mk -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/Rules.mk 2013-06-25 15:54:38.891369508 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/Rules.mk 2013-06-25 16:13:23.016865078 +0200 -@@ -24,10 +24,12 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE) +--- a/tools/Rules.mk ++++ b/tools/Rules.mk +@@ -23,10 +23,12 @@ + CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so - SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) +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 - SHLIB_libxenguest = -Wl,-rpath-link=L$(XEN_LIBXC) +LDLIBS_libxenguest_SYSTEM = -lxenguest-$(XEN_VERSION) + SHLIB_libxenguest = -Wl,-rpath-link=L$(XEN_LIBXC) CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude) - LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore.so -Index: xen-4.3.0~rc4+38+gb03165b/tools/ocaml/Makefile.rules -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/ocaml/Makefile.rules 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/ocaml/Makefile.rules 2013-06-25 16:13:23.048865238 +0200 -@@ -58,14 +58,8 @@ mk-caml-lib-stubs = \ +--- a/tools/ocaml/Makefile.rules ++++ b/tools/ocaml/Makefile.rules +@@ -58,14 +58,8 @@ # define a library target .cmxa and .cma define OCAML_LIBRARY_template @@ -54,11 +47,9 @@ endef define OCAML_NOC_LIBRARY_template -Index: xen-4.3.0~rc4+38+gb03165b/tools/ocaml/libs/eventchn/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/ocaml/libs/eventchn/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/ocaml/libs/eventchn/Makefile 2013-06-25 16:13:23.060865295 +0200 -@@ -9,6 +9,7 @@ INTF = $(foreach obj, $(OBJS),$(obj).cmi +--- a/tools/ocaml/libs/eventchn/Makefile ++++ b/tools/ocaml/libs/eventchn/Makefile +@@ -9,6 +9,7 @@ LIBS = xeneventchn.cma xeneventchn.cmxa LIBS_xeneventchn = $(LDLIBS_libxenctrl) @@ -66,11 +57,9 @@ all: $(INTF) $(LIBS) $(PROGRAMS) -Index: xen-4.3.0~rc4+38+gb03165b/tools/ocaml/libs/xc/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/ocaml/libs/xc/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/ocaml/libs/xc/Makefile 2013-06-25 16:13:23.064865311 +0200 -@@ -10,6 +10,7 @@ INTF = xenctrl.cmi +--- a/tools/ocaml/libs/xc/Makefile ++++ b/tools/ocaml/libs/xc/Makefile +@@ -10,6 +10,7 @@ LIBS = xenctrl.cma xenctrl.cmxa LIBS_xenctrl = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) @@ -78,11 +67,9 @@ xenctrl_OBJS = $(OBJS) xenctrl_C_OBJS = xenctrl_stubs -Index: xen-4.3.0~rc4+38+gb03165b/tools/ocaml/xenstored/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/ocaml/xenstored/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/ocaml/xenstored/Makefile 2013-06-25 16:13:23.080865388 +0200 -@@ -43,7 +43,9 @@ XENSTOREDLIBS = \ +--- a/tools/ocaml/xenstored/Makefile ++++ b/tools/ocaml/xenstored/Makefile +@@ -43,7 +43,9 @@ -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 \ diff -Nru xen-4.3.0/debian/patches/tools-pygrub-remove-static-solaris-support.patch xen-4.3.0/debian/patches/tools-pygrub-remove-static-solaris-support.patch --- xen-4.3.0/debian/patches/tools-pygrub-remove-static-solaris-support.patch 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-pygrub-remove-static-solaris-support.patch 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/pygrub/src/pygrub -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/pygrub/src/pygrub 2013-06-25 16:02:08.681568419 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/pygrub/src/pygrub 2013-06-25 16:08:08.135325697 +0200 -@@ -17,7 +17,6 @@ import os, sys, string, struct, tempfile +--- a/tools/pygrub/src/pygrub ++++ b/tools/pygrub/src/pygrub +@@ -17,7 +17,6 @@ import copy import logging import platform @@ -10,7 +8,7 @@ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii import getopt -@@ -639,51 +638,6 @@ def run_grub(file, entry, fs, cfg_args): +@@ -639,51 +638,6 @@ return grubcfg @@ -62,7 +60,7 @@ def sniff_netware(fs, cfg): if not fs.file_exists("/nwserver/xnloader.sys"): return cfg -@@ -848,10 +802,7 @@ if __name__ == "__main__": +@@ -848,10 +802,7 @@ try: fs = fsimage.open(file, offset, bootfsoptions) diff -Nru xen-4.3.0/debian/patches/tools-python-xen-relative-path.diff xen-4.3.0/debian/patches/tools-python-xen-relative-path.diff --- xen-4.3.0/debian/patches/tools-python-xen-relative-path.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-python-xen-relative-path.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/python/xen/xm/create.py -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/python/xen/xm/create.py 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/python/xen/xm/create.py 2013-06-25 16:02:37.281708247 +0200 -@@ -695,45 +695,39 @@ def configure_image(vals): +--- a/tools/python/xen/xm/create.py ++++ b/tools/python/xen/xm/create.py +@@ -695,45 +695,39 @@ return None config_image = [ vals.builder ] if vals.kernel: @@ -58,7 +56,7 @@ else: raise ValueError('Cannot find loader "%s"' % vals.loader) if vals.cmdline_ip: -@@ -1032,7 +1026,7 @@ def configure_hvm(config_image, vals): +@@ -1032,7 +1026,7 @@ args = [ 'acpi', 'apic', 'boot', 'cpuid', 'cpuid_check', @@ -67,7 +65,7 @@ 'fda', 'fdb', 'gfx_passthru', 'guest_os_type', 'hap', 'hpet', -@@ -1054,6 +1048,8 @@ def configure_hvm(config_image, vals): +@@ -1054,6 +1048,8 @@ for a in args: if a in vals.__dict__ and vals.__dict__[a] is not None: config_image.append([a, vals.__dict__[a]]) @@ -76,7 +74,7 @@ if vals.vncpasswd is not None: config_image.append(['vncpasswd', vals.vncpasswd]) -@@ -1120,10 +1116,9 @@ def make_config(vals): +@@ -1120,10 +1116,9 @@ config_image = configure_image(vals) if vals.bootloader: @@ -89,11 +87,9 @@ if vals.bootargs: config.append(['bootloader_args', vals.bootargs]) else: -Index: xen-4.3.0~rc4+38+gb03165b/tools/python/xen/xend/XendCheckpoint.py -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/python/xen/xend/XendCheckpoint.py 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/python/xen/xend/XendCheckpoint.py 2013-06-25 16:02:37.301708339 +0200 -@@ -118,7 +118,7 @@ def save(fd, dominfo, network, live, dst +--- a/tools/python/xen/xend/XendCheckpoint.py ++++ b/tools/python/xen/xend/XendCheckpoint.py +@@ -118,7 +118,7 @@ # enabled. Passing "0" simply uses the defaults compiled into # libxenguest; see the comments and/or code in xc_linux_save() for # more information. @@ -102,7 +98,7 @@ 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 +@@ -299,7 +299,7 @@ superpages = restore_image.superpages @@ -111,11 +107,9 @@ fd, dominfo.getDomid(), store_port, console_port, int(is_hvm), pae, apic, superpages]) log.debug("[xc_restore]: %s", string.join(cmd)) -Index: xen-4.3.0~rc4+38+gb03165b/tools/python/xen/xend/XendConfig.py -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/python/xen/xend/XendConfig.py 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/python/xen/xend/XendConfig.py 2013-06-25 16:02:37.313708404 +0200 -@@ -493,11 +493,11 @@ class XendConfig(dict): +--- a/tools/python/xen/xend/XendConfig.py ++++ b/tools/python/xen/xend/XendConfig.py +@@ -493,11 +493,11 @@ if self.is_hvm() or self.has_rfb(): if 'device_model' not in self['platform']: @@ -129,7 +123,7 @@ # 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): +@@ -528,14 +528,14 @@ # 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': @@ -147,7 +141,7 @@ 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): +@@ -1653,7 +1653,7 @@ # is invoked for pvfb services if 'device_model' not in target['platform']: target['platform']['device_model'] = \ @@ -156,11 +150,9 @@ # 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.3.0~rc4+38+gb03165b/tools/python/xen/xend/XendDomainInfo.py -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/python/xen/xend/XendDomainInfo.py 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/python/xen/xend/XendDomainInfo.py 2013-06-25 16:02:37.321708433 +0200 -@@ -3239,7 +3239,7 @@ class XendDomainInfo: +--- a/tools/python/xen/xend/XendDomainInfo.py ++++ b/tools/python/xen/xend/XendDomainInfo.py +@@ -3239,7 +3239,7 @@ else: # Boot using bootloader if not blexec or blexec == 'pygrub': diff -Nru xen-4.3.0/debian/patches/tools-tests-hardening-fallout.patch xen-4.3.0/debian/patches/tools-tests-hardening-fallout.patch --- xen-4.3.0/debian/patches/tools-tests-hardening-fallout.patch 1970-01-01 01:00:00.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-tests-hardening-fallout.patch 2013-08-11 21:19:40.000000000 +0100 @@ -0,0 +1,27 @@ +Description: Add missing return value checks in tools/tests +Author: Bastian Blank +Origin: vendor +Forwarded: yes +--- +--- a/tools/tests/mce-test/tools/xen-mceinj.c ++++ b/tools/tests/mce-test/tools/xen-mceinj.c +@@ -92,7 +92,8 @@ + va_list args; + + va_start(args, fmt); +- vasprintf(&buf, fmt, args); ++ if (vasprintf(&buf, fmt, args) < 0) ++ abort(); + fprintf(LOGFILE, "%s", buf); + va_end(args); + free(buf); +@@ -104,7 +105,8 @@ + va_list args; + + va_start(args, fmt); +- vasprintf(&buf, fmt, args); ++ if (vasprintf(&buf, fmt, args) < 0) ++ abort(); + perror(buf); + va_end(args); + free(buf); diff -Nru xen-4.3.0/debian/patches/tools-xenstore-compatibility.diff xen-4.3.0/debian/patches/tools-xenstore-compatibility.diff --- xen-4.3.0/debian/patches/tools-xenstore-compatibility.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-xenstore-compatibility.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/xenstore/xenstore_client.c -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/xenstore/xenstore_client.c 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/xenstore/xenstore_client.c 2013-06-25 16:13:30.116899789 +0200 -@@ -629,7 +629,7 @@ main(int argc, char **argv) +--- a/tools/xenstore/xenstore_client.c ++++ b/tools/xenstore/xenstore_client.c +@@ -629,7 +629,7 @@ max_width = ws.ws_col - 2; } @@ -11,11 +9,9 @@ if (xsh == NULL) err(1, "xs_open"); again: -Index: xen-4.3.0~rc4+38+gb03165b/tools/xenstore/xs.c -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/xenstore/xs.c 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/xenstore/xs.c 2013-06-25 16:13:30.120899811 +0200 -@@ -278,17 +278,19 @@ struct xs_handle *xs_daemon_open_readonl +--- a/tools/xenstore/xs.c ++++ b/tools/xenstore/xs.c +@@ -278,17 +278,19 @@ struct xs_handle *xs_domain_open(void) { @@ -36,10 +32,8 @@ if (!xsh && !(flags & XS_OPEN_SOCKETONLY)) xsh = get_handle(xs_domain_dev()); -Index: xen-4.3.0~rc4+38+gb03165b/tools/xenstore/xenstore.h -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/xenstore/xenstore.h 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/xenstore/xenstore.h 2013-06-25 16:13:30.124899825 +0200 +--- a/tools/xenstore/xenstore.h ++++ b/tools/xenstore/xenstore.h @@ -26,6 +26,7 @@ #define XS_OPEN_READONLY 1UL<<0 diff -Nru xen-4.3.0/debian/patches/tools-xenstore-prefix.diff xen-4.3.0/debian/patches/tools-xenstore-prefix.diff --- xen-4.3.0/debian/patches/tools-xenstore-prefix.diff 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/tools-xenstore-prefix.diff 2013-07-23 13:51:13.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xen-4.3.0~rc4+38+gb03165b/tools/xenstore/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/tools/xenstore/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/tools/xenstore/Makefile 2013-06-25 16:02:29.405669743 +0200 -@@ -58,10 +58,10 @@ endif +--- a/tools/xenstore/Makefile ++++ b/tools/xenstore/Makefile +@@ -58,10 +58,10 @@ init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest) init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE) @@ -15,7 +13,7 @@ xenstored.a: $(XENSTORED_OBJS) $(AR) cr $@ $^ -@@ -109,17 +109,17 @@ tarball: clean +@@ -109,17 +109,17 @@ .PHONY: install install: all diff -Nru xen-4.3.0/debian/patches/ubuntu-tools-efi-ldflags.patch xen-4.3.0/debian/patches/ubuntu-tools-efi-ldflags.patch --- xen-4.3.0/debian/patches/ubuntu-tools-efi-ldflags.patch 2013-07-25 11:44:22.000000000 +0100 +++ xen-4.3.0/debian/patches/ubuntu-tools-efi-ldflags.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -From: Stefan Bader -Date: Thu, 25 Jul 2013 12:35:51 +0200 -Subject: Filter LDFLAGS unsupported by EFI target - -The i386pep emulation target used to build xen.efi does not (currently?) -support -z, but we pass "-z relro" as the default linker flags. -Fix the build by dropping that (it is not 100% proof as filter-out -operates on space seperated words). - -Signed-off-by: Stefan Bader - -Index: xen-4.3.0/xen/arch/x86/Makefile -=================================================================== ---- xen-4.3.0.orig/xen/arch/x86/Makefile 2013-07-09 12:46:56.000000000 +0200 -+++ xen-4.3.0/xen/arch/x86/Makefile 2013-07-25 12:35:09.896906637 +0200 -@@ -112,7 +112,8 @@ $(TARGET)-syms: prelink.o xen.lds $(BASE - $(@D)/.$(@F).1.o -o $@ - rm -f $(@D)/.$(@F).[0-9]* - --EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 -+EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(filter-out -z relro,$(LDFLAGS))) -+EFI_LDFLAGS += --subsystem=10 - EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug - EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20 - EFI_LDFLAGS += --major-image-version=$(XEN_VERSION) diff -Nru xen-4.3.0/debian/patches/ubuntu-tools-force-build-without-blktap2.patch xen-4.3.0/debian/patches/ubuntu-tools-force-build-without-blktap2.patch --- xen-4.3.0/debian/patches/ubuntu-tools-force-build-without-blktap2.patch 2013-08-15 09:31:18.000000000 +0100 +++ xen-4.3.0/debian/patches/ubuntu-tools-force-build-without-blktap2.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -From: Stefan Bader -Date: Thu, 15 Aug 2013 10:28:56 +0200 -Subject: Force build without blkdtap2 - -Maybe this breaks the ability to use blktap with xen-api but right -now at least xen-api-libs does not compile for other reasons and -would depend on blktap (which also does not compile) that seems to -be an older version of what the xen package would/could provide. -We should be able to sort this out later together with those parties -interested in xen-api. But for now drop that support. - -Signed-off-by: Stefan Bader - -Index: xen-4.3.0/tools/Makefile -=================================================================== ---- xen-4.3.0.orig/tools/Makefile 2013-08-02 17:46:28.670319328 +0200 -+++ xen-4.3.0/tools/Makefile 2013-08-15 10:22:15.966932466 +0200 -@@ -17,9 +17,9 @@ SUBDIRS-y += xenmon - SUBDIRS-y += xenstat - SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) - SUBDIRS-$(CONFIG_Linux) += memshr --SUBDIRS-$(CONFIG_Linux) += blktap2 -+#SUBDIRS-$(CONFIG_Linux) += blktap2 - SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) --SUBDIRS-$(CONFIG_NetBSD) += blktap2 -+#SUBDIRS-$(CONFIG_NetBSD) += blktap2 - SUBDIRS-$(CONFIG_NetBSD) += xenbackendd - SUBDIRS-y += libfsimage - SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen -Index: xen-4.3.0/tools/Rules.mk -=================================================================== ---- xen-4.3.0.orig/tools/Rules.mk 2013-07-25 09:16:33.000000000 +0200 -+++ xen-4.3.0/tools/Rules.mk 2013-08-15 10:23:48.754930436 +0200 -@@ -43,11 +43,11 @@ 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 -+#ifeq ($(CONFIG_Linux),y) -+#LIBXL_BLKTAP ?= y -+#else - LIBXL_BLKTAP ?= n --endif -+#endif - - ifeq ($(LIBXL_BLKTAP),y) - CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) diff -Nru xen-4.3.0/debian/patches/ubuntu-tools-move-xllibs.patch xen-4.3.0/debian/patches/ubuntu-tools-move-xllibs.patch --- xen-4.3.0/debian/patches/ubuntu-tools-move-xllibs.patch 2013-07-15 13:28:54.000000000 +0100 +++ xen-4.3.0/debian/patches/ubuntu-tools-move-xllibs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -From: Stefan Bader -Date: Mon, 15 Jul 2013 14:17:59 +0200 -Subject: Include libxl headers and libraries - -This is required in order to get libvirt compile the driver for libxl. -The patch tries to mimick the approach taken for the other libraries. - -Signed-off-by: Stefan Bader - -Index: xen-4.3.0/tools/Rules.mk -=================================================================== ---- xen-4.3.0.orig/tools/Rules.mk 2013-07-12 12:39:10.271720245 +0200 -+++ xen-4.3.0/tools/Rules.mk 2013-07-12 12:39:37.451853123 +0200 -@@ -51,7 +51,7 @@ endif - - ifeq ($(LIBXL_BLKTAP),y) - CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) --LDLIBS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl -+LDLIBS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl-$(XEN_VERSION) - SHLIB_libblktapctl = -Wl,-rpath-link=$(XEN_BLKTAP2)/control - else - CFLAGS_libblktapctl = -@@ -60,7 +60,7 @@ SHLIB_libblktapctl = - endif - - CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) --LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight.so $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) -+LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight-$(XEN_VERSION).so $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) - SHLIB_libxenlight = -Wl,-rpath-link=$(XEN_XENLIGHT) - - CFLAGS += -D__XEN_TOOLS__ -Index: xen-4.3.0/tools/blktap2/control/Makefile -=================================================================== ---- xen-4.3.0.orig/tools/blktap2/control/Makefile 2013-07-12 12:39:10.215719981 +0200 -+++ xen-4.3.0/tools/blktap2/control/Makefile 2013-07-12 12:39:37.451853123 +0200 -@@ -35,14 +35,14 @@ OBJS = $(CTL_OBJS) tap-ctl.o - PICS = $(CTL_PICS) - - LIB_STATIC = $(LIBNAME).a --LIB_SHARED = $(LIBNAME).so -+LIB_SHARED = $(LIBNAME)-$(XEN_VERSION).so - IBIN = tap-ctl - - all: build - - build: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) - --tap-ctl: tap-ctl.o $(LIBNAME).so -+tap-ctl: tap-ctl.o $(LIBNAME)-$(XEN_VERSION).so - $(CC) $(LDFLAGS) $(call LDFLAGS_RPATH,../lib) -o $@ $^ - - $(LIB_STATIC): $(CTL_OBJS) -@@ -57,7 +57,7 @@ install: $(IBIN) $(LIB_STATIC) $(LIB_SHA - $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_SBINDIR) - $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR) -- $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR) - - clean: - rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED) -Index: xen-4.3.0/tools/libxl/Makefile -=================================================================== ---- xen-4.3.0.orig/tools/libxl/Makefile 2013-07-12 12:39:10.235720073 +0200 -+++ xen-4.3.0/tools/libxl/Makefile 2013-07-12 12:39:37.451853123 +0200 -@@ -103,7 +103,7 @@ testidl.c: libxl_types.idl gentest.py li - mv testidl.c.new testidl.c - - .PHONY: all --all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ -+all: $(CLIENTS) libxenlight-$(XEN_VERSION).so libxenlight.a libxlutil.so libxlutil.a \ - $(AUTOSRCS) $(AUTOINCS) - - $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): \ -@@ -160,7 +160,7 @@ _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: $(LIBXL_OBJS) -+libxenlight-$(XEN_VERSION).so: $(LIBXL_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(LDFLAGS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) - - libxenlight.a: $(LIBXL_OBJS) -@@ -172,13 +172,13 @@ libxlutil.so: $(LIBXLU_OBJS) - libxlutil.a: $(LIBXLU_OBJS) - $(AR) rcs libxlutil.a $^ - --xl: $(XL_OBJS) libxlutil.so libxenlight.so -+xl: $(XL_OBJS) libxlutil.so libxenlight-$(XEN_VERSION).so - $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) - --libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so -+libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight-$(XEN_VERSION).so - $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) - --testidl: testidl.o libxlutil.so libxenlight.so -+testidl: testidl.o libxlutil.so libxenlight-$(XEN_VERSION).so - $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) - - .PHONY: install -@@ -192,7 +192,9 @@ install: all - $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) -- $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(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 $(DESTDIR)$(PRIVATE_LIBDIR) - $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) diff -Nru xen-4.3.0/debian/patches/upstream-25290:7a6dcecb1781-rework xen-4.3.0/debian/patches/upstream-25290:7a6dcecb1781-rework --- xen-4.3.0/debian/patches/upstream-25290:7a6dcecb1781-rework 1970-01-01 01:00:00.000000000 +0100 +++ xen-4.3.0/debian/patches/upstream-25290:7a6dcecb1781-rework 2012-07-01 16:35:01.000000000 +0100 @@ -0,0 +1,78 @@ +--- 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)); diff -Nru xen-4.3.0/debian/patches/version.patch xen-4.3.0/debian/patches/version.patch --- xen-4.3.0/debian/patches/version.patch 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/patches/version.patch 2013-07-23 13:51:13.000000000 +0100 @@ -5,11 +5,37 @@ ## DP: No description. @DPATCH@ -Index: xen-4.3.0~rc4+38+gb03165b/xen/common/kernel.c -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/xen/common/kernel.c 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/xen/common/kernel.c 2013-06-17 16:49:28.075884999 +0200 -@@ -226,8 +226,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL +--- a/xen/Makefile ++++ b/xen/Makefile +@@ -116,20 +116,19 @@ + @rm -f $@1 $@2 + + # 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 +- @grep \" .banner >> $@.new +- @grep -v \" .banner + @mv -f $@.new $@ + + include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s +--- a/xen/common/kernel.c ++++ b/xen/common/kernel.c +@@ -226,8 +226,8 @@ { struct xen_compile_info info; safe_strcpy(info.compiler, xen_compiler()); @@ -20,11 +46,9 @@ safe_strcpy(info.compile_date, xen_compile_date()); if ( copy_to_guest(arg, &info, 1) ) return -EFAULT; -Index: xen-4.3.0~rc4+38+gb03165b/xen/common/version.c -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/xen/common/version.c 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/xen/common/version.c 2013-06-17 16:49:28.075884999 +0200 -@@ -11,19 +11,24 @@ const char *xen_compile_time(void) +--- a/xen/common/version.c ++++ b/xen/common/version.c +@@ -11,19 +11,24 @@ return XEN_COMPILE_TIME; } @@ -55,7 +79,7 @@ } const char *xen_compiler(void) -@@ -51,7 +56,3 @@ const char *xen_changeset(void) +@@ -51,7 +56,3 @@ return XEN_CHANGESET; } @@ -63,11 +87,9 @@ -{ - return XEN_BANNER; -} -Index: xen-4.3.0~rc4+38+gb03165b/xen/drivers/char/console.c -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/xen/drivers/char/console.c 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/xen/drivers/char/console.c 2013-06-17 16:55:34.789677772 +0200 -@@ -608,14 +608,12 @@ void __init console_init_preirq(void) +--- a/xen/drivers/char/console.c ++++ b/xen/drivers/char/console.c +@@ -608,14 +608,11 @@ serial_set_rx_handler(sercon_handle, serial_rx); /* HELLO WORLD --- start-of-day banner text. */ @@ -79,17 +101,14 @@ 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_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.3.0~rc4+38+gb03165b/xen/include/xen/compile.h.in -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/xen/include/xen/compile.h.in 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/xen/include/xen/compile.h.in 2013-06-17 16:49:28.079885019 +0200 +--- a/xen/include/xen/compile.h.in ++++ b/xen/include/xen/compile.h.in @@ -1,8 +1,9 @@ #define XEN_COMPILE_DATE "@@date@@" #define XEN_COMPILE_TIME "@@time@@" @@ -108,10 +127,8 @@ #define XEN_CHANGESET "@@changeset@@" -#define XEN_BANNER \ -Index: xen-4.3.0~rc4+38+gb03165b/xen/include/xen/version.h -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/xen/include/xen/version.h 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/xen/include/xen/version.h 2013-06-17 16:49:28.079885019 +0200 +--- a/xen/include/xen/version.h ++++ b/xen/include/xen/version.h @@ -3,14 +3,14 @@ const char *xen_compile_date(void); @@ -131,33 +148,3 @@ -const char *xen_banner(void); #endif /* __XEN_VERSION_H__ */ -Index: xen-4.3.0~rc4+38+gb03165b/xen/Makefile -=================================================================== ---- xen-4.3.0~rc4+38+gb03165b.orig/xen/Makefile 2013-06-16 21:22:09.000000000 +0200 -+++ xen-4.3.0~rc4+38+gb03165b/xen/Makefile 2013-06-17 17:01:53.667530016 +0200 -@@ -116,20 +116,19 @@ delete-unfresh-files: - @rm -f $@1 $@2 - - # 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 -- @grep \" .banner >> $@.new -- @grep -v \" .banner - @mv -f $@.new $@ - - include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s diff -Nru xen-4.3.0/debian/.pc/.quilt_patches xen-4.3.0/debian/.pc/.quilt_patches --- xen-4.3.0/debian/.pc/.quilt_patches 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/.pc/.quilt_patches 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -patches diff -Nru xen-4.3.0/debian/.pc/.quilt_series xen-4.3.0/debian/.pc/.quilt_series --- xen-4.3.0/debian/.pc/.quilt_series 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/.pc/.quilt_series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -series diff -Nru xen-4.3.0/debian/.pc/.version xen-4.3.0/debian/.pc/.version --- xen-4.3.0/debian/.pc/.version 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/.pc/.version 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -2 diff -Nru xen-4.3.0/debian/rules xen-4.3.0/debian/rules --- xen-4.3.0/debian/rules 2013-07-25 08:07:02.000000000 +0100 +++ xen-4.3.0/debian/rules 2013-07-23 13:42:16.000000000 +0100 @@ -8,26 +8,21 @@ SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p') VERSION_BINNMU := $(shell echo "$(DEB_VERSION)" | sed -ne 's,.*\+b\(.*\)$$,\1,p') -stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@ - include debian/rules.defs setup: debian/control dh_testdir $(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH) - @$(stamp) build: build-arch build-indep build-arch: setup dh_testdir $(MAKE) -f debian/rules.gen build-arch_$(DEB_HOST_ARCH) - @$(stamp) build-indep: setup dh_testdir $(MAKE) -f debian/rules.gen build-indep - @$(stamp) maintainerclean: rm -f debian/control* debian/rules.gen debian/xen-hypervisor-* debian/xen-utils-[0-9]* diff -Nru xen-4.3.0/debian/rules.defs xen-4.3.0/debian/rules.defs --- xen-4.3.0/debian/rules.defs 2013-07-17 13:59:36.000000000 +0100 +++ xen-4.3.0/debian/rules.defs 2013-09-05 12:59:08.000000000 +0100 @@ -1,4 +1,4 @@ -KERNELVERSION := 3.9-1 +KERNELVERSION := 3.10-2 BUILD_DIR = debian/build STAMPS_DIR = debian/stamps TEMPLATES_DIR = debian/templates diff -Nru xen-4.3.0/debian/rules.real xen-4.3.0/debian/rules.real --- xen-4.3.0/debian/rules.real 2013-08-15 09:25:42.000000000 +0100 +++ xen-4.3.0/debian/rules.real 2013-10-01 10:24:05.000000000 +0100 @@ -8,17 +8,6 @@ MAKE_CLEAN = $(setup_env) $(MAKE) V=1 MAKE_SELF = $(MAKE) -f debian/rules.real -# Ubuntu passes LDFLAGS suitable for gcc by default (-Wl prefix) but -# Xen passes LDFLAGS directly to ld (not through gcc), so this fails. -# Strip the prefix from the LDFLAGS and store in LDFLAGS_DIRECT. -# This used to be set in debian/rules but including default.mk above -# would change it. And on older releases again break the build. So make -# sure that LDFLAGS is not exported. -LDFLAGS_DIRECT = $(shell dpkg-buildflags --get LDFLAGS|sed -e 's/-Wl,//g' -e 's/\(-.*\),/\1 /g') -export LDFLAGS_DIRECT -export CFLAGS -unexport LDFLAGS - include debian/rules.defs stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@ @@ -34,7 +23,6 @@ endif binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR) -binary-indep: install-docs binary-indep: install-utils-common build-arch-arch: $(STAMPS_DIR)/build-utils_$(ARCH) @@ -51,7 +39,10 @@ @rm -rf $(DIR) mkdir -p $(DIR) cp -al $(SOURCE_FILES) $(DIR) - cd $(DIR); WGET="/bin/false" ./configure --prefix=/usr + cd $(DIR)/docs; ./configure --prefix=/usr + cd $(DIR)/tools; \ + WGET=/bin/false \ + ./configure --prefix=/usr @$(stamp) $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): SOURCE_FILES = $(filter-out debian, $(wildcard *)) @@ -69,7 +60,16 @@ @rm -rf $(DIR) mkdir -p $(DIR) cp -al $(SOURCE_FILES) $(DIR) - cd $(DIR); WGET="/bin/false" ./configure --prefix=/usr + cd $(DIR)/tools; \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ + WGET=/bin/false \ + ./configure \ + --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 @@ -139,17 +139,6 @@ dh_prep +$(MAKE_SELF) install-base -install-docs: SOURCE_DIR = $(BUILD_DIR)/build-docs -install-docs: DIR = $(BUILD_DIR)/install-docs -install-docs: PACKAGE_NAME = xen-docs-$(VERSION) -install-docs: DH_OPTIONS = -p$(PACKAGE_NAME) -install-docs: $(STAMPS_DIR)/build-docs - dh_testdir - dh_testroot - dh_prep - +$(MAKE_CLEAN) -C $(SOURCE_DIR)/docs install DESTDIR=$(CURDIR)/$(DIR) - +$(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) @@ -159,8 +148,6 @@ dh_prep dh_installdirs boot cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).gz - # Where should I put that best? - # cp $(DIR)/xen/xen.efi debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).efi +$(MAKE_SELF) install-base install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) @@ -169,8 +156,7 @@ dh_testdir dh_testroot dh_prep - dh_install --sourcedir=$(DIR) usr/lib/libxen*-$(VERSION).so - # dh_install --sourcedir=$(DIR) usr/lib/libblktapctl-$(VERSION).so + dh_install --sourcedir=$(DIR) usr/lib/lib*-$(VERSION).so dh_strip dh_makeshlibs -V dh_shlibdeps diff -Nru xen-4.3.0/debian/templates/control.hypervisor.in xen-4.3.0/debian/templates/control.hypervisor.in --- xen-4.3.0/debian/templates/control.hypervisor.in 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/templates/control.hypervisor.in 2013-07-23 13:50:26.000000000 +0100 @@ -2,7 +2,6 @@ Depends: ${misc:Depends} Provides: xen-hypervisor, xen-hypervisor-@version@, xen-hypervisor@localversion@ Recommends: xen-utils-@version@ -Suggests: xen-docs-@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 diff -Nru xen-4.3.0/debian/templates/control.main.in xen-4.3.0/debian/templates/control.main.in --- xen-4.3.0/debian/templates/control.main.in 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/templates/control.main.in 2013-07-23 13:50:26.000000000 +0100 @@ -1,12 +1,3 @@ -Package: xen-docs-@version@ -Depends: ${misc:Depends} -Section: doc -Architecture: all -Description: Documentation for Xen - This package contains all the large documentation files for Xen. This - includes a description interface (both the API, and a nice explanation of - how XEN works). - Package: libxen-@version@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} diff -Nru xen-4.3.0/debian/templates/control.source.in xen-4.3.0/debian/templates/control.source.in --- xen-4.3.0/debian/templates/control.source.in 2013-07-17 14:02:38.000000000 +0100 +++ xen-4.3.0/debian/templates/control.source.in 2013-08-11 21:30:59.000000000 +0100 @@ -27,12 +27,6 @@ ocaml-nox, dh-ocaml, ocaml-findlib -Build-Depends-Indep: - graphviz, - ghostscript, - texlive-fonts-recommended, - texlive-font-utils, - texlive-latex-recommended -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 XS-Python-Version: current diff -Nru xen-4.3.0/debian/templates/control.utils.in xen-4.3.0/debian/templates/control.utils.in --- xen-4.3.0/debian/templates/control.utils.in 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/templates/control.utils.in 2013-07-28 12:58:40.000000000 +0100 @@ -1,8 +1,7 @@ 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-keymaps, qemu-utils +Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-@version@, qemu-system-x86 Provides: xen-utils -Suggests: xen-docs-@version@ Built-Using: ${misc:Built-Using} Description: XEN administrative tools The userspace tools to manage a system virtualized through the XEN virtual diff -Nru xen-4.3.0/debian/xen-utils-common.xendomains.init xen-4.3.0/debian/xen-utils-common.xendomains.init --- xen-4.3.0/debian/xen-utils-common.xendomains.init 2013-07-09 16:42:44.000000000 +0100 +++ xen-4.3.0/debian/xen-utils-common.xendomains.init 2013-10-01 10:28:17.000000000 +0100 @@ -17,12 +17,6 @@ . /lib/init/vars.sh . /lib/lsb/init-functions -xen list &> /dev/null -if test $? -ne 0 -then - 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" @@ -32,6 +26,12 @@ exit 0 fi +xen list &> /dev/null +if test $? -ne 0 +then + exit 0; +fi + if ! [ -e /proc/xen/privcmd ]; then exit 0 fi diff -Nru xen-4.3.0/debian/xen-utils-common.xen.init xen-4.3.0/debian/xen-utils-common.xen.init --- xen-4.3.0/debian/xen-utils-common.xen.init 2013-07-10 13:23:53.000000000 +0100 +++ xen-4.3.0/debian/xen-utils-common.xen.init 2013-07-28 12:54:52.000000000 +0100 @@ -61,6 +61,13 @@ return 0 } +env_setup() +{ + [ -d /run/xen ] && return 0 + + mkdir -m 700 /run/xen +} + xend_start() { if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then @@ -192,10 +199,6 @@ case "$1" in start) log_daemon_msg "Starting $DESC" - if [ ! -d /var/run/xen ]; then - mkdir /var/run/xen - chgrp adm /var/run/xen - fi modules_setup xenfs_setup case "$?" in @@ -207,6 +210,7 @@ 0) ;; *) log_end_msg 255; exit ;; esac + env_setup xenstored_start case "$?" in 0|1) ;;