diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2014-10-15 01:40:58 +0000 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2014-10-15 01:40:58 +0000 |
| commit | 152022e3c1b511481f0c6dcda7cea1b4aa7a95a0 (patch) | |
| tree | c53c591f5d4f6a22cb8e65789677e57a01fee415 /app-emulation/xen-tools | |
| parent | add py3.4 pypy support, keyword ~x86 (diff) | |
| download | gentoo-2-152022e3c1b511481f0c6dcda7cea1b4aa7a95a0.tar.gz gentoo-2-152022e3c1b511481f0c6dcda7cea1b4aa7a95a0.tar.bz2 gentoo-2-152022e3c1b511481f0c6dcda7cea1b4aa7a95a0.zip | |
clean old version, also patches move to devspace
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Diffstat (limited to 'app-emulation/xen-tools')
34 files changed, 8 insertions, 4061 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index 479f899efcb7..f7d1ac56c109 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.262 2014/10/14 13:15:40 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.263 2014/10/15 01:40:58 dlan Exp $ + + 15 Oct 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.4-r6.ebuild, + -xen-tools-4.2.4-r7.ebuild, -xen-tools-4.2.5.ebuild, + -xen-tools-4.3.2-r5.ebuild, -xen-tools-4.3.2-r6.ebuild, + -xen-tools-4.3.3.ebuild, + -files/*.patch, + clean old version, also patches move to devspace 14 Oct 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r1.ebuild: Stable for x86, wrt bug #524200 diff --git a/app-emulation/xen-tools/files/fix-gold-ld.patch b/app-emulation/xen-tools/files/fix-gold-ld.patch deleted file mode 100644 index 654eb257b6f1..000000000000 --- a/app-emulation/xen-tools/files/fix-gold-ld.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile -index cbd60b4..d2b83dd 100644 ---- a/tools/libfsimage/common/Makefile -+++ b/tools/libfsimage/common/Makefile -@@ -5,7 +5,7 @@ MAJOR = 1.0 - MINOR = 0 - - LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS --LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU -+LDFLAGS-$(CONFIG_Linux) = - LDFLAGS = $(LDFLAGS-y) - - CFLAGS += $(PTHREAD_CFLAGS) - diff --git a/app-emulation/xen-tools/files/ipxe-nopie.patch b/app-emulation/xen-tools/files/ipxe-nopie.patch deleted file mode 100644 index c5be735f1e35..000000000000 --- a/app-emulation/xen-tools/files/ipxe-nopie.patch +++ /dev/null @@ -1,29 +0,0 @@ -2011-10-22 Ralf Glauberman <ralfglauberman@gmx.de> - - #360805 Don't compile ipxe with pie on hardened. - * /tools/firmware/etherboot/patches/ipxe-nopie.patche New patch - * /tools/firmware/etherboot/patches/series Add ipxe-nopie.patch - ---- a/tools/firmware/etherboot/patches/ipxe-nopie.patch 1970-01-01 01:00:00.000000000 +0100 -+++ b/tools/firmware/etherboot/patches/ipxe-nopie.patch 2011-03-27 17:45:13.929697782 +0200 -@@ -0,0 +1,11 @@ -+--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200 -++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200 -+@@ -4,7 +4,7 @@ -+ # -+ -+ CLEANUP := -+-CFLAGS := -++CFLAGS := -nopie -+ ASFLAGS := -+ LDFLAGS := -+ MAKEDEPS := Makefile ---- a/tools/firmware/etherboot/patches/series 2011-03-25 11:42:50.000000000 +0100 -+++ b/tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200 -@@ -1,4 +1,5 @@ - boot_prompt_option.patch - build_fix_1.patch - build_fix_2.patch - build_fix_3.patch -+ipxe-nopie.patch - diff --git a/app-emulation/xen-tools/files/qemu-bridge.patch b/app-emulation/xen-tools/files/qemu-bridge.patch deleted file mode 100644 index a63f081e8734..000000000000 --- a/app-emulation/xen-tools/files/qemu-bridge.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -ur xen-4.3.0.orig/tools/qemu-xen/.gitignore xen-4.3.0/tools/qemu-xen/.gitignore ---- tools/qemu-xen/.gitignore 2013-06-28 19:23:16.000000000 +0800 -+++ tools/qemu-xen/.gitignore 2013-07-26 23:05:24.487998947 +0800 -@@ -37,7 +37,7 @@ - qemu-img-cmds.h - qemu-io - qemu-ga --qemu-bridge-helper -+xen-bridge-helper - qemu-monitor.texi - vscclient - QMP/qmp-commands.txt -diff -ur xen-4.3.0.orig/tools/qemu-xen/Makefile xen-4.3.0/tools/qemu-xen/Makefile ---- tools/qemu-xen/Makefile 2013-06-28 19:23:16.000000000 +0800 -+++ tools/qemu-xen/Makefile 2013-07-26 23:03:35.800991899 +0800 -@@ -50,7 +50,7 @@ - - LIBS+=-lz $(LIBS_TOOLS) - --HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) -+HELPERS-$(CONFIG_LINUX) = xen-bridge-helper$(EXESUF) - - ifdef BUILD_DOCS - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt -@@ -195,7 +195,7 @@ - qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) libqemustub.a - qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemustub.a - --qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o -+xen-bridge-helper$(EXESUF): xen-bridge-helper.o - - vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a - $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") -diff -ur xen-4.3.0.orig/tools/qemu-xen/net.h xen-4.3.0/tools/qemu-xen/net.h ---- tools/qemu-xen/net.h 2013-06-28 19:23:16.000000000 +0800 -+++ tools/qemu-xen/net.h 2013-07-26 23:05:01.823997477 +0800 -@@ -163,7 +163,7 @@ - - #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" - #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" --#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" -+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - - void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); -diff -ur xen-4.3.0.orig/tools/qemu-xen/qemu-bridge-helper.c xen-4.3.0/tools/qemu-xen/qemu-bridge-helper.c ---- tools/qemu-xen/qemu-bridge-helper.c 2013-06-28 19:23:16.000000000 +0800 -+++ tools/qemu-xen/qemu-bridge-helper.c 2013-07-26 23:04:11.880994239 +0800 -@@ -67,7 +67,7 @@ - static void usage(void) - { - fprintf(stderr, -- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); -+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); - } - - static int parse_acl_file(const char *filename, ACLList *acl_list) -diff -ur xen-4.3.0.orig/tools/qemu-xen/qemu-options.hx xen-4.3.0/tools/qemu-xen/qemu-options.hx ---- tools/qemu-xen/qemu-options.hx 2013-06-28 19:23:16.000000000 +0800 -+++ tools/qemu-xen/qemu-options.hx 2013-07-26 23:05:17.239998477 +0800 -@@ -1560,7 +1560,7 @@ - - If running QEMU as an unprivileged user, use the network helper - @var{helper} to configure the TAP interface. The default network --helper executable is @file{/usr/local/libexec/qemu-bridge-helper}. -+helper executable is @file{/usr/local/libexec/xen-bridge-helper}. - - @option{fd}=@var{h} can be used to specify the handle of an already - opened host TAP interface. -@@ -1584,7 +1584,7 @@ - #launch a QEMU instance with the default network helper to - #connect a TAP device to bridge br0 - qemu-system-i386 linux.img \ -- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper" -+ -net nic -net tap,"helper=/usr/local/libexec/xen-bridge-helper" - @end example - - @item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}] -@@ -1593,7 +1593,7 @@ - - Use the network helper @var{helper} to configure the TAP interface and - attach it to the bridge. The default network helper executable is --@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge -+@file{/usr/local/libexec/xen-bridge-helper} and the default bridge - device is @file{br0}. - - Examples: diff --git a/app-emulation/xen-tools/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-tools/files/xen-4-fix_dotconfig-gcc.patch deleted file mode 100644 index 4e08a30f323e..000000000000 --- a/app-emulation/xen-tools/files/xen-4-fix_dotconfig-gcc.patch +++ /dev/null @@ -1,245 +0,0 @@ -# Fix gcc-4.6 -diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk ---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 -+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 -@@ -6,7 +6,7 @@ - - # Define some default flags. - # NB. '-Wcast-qual' is nasty, so I omitted it. --DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls -+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls - DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) - DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) - DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline -diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile ---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 -+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 -@@ -73,7 +73,7 @@ - - -include $(XEN_TARGET_ARCH)/Makefile - --CFLAGS += -Werror -Wmissing-prototypes -+CFLAGS += -Wmissing-prototypes - CFLAGS += -I. $(CFLAGS_xeninclude) - - # Needed for posix_fadvise64() in xc_linux.c -# Drop .config -diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk ---- Config.mk 2012-09-17 18:23:12.000000000 +0800 -+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 -@@ -7,7 +7,6 @@ Drop .config - # fallback for older make - realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) - ---include $(XEN_ROOT)/.config - - # A debug build of Xen and tools? - debug ?= n -@@ -24,7 +24,7 @@ - - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist -@@ -156,7 +156,7 @@ - - CFLAGS += -std=gnu99 - --CFLAGS += -Wall -Wstrict-prototypes -+CFLAGS += -Wstrict-prototypes - - # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' - # and is over-zealous with the printf format lint -diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile ---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800 -+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800 -@@ -9,7 +9,7 @@ - LOCK_UTIL = lock-util - INST_DIR = $(SBINDIR) - --CFLAGS += -Werror -g -+CFLAGS += -g - CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing - CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers -diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk ---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800 -+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800 -@@ -1,4 +1,4 @@ - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -Wmissing-prototypes -+CFLAGS += -Wmissing-prototypes - # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion -diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile ---- tools/debugger/xenitp/Makefile 2012-12-17 23:00:22.000000000 +0800 -+++ tools/debugger/xenitp/Makefile 2013-01-30 12:31:43.516941098 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk - --#CFLAGS += -Werror -g -O0 -+#CFLAGS += -g -O0 - - CFLAGS += $(CFLAGS_libxenctrl) - -diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile ---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800 -+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800 -@@ -4,7 +4,7 @@ - HARNESS_SRCS:=main.c - # io_queue.c - --CFLAGS=-Wall -Werror -g -O -laio -+CFLAGS=-Wall -g -O -laio - #-lpthread -lrt - - all: $(PROGS) -diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk ---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800 -+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800 -@@ -1,7 +1,7 @@ - include $(XEN_ROOT)/tools/Rules.mk - - CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" --CFLAGS += -Werror -D_GNU_SOURCE -+CFLAGS += -D_GNU_SOURCE - LDFLAGS += -L../common/ - - PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile ---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800 -+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800 -@@ -11,7 +11,7 @@ - XLUMAJOR = 1.0 - XLUMINOR = 1 - --CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ - -Wno-declaration-after-statement -Wformat-nonliteral - CFLAGS += -I. -fPIC - -diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile ---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800 -+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800 -@@ -9,7 +9,7 @@ - - .PHONY : all clean build-all - --CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin -+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin - CFLAGS += -I$(SRC_PATH) - CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) - QEMU_CFLAGS = $(CFLAGS) -diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk ---- tools/vtpm/Rules.mk 2012-12-17 23:01:35.000000000 +0800 -+++ tools/vtpm/Rules.mk 2013-01-30 12:31:43.515941097 +0800 -@@ -6,7 +6,7 @@ - # - - # General compiler flags --CFLAGS = -Werror -g3 -+CFLAGS = -g3 - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk ---- tools/vtpm_manager/Rules.mk 2012-12-17 23:01:35.000000000 +0800 -+++ tools/vtpm_manager/Rules.mk 2013-01-30 12:31:43.511941097 +0800 -@@ -6,7 +6,7 @@ - # - - # General compiler flags --CFLAGS = -Werror -g3 -+CFLAGS = -g3 - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile ---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800 -@@ -18,7 +18,7 @@ - all install xentop: - else - --CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) -+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) - LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) - CFLAGS += -DHOST_$(XEN_OS) - -diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk ---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800 -+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800 -@@ -9,7 +9,7 @@ - HAS_DEVICE_TREE := y - - CFLAGS += -fno-builtin -fno-common -Wredundant-decls --CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe -+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe - CFLAGS += -I$(BASEDIR)/include - - # Prevent floating-point variables from creeping into Xen. -diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk ---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800 -+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800 -@@ -24,7 +24,7 @@ - endif - - CFLAGS += -fno-builtin -fno-common -Wredundant-decls --CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe -+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe - CFLAGS += -I$(BASEDIR)/include - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default -diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile ---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800 -+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800 -@@ -78,7 +78,7 @@ - all: headers.chk - - headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile -- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new -+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new - mv $@.new $@ - - endif -diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile ---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenguest) - CFLAGS += $(CFLAGS_libxenstore) -diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile ---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_xeninclude) -diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile ---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenguest) - diff --git a/app-emulation/xen-tools/files/xen-4-ulong.patch b/app-emulation/xen-tools/files/xen-4-ulong.patch deleted file mode 100644 index 443e321d344c..000000000000 --- a/app-emulation/xen-tools/files/xen-4-ulong.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur xen-4.2.2.orig/tools/debugger/gdbsx/xg/xg_main.c xen-4.2.2/tools/debugger/gdbsx/xg/xg_main.c ---- tools/debugger/gdbsx/xg/xg_main.c 2013-04-24 00:42:55.000000000 +0800 -+++ tools/debugger/gdbsx/xg/xg_main.c 2013-05-16 00:22:39.263704336 +0800 -@@ -50,6 +50,7 @@ - #include "xg_public.h" - #include <xen/version.h> - #include <xen/domctl.h> -+#include <sys/types.h> - #include <xen/sys/privcmd.h> - #include <xen/foreign/x86_32.h> - #include <xen/foreign/x86_64.h> diff --git a/app-emulation/xen-tools/files/xen-4.2-configsxp.patch b/app-emulation/xen-tools/files/xen-4.2-configsxp.patch deleted file mode 100644 index 4c159c17a0a4..000000000000 --- a/app-emulation/xen-tools/files/xen-4.2-configsxp.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur xen-4.2.1.orig/tools/examples/xend-config.sxp xen-4.2.1/tools/examples/xend-config.sxp ---- tools/examples/xend-config.sxp 2012-12-17 23:00:23.000000000 +0800 -+++ tools/examples/xend-config.sxp 2013-06-27 21:32:50.198221774 +0800 -@@ -200,7 +200,7 @@ - #(network-script network-nat) - #(vif-script vif-nat) - --# dom0-min-mem is the lowest permissible memory level (in MB) for dom0. -+# dom0-min-mem is the lowest permissible memory level (in kb) for dom0. - # This is a minimum both for auto-ballooning (as enabled by - # enable-dom0-ballooning below) and for xm mem-set when applied to dom0. - (dom0-min-mem 196) -diff -ur xen-4.2.1.orig/tools/python/xen/xend/tests/xend-config.sxp xen-4.2.1/tools/python/xen/xend/tests/xend-config.sxp ---- tools/python/xen/xend/tests/xend-config.sxp 2012-12-17 23:01:27.000000000 +0800 -+++ tools/python/xen/xend/tests/xend-config.sxp 2013-06-27 21:32:02.726225130 +0800 -@@ -116,7 +116,7 @@ - - - # Dom0 will balloon out when needed to free memory for domU. --# dom0-min-mem is the lowest memory level (in MB) dom0 will get down to. -+# dom0-min-mem is the lowest memory level (in kb) dom0 will get down to. - # If dom0-min-mem=0, dom0 will never balloon out. - (dom0-min-mem 196) - diff --git a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch deleted file mode 100644 index d42080c767d3..000000000000 --- a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile ---- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 -+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 -@@ -14,13 +14,13 @@ - .PHONY: blowfish.h - blowfish.h: - rm -f blowfish.bin -- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all -+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all - (echo "static unsigned int blowfish32_code[] = {"; \ - od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ - echo "};") >$@ - rm -f blowfish.bin - ifeq ($(XEN_COMPILE_ARCH),x86_64) -- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all -+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all - (echo "static unsigned int blowfish64_code[] = {"; \ - od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ - echo "};") >>$@ - diff --git a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch deleted file mode 100644 index de06279bd33c..000000000000 --- a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile ---- tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800 -+++ tools/qemu-xen-traditional/Makefile 2012-11-22 06:12:29.433599695 +0800 -@@ -243,7 +243,7 @@ - install: all $(if $(BUILD_DOCS),install-doc) - mkdir -p "$(DESTDIR)$(bindir)" - ifneq ($(TOOLS),) -- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" -+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" - endif - ifneq ($(BLOBS),) - mkdir -p "$(DESTDIR)$(datadir)" -diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target ---- tools/qemu-xen-traditional/Makefile.target 2012-09-07 00:05:30.000000000 +0800 -+++ tools/qemu-xen-traditional/Makefile.target 2012-11-22 06:26:45.302521231 +0800 -@@ -755,7 +755,7 @@ - - install: all install-hook - ifneq ($(PROGS),) -- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" -+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" - endif - - # Include automatically generated dependency files -diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target ---- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800 -+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800 -@@ -437,9 +437,6 @@ - install: all - ifneq ($(PROGS),) - $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" --ifneq ($(STRIP),) -- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) --endif - endif - ifdef CONFIG_TRACE_SYSTEMTAP - ifdef CONFIG_TRACE_SYSTEMTAP diff --git a/app-emulation/xen-tools/files/xen-4.3-fix_dotconfig-gcc.patch b/app-emulation/xen-tools/files/xen-4.3-fix_dotconfig-gcc.patch deleted file mode 100644 index 4d3fa8d2f01c..000000000000 --- a/app-emulation/xen-tools/files/xen-4.3-fix_dotconfig-gcc.patch +++ /dev/null @@ -1,502 +0,0 @@ -# Fix gcc-4.6 -diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk ---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 -+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 -@@ -6,7 +6,7 @@ - - # Define some default flags. - # NB. '-Wcast-qual' is nasty, so I omitted it. --DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls -+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls - DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) - DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) - DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline -diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile ---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 -+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 -@@ -85,7 +85,7 @@ - - -include $(XEN_TARGET_ARCH)/Makefile - --CFLAGS += -Werror -Wmissing-prototypes -+CFLAGS += -Wmissing-prototypes - CFLAGS += -I. $(CFLAGS_xeninclude) - - # Needed for posix_fadvise64() in xc_linux.c -# Drop .config -diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk ---- Config.mk 2012-09-17 18:23:12.000000000 +0800 -+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 -@@ -7,7 +7,6 @@ Drop .config - # fallback for older make - realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) - ---include $(XEN_ROOT)/.config - - # A debug build of Xen and tools? - debug ?= n -@@ -24,7 +24,7 @@ - - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist -@@ -156,7 +156,7 @@ - - CFLAGS += -std=gnu99 - --CFLAGS += -Wall -Wstrict-prototypes -+CFLAGS += -Wstrict-prototypes - - # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' - # and is over-zealous with the printf format lint -diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile ---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800 -+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800 -@@ -9,7 +9,7 @@ - LOCK_UTIL = lock-util - INST_DIR = $(SBINDIR) - --CFLAGS += -Werror -g -+CFLAGS += -g - CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing - CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers -diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk ---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800 -+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800 -@@ -1,4 +1,4 @@ - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -Wmissing-prototypes -+CFLAGS += -Wmissing-prototypes - # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion -diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile ---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800 -+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800 -@@ -4,7 +4,7 @@ - HARNESS_SRCS:=main.c - # io_queue.c - --CFLAGS=-Wall -Werror -g -O -laio -+CFLAGS=-Wall -g -O -laio - #-lpthread -lrt - - all: $(PROGS) -diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk ---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800 -+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800 -@@ -1,7 +1,7 @@ - include $(XEN_ROOT)/tools/Rules.mk - - CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" --CFLAGS += -Werror -D_GNU_SOURCE -+CFLAGS += -D_GNU_SOURCE - LDFLAGS += -L../common/ - - PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile ---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800 -+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800 -@@ -11,7 +11,7 @@ - XLUMAJOR = 1.0 - XLUMINOR = 1 - --CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ - -Wno-declaration-after-statement -Wformat-nonliteral - CFLAGS += -I. -fPIC - -diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile ---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800 -+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800 -@@ -9,7 +9,7 @@ - - .PHONY : all clean build-all - --CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin -+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin - CFLAGS += -I$(SRC_PATH) - CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) - QEMU_CFLAGS = $(CFLAGS) -diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile ---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800 -@@ -18,7 +18,7 @@ - all install xentop: - else - --CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) -+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) - LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) - CFLAGS += -DHOST_$(XEN_OS) - -diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk ---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800 -+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800 -@@ -9,7 +9,7 @@ - HAS_DEVICE_TREE := y - - CFLAGS += -fno-builtin -fno-common -Wredundant-decls --CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe -+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe - CFLAGS += -I$(BASEDIR)/include - - # Prevent floating-point variables from creeping into Xen. -diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk ---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800 -+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800 -@@ -24,7 +24,7 @@ - endif - - CFLAGS += -fno-builtin -fno-common -Wredundant-decls --CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe -+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe - CFLAGS += -I$(BASEDIR)/include - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default -diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile ---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800 -+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800 -@@ -78,7 +78,7 @@ - all: headers.chk - - headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile -- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new -+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new - mv $@.new $@ - - endif -diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile ---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenguest) - CFLAGS += $(CFLAGS_libxenstore) -diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile ---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_xeninclude) -diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile ---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800 -+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenguest) -diff -ur xen-4.3.0.orig/tools/firmware/Rules.mk xen-4.3.0/tools/firmware/Rules.mk ---- tools/firmware/Rules.mk 2013-07-09 18:46:56.000000000 +0800 -+++ ttools/firmware/Rules.mk 2013-07-20 20:28:57.811836505 +0800 -@@ -11,8 +11,6 @@ - CFLAGS += -DNDEBUG - endif - --CFLAGS += -Werror -- - $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) - - # Extra CFLAGS suitable for an embedded type of environment. -diff -ur xen-4.3.0.orig/tools/memshr/Makefile xen-4.3.0/tools/memshr/Makefile ---- tools/memshr/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/memshr/Makefile 2013-07-22 23:04:20.165369499 +0800 -@@ -3,7 +3,6 @@ - - LIBMEMSHR-BUILD := libmemshr.a - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += $(CFLAGS_xeninclude) - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-4.3.0.orig/tools/misc/Makefile xen-4.3.0/tools/misc/Makefile ---- tools/misc/Makefile 2013-07-22 23:01:09.019357104 +0800 -+++ tools/misc/Makefile 2013-07-22 23:03:43.645367131 +0800 -@@ -1,8 +1,6 @@ - XEN_ROOT=$(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -- - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_xeninclude) - CFLAGS += $(CFLAGS_libxenstore) -diff -ur xen-4.3.0.orig/tools/xenpaging/Makefile xen-4.3.0/tools/xenpaging/Makefile ---- tools/xenpaging/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/xenpaging/Makefile 2013-07-22 23:04:51.893371557 +0800 -@@ -11,7 +11,6 @@ - SRCS += file_ops.c xenpaging.c policy_$(POLICY).c - SRCS += pagein.c - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -g - -diff -ur xen-4.3.0.orig/tools/xenpmd/Makefile xen-4.3.0/tools/xenpmd/Makefile ---- tools/xenpmd/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/xenpmd/Makefile 2013-07-22 23:05:13.357372949 +0800 -@@ -1,7 +1,6 @@ - XEN_ROOT=$(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror - CFLAGS += $(CFLAGS_libxenstore) - - LDLIBS += $(LDLIBS_libxenstore) - -diff -ur xen-4.3.0.orig/tools/blktap2/control/Makefile xen-4.3.0/tools/blktap2/control/Makefile ---- tools/blktap2/control/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/blktap2/control/Makefile 2013-07-22 23:31:55.225476829 +0800 -@@ -8,7 +8,6 @@ - - IBIN = tap-ctl - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -I../include -I../drivers - CFLAGS += $(CFLAGS_xeninclude) -diff -ur xen-4.3.0.orig/tools/blktap2/lvm/Makefile xen-4.3.0/tools/blktap2/lvm/Makefile ---- tools/blktap2/lvm/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/blktap2/lvm/Makefile 2013-07-22 23:31:02.329473398 +0800 -@@ -6,7 +6,6 @@ - TEST := lvm-util - endif - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -I../include - CFLAGS += -D_GNU_SOURCE -diff -ur xen-4.3.0.orig/tools/blktap2/vhd/lib/Makefile xen-4.3.0/tools/blktap2/vhd/lib/Makefile ---- tools/blktap2/vhd/lib/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/blktap2/vhd/lib/Makefile 2013-07-22 23:32:23.889478688 +0800 -@@ -12,7 +12,6 @@ - - INST-DIR = $(LIBDIR) - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -I../../include - CFLAGS += -D_GNU_SOURCE -diff -ur xen-4.3.0.orig/tools/blktap2/vhd/Makefile xen-4.3.0/tools/blktap2/vhd/Makefile ---- tools/blktap2/vhd/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/blktap2/vhd/Makefile 2013-07-22 23:31:21.641474651 +0800 -@@ -8,7 +8,6 @@ - IBIN = vhd-util vhd-update - INST_DIR = $(SBINDIR) - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -I../include - CFLAGS += -D_GNU_SOURCE -diff -ur xen-4.3.0.orig/tools/console/Makefile xen-4.3.0/tools/console/Makefile ---- tools/console/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/console/Makefile 2013-07-22 23:30:14.392470290 +0800 -@@ -1,8 +1,6 @@ - XEN_ROOT=$(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -- - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenstore) - LDLIBS += $(LDLIBS_libxenctrl) -diff -ur xen-4.3.0.orig/tools/libxen/Makefile.dist xen-4.3.0/tools/libxen/Makefile.dist ---- tools/libxen/Makefile.dist 2013-07-09 18:46:56.000000000 +0800 -+++ tools/libxen/Makefile.dist 2013-07-22 23:29:08.184465996 +0800 -@@ -22,7 +22,7 @@ - CFLAGS = -Iinclude \ - $(shell xml2-config --cflags) \ - $(shell curl-config --cflags) \ -- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC -+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC - - LDFLAGS = $(shell xml2-config --libs) \ - $(shell curl-config --libs) -diff -ur xen-4.3.0.orig/tools/ocaml/common.make xen-4.3.0/tools/ocaml/common.make ---- tools/ocaml/common.make 2013-07-09 18:46:56.000000000 +0800 -+++ tools/ocaml/common.make 2013-07-22 23:28:35.280463862 +0800 -@@ -9,7 +9,7 @@ - OCAMLYACC ?= ocamlyacc - OCAMLFIND ?= ocamlfind - --CFLAGS += -fPIC -Werror -I$(shell ocamlc -where) -+CFLAGS += -fPIC -I$(shell ocamlc -where) - - OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/\1/p') - OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F -diff -ur xen-4.3.0.orig/tools/python/setup.py xen-4.3.0/tools/python/setup.py ---- tools/python/setup.py 2013-07-09 18:46:56.000000000 +0800 -+++ tools/python/setup.py 2013-07-22 23:32:49.305480336 +0800 -@@ -4,7 +4,7 @@ - - XEN_ROOT = "../.." - --extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] -+extra_compile_args = [ "-fno-strict-aliasing" ] - - PATH_XEN = XEN_ROOT + "/tools/include" - PATH_LIBXC = XEN_ROOT + "/tools/libxc" -diff -ur xen-4.3.0.orig/tools/xcutils/Makefile xen-4.3.0/tools/xcutils/Makefile ---- tools/xcutils/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/xcutils/Makefile 2013-07-22 23:29:45.024468385 +0800 -@@ -13,8 +13,6 @@ - - PROGRAMS = xc_restore xc_save readnotes lsevtchn - --CFLAGS += -Werror -- - CFLAGS_xc_restore.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) - CFLAGS_xc_save.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) - CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -diff -ur xen-4.3.0.orig/tools/xentrace/Makefile xen-4.3.0/tools/xentrace/Makefile ---- tools/xentrace/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/xentrace/Makefile 2013-07-22 23:30:28.216471186 +0800 -@@ -1,8 +1,6 @@ - XEN_ROOT=$(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -- - CFLAGS += $(CFLAGS_libxenctrl) - LDLIBS += $(LDLIBS_libxenctrl) - -diff -ur xen-4.3.0.orig/tools/pygrub/setup.py xen-4.3.0/tools/pygrub/setup.py ---- tools/pygrub/setup.py 2013-07-09 18:46:56.000000000 +0800 -+++ tools/pygrub/setup.py 2013-07-22 23:47:45.664538464 +0800 -@@ -3,7 +3,7 @@ - import os - import sys - --extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] -+extra_compile_args = [ "-fno-strict-aliasing" ] - - XEN_ROOT = "../.." - -diff -ur xen-4.3.0.orig/tools/blktap/drivers/Makefile xen-4.3.0/tools/blktap/drivers/Makefile ---- tools/blktap/drivers/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/blktap/drivers/Makefile 2013-07-23 00:40:47.810744824 +0800 -@@ -4,7 +4,6 @@ - IBIN = blktapctrl tapdisk - QCOW_UTIL = img2qcow qcow2raw qcow-create - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -I../lib - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-4.3.0.orig/tools/blktap/lib/Makefile xen-4.3.0/tools/blktap/lib/Makefile ---- tools/blktap/lib/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/blktap/lib/Makefile 2013-07-23 00:41:56.513749279 +0800 -@@ -13,7 +13,6 @@ - SRCS := - SRCS += xenbus.c blkif.c xs_api.c - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -fPIC - # get asprintf(): -diff -ur xen-4.3.0.orig/tools/configure xen-4.3.0/tools/configure ---- tools/configure 2013-07-09 18:46:56.000000000 +0800 -+++ tools/configure 2013-07-23 00:39:37.435740260 +0800 -@@ -7621,7 +7621,6 @@ - - saved_CPPFLAGS="$CPPFLAGS" - -- CPPFLAGS="$CPPFLAGS -Werror" - ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" - if test "x$ac_cv_header_libutil_h" = x""yes; then : - -diff -ur xen-4.3.0.orig/tools/flask/utils/Makefile xen-4.3.0/tools/flask/utils/Makefile ---- ools/flask/utils/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/flask/utils/Makefile 2013-07-23 00:40:03.929741978 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=$(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Wall -g -Werror -+CFLAGS += -Wall - CFLAGS += $(CFLAGS_libxenctrl) - - TESTDIR = testsuite/tmp -diff -ur xen-4.3.0.orig/tools/misc/lomount/Makefile xen-4.3.0/tools/misc/lomount/Makefile ---- tools/misc/lomount/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/misc/lomount/Makefile 2013-07-23 00:42:05.378749854 +0800 -@@ -1,8 +1,6 @@ - XEN_ROOT=$(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -- - .PHONY: all - all: build - -@@ -20,4 +18,4 @@ - lomount: lomount.o - $(CC) $(CFLAGS) -o $@ $< - ---include $(DEPS) -\ No newline at end of file -+-include $(DEPS) -diff -ur xen-4.3.0.orig/tools/qemu-xen-traditional/configure xen-4.3.0/tools/qemu-xen-traditional/configure ---- tools/qemu-xen-traditional/configure 2013-06-18 00:39:51.000000000 +0800 -+++ tools/qemu-xen-traditional/configure 2013-07-23 00:43:39.570755962 +0800 -@@ -1150,7 +1150,6 @@ - echo "sparse enabled $sparse" - echo "profiler $profiler" - echo "static build $static" --echo "-Werror enabled $werror" - if test "$darwin" = "yes" ; then - echo "Cocoa support $cocoa" - fi -diff -ur xen-4.3.0.orig/tools/xenbackendd/Makefile xen-4.3.0/tools/xenbackendd/Makefile ---- tools/xenbackendd/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/xenbackendd/Makefile 2013-07-23 00:44:16.410758351 +0800 -@@ -12,7 +12,6 @@ - XEN_ROOT=$(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror - CFLAGS += $(CFLAGS_libxenstore) - CPPFLAGS += -DXEN_SCRIPT_DIR="\"$(XEN_SCRIPT_DIR)\"" - LDLIBS += $(LDLIBS_libxenstore) -diff -ur xen-4.3.0.orig/tools/xenmon/Makefile xen-4.3.0/tools/xenmon/Makefile ---- tools/xenmon/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/xenmon/Makefile 2013-07-23 00:44:51.114760602 +0800 -@@ -13,7 +13,6 @@ - XEN_ROOT=$(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror - CFLAGS += $(CFLAGS_libxenctrl) - LDLIBS += $(LDLIBS_libxenctrl) - -diff -ur xen-4.3.0.orig/tools/xenstore/Makefile xen-4.3.0/tools/xenstore/Makefile ---- ools/xenstore/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/xenstore/Makefile 2013-07-23 00:45:25.938762860 +0800 -@@ -4,7 +4,6 @@ - MAJOR = 3.0 - MINOR = 3 - --CFLAGS += -Werror - CFLAGS += -I. - CFLAGS += $(CFLAGS_libxenctrl) - diff --git a/app-emulation/xen-tools/files/xen-4.3-jserver.patch b/app-emulation/xen-tools/files/xen-4.3-jserver.patch deleted file mode 100644 index 514fd0575b23..000000000000 --- a/app-emulation/xen-tools/files/xen-4.3-jserver.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile ---- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 -+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 -@@ -14,13 +14,13 @@ - .PHONY: blowfish.h - blowfish.h: - rm -f blowfish.bin -- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all -+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all - (echo "static unsigned int blowfish32_code[] = {"; \ - od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ - echo "};") >$@ - rm -f blowfish.bin - ifeq ($(XEN_COMPILE_ARCH),x86_64) -- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all -+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all - (echo "static unsigned int blowfish64_code[] = {"; \ - od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ - echo "};") >>$@ - -diff -ur xen-4.2.0.orig/tools/firmware/vgabios/Makefile xen-4.2.0/tools/firmware/vgabios/Makefile ---- tools/firmware/vgabios/Makefile 2013-02-04 13:56:50.973533544 +0800 -+++ tools/firmware/vgabios/Makefile 2013-02-04 13:57:21.380535958 +0800 -@@ -27,7 +27,7 @@ - - .PHONY: release - release: -- VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios -+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios - /bin/rm -f *.o *.s *.ld86 \ - temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#* - cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin diff --git a/app-emulation/xen-tools/files/xen-4.4-nostrip.patch b/app-emulation/xen-tools/files/xen-4.4-nostrip.patch deleted file mode 100644 index 7ddd354bc93a..000000000000 --- a/app-emulation/xen-tools/files/xen-4.4-nostrip.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target ---- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800 -+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800 -@@ -437,9 +437,6 @@ - install: all - ifneq ($(PROGS),) - $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" --ifneq ($(STRIP),) -- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) --endif - endif - ifdef CONFIG_TRACE_SYSTEMTAP - ifdef CONFIG_TRACE_SYSTEMTAP diff --git a/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch b/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch deleted file mode 100644 index 85445612bd60..000000000000 --- a/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/tools/qemu-xen/Makefile b/tools/qemu-xen/Makefile -index 4d257f1..db2c2ad 100644 ---- a/tools/qemu-xen/Makefile -+++ b/tools/qemu-xen/Makefile -@@ -62,7 +62,7 @@ $(call set-vpath, $(SRC_PATH)) - - LIBS+=-lz $(LIBS_TOOLS) - --HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) -+HELPERS-$(CONFIG_LINUX) = xen-bridge-helper$(EXESUF) - - ifdef BUILD_DOCS - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt -@@ -186,7 +186,7 @@ qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a - qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a - qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a - --qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o -+xen-bridge-helper$(EXESUF): xen-bridge-helper.o - - fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o libqemuutil.a libqemustub.a - fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap -diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h -index 30e4b04..6691ff0 100644 ---- a/tools/qemu-xen/include/net/net.h -+++ b/tools/qemu-xen/include/net/net.h -@@ -178,7 +178,7 @@ NetClientState *net_hub_port_find(int hub_id); - - #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" - #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" --#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" -+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - - void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); -diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c -index 6a0974e..74b4635 100644 ---- a/tools/qemu-xen/qemu-bridge-helper.c -+++ b/tools/qemu-xen/qemu-bridge-helper.c -@@ -67,7 +67,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList; - static void usage(void) - { - fprintf(stderr, -- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); -+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); - } - - static int parse_acl_file(const char *filename, ACLList *acl_list) -diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx -index d15338e..f7104f1 100644 ---- a/tools/qemu-xen/qemu-options.hx -+++ b/tools/qemu-xen/qemu-options.hx -@@ -1601,7 +1601,7 @@ to disable script execution. - - If running QEMU as an unprivileged user, use the network helper - @var{helper} to configure the TAP interface. The default network --helper executable is @file{/usr/local/libexec/qemu-bridge-helper}. -+helper executable is @file{/usr/local/libexec/xen-bridge-helper}. - - @option{fd}=@var{h} can be used to specify the handle of an already - opened host TAP interface. -@@ -1625,7 +1625,7 @@ qemu-system-i386 linux.img \ - #launch a QEMU instance with the default network helper to - #connect a TAP device to bridge br0 - qemu-system-i386 linux.img \ -- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper" -+ -net nic -net tap,"helper=/usr/local/libexec/xen-bridge-helper" - @end example - - @item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}] -@@ -1634,7 +1634,7 @@ Connect a host TAP network interface to a host bridge device. - - Use the network helper @var{helper} to configure the TAP interface and - attach it to the bridge. The default network helper executable is --@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge -+@file{/usr/local/libexec/xen-bridge-helper} and the default bridge - device is @file{br0}. - - Examples: diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.0-network-bridge-broadcast.patch b/app-emulation/xen-tools/files/xen-tools-3.4.0-network-bridge-broadcast.patch deleted file mode 100644 index c926510fa8f7..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.0-network-bridge-broadcast.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xen-3.4.0/tools/hotplug/Linux/network-bridge.orig 2009-05-18 15:05:38.000000000 +0400 -+++ xen-3.4.0/tools/hotplug/Linux/network-bridge 2009-06-09 23:16:05.000000000 +0400 -@@ -101,7 +101,7 @@ - tdev=tmpbridge - - get_ip_info() { -- addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'` -+ addr_pfx=`ip addr show dev $1 | egrep '^ *inet ' | sed -e 's/ *inet //' -e "s/$1//"` - gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'` - } - diff --git a/app-emulation/xen-tools/files/xen-tools-4-anti-seabios-download.patch b/app-emulation/xen-tools/files/xen-tools-4-anti-seabios-download.patch deleted file mode 100644 index 81f00e5c4238..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4-anti-seabios-download.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile -index cb13212..d83c51a 100644 ---- a/tools/firmware/Makefile -+++ b/tools/firmware/Makefile -@@ -22,7 +22,6 @@ ovmf-dir: - cp ovmf-makefile ovmf-dir/Makefile; - - seabios-dir: -- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir - cp seabios-config seabios-dir/.config; - - .PHONY: all diff --git a/app-emulation/xen-tools/files/xen-tools-4-docfix.patch b/app-emulation/xen-tools/files/xen-tools-4-docfix.patch deleted file mode 100644 index c9205a4cab99..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4-docfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile ---- xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800 -+++ xen-4.2.0/tools/qemu-xen-traditional/Makefile 2013-01-29 11:12:20.502989453 +0800 -@@ -275,7 +275,7 @@ - - # documentation - %.html: %.texi -- texi2html -monolithic -number $< -+ texi2html -monolithic $< - - %.info: %.texi - makeinfo $< -o $@ diff --git a/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch b/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch deleted file mode 100644 index 9304768eb6e9..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tools/qemu-xen/po/Makefile b/tools/qemu-xen/po/Makefile -index 705166e..2e7cdcb 100644 ---- a/tools/qemu-xen/po/Makefile -+++ b/tools/qemu-xen/po/Makefile -@@ -30,7 +30,7 @@ install: $(OBJS) - for obj in $(OBJS); do \ - base=`basename $$obj .mo`; \ - $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \ -- $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \ -+ $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/xenqemu.mo; \ - done - - %.mo: %.po -diff --git a/tools/qemu-xen/ui/gtk.c b/tools/qemu-xen/ui/gtk.c -index c38146f..d3c331b 100644 ---- a/tools/qemu-xen/ui/gtk.c -+++ b/tools/qemu-xen/ui/gtk.c -@@ -31,7 +31,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#define GETTEXT_PACKAGE "qemu" -+#define GETTEXT_PACKAGE "xenqemu" - #define LOCALEDIR "po" - - #include "qemu-common.h" diff --git a/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch b/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch deleted file mode 100644 index cd9658cd1e89..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur xen-4.2.2.orig/tools/qemu-xen/qemu-options.hx xen-4.2.2/tools/qemu-xen/qemu-options.hx ---- tools/qemu-xen/qemu-options.hx 2013-04-06 07:39:54.000000000 +0800 -+++ tools/qemu-xen/qemu-options.hx 2013-05-17 22:16:56.924728753 +0800 -@@ -1799,18 +1799,13 @@ - devices. - - Syntax for specifying a sheepdog device --@table @list --``sheepdog:<vdiname>'' -- --``sheepdog:<vdiname>:<snapid>'' -- --``sheepdog:<vdiname>:<tag>'' -- --``sheepdog:<host>:<port>:<vdiname>'' -- --``sheepdog:<host>:<port>:<vdiname>:<snapid>'' -- --``sheepdog:<host>:<port>:<vdiname>:<tag>'' -+@table @code -+@item sheepdog:<vdiname> -+@item sheepdog:<vdiname>:<snapid> -+@item sheepdog:<vdiname>:<tag> -+@item sheepdog:<host>:<port>:<vdiname> -+@item sheepdog:<host>:<port>:<vdiname>:<snapid> -+@item sheepdog:<host>:<port>:<vdiname>:<tag> - @end table - - Example diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch deleted file mode 100644 index 902c9ac4efbd..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-27 21:57:04.481812859 +0100 -+++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-06-02 18:52:44.935034128 +0100 -@@ -48,7 +48,7 @@ - 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/share/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS))) - endif - - ROMS := ---- xen-4.2.0/Config.mk.orig 2012-05-27 21:57:04.479812884 +0100 -+++ xen-4.2.0/Config.mk 2012-06-02 18:55:14.087169469 +0100 -@@ -206,7 +206,7 @@ - # Wed Jun 26 16:30:45 2013 +0100 - # xen: Don't perform SMP setup. - --ETHERBOOT_NICS ?= rtl8139 8086100e -+ETHERBOOT_NICS ?= 10ec8139 8086100e - - # 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. ---- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-27 21:57:04.480812871 +0100 -+++ xen-4.2.0/tools/firmware/Makefile 2012-06-02 19:03:52.254691484 +0100 -@@ -10,7 +10,7 @@ - #SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir - SUBDIRS-$(CONFIG_ROMBIOS) += rombios - SUBDIRS-$(CONFIG_ROMBIOS) += vgabios --SUBDIRS-$(CONFIG_ROMBIOS) += etherboot -+#SUBDIRS-$(CONFIG_ROMBIOS) += etherboot - SUBDIRS-y += hvmloader - - ovmf: diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch deleted file mode 100644 index 86d46aa40de4..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-12 16:40:47.000000000 +0100 -+++ xen-4.2.0/tools/firmware/Makefile 2012-05-27 21:55:23.438076078 +0100 -@@ -7,7 +7,7 @@ - - SUBDIRS-y := - SUBDIRS-$(CONFIG_OVMF) += ovmf --SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir -+#SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir - SUBDIRS-$(CONFIG_ROMBIOS) += rombios - SUBDIRS-$(CONFIG_ROMBIOS) += vgabios - SUBDIRS-$(CONFIG_ROMBIOS) += etherboot ---- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-12 16:40:47.000000000 +0100 -+++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-05-27 21:53:45.625298906 +0100 -@@ -70,7 +70,7 @@ - ifeq ($(CONFIG_SEABIOS),y) - OBJS += seabios.o - CFLAGS += -DENABLE_SEABIOS --SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin -+SEABIOS_ROM := /usr/share/seabios/bios.bin - ROMS += $(SEABIOS_ROM) - endif - diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch deleted file mode 100644 index 4b3a4bac1ec1..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xen-4.1.1.orig//tools/hotplug/Linux/network-bridge xen-4.1.1/tools/hotplug/Linux/network-bridge ---- xen-4.1.1.orig//tools/hotplug/Linux/network-bridge 2011-10-14 02:28:43.481714285 +0800 -+++ xen-4.1.1/tools/hotplug/Linux/network-bridge 2011-10-16 01:06:11.226673108 +0800 -@@ -216,7 +216,7 @@ - return - fi - -- if [ `brctl show | wc -l` != 1 ]; then -+ if [ `brctl show | grep $netdev | wc -l` != 0 ]; then - return - fi - diff --git a/app-emulation/xen-tools/files/xen-tools-4.2-xen_disk_leak.patch b/app-emulation/xen-tools/files/xen-tools-4.2-xen_disk_leak.patch deleted file mode 100644 index 481eb65c4302..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.2-xen_disk_leak.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Roger Pau Monne -Subject: [Qemu-devel] [PATCH RFC 2/3] xen_disk: fix memory leak -Date: Mon, 31 Dec 2012 13:16:13 +0100 - -On ioreq_release the full ioreq -was memset to 0, loosing all the data -and memory allocations inside the QEMUIOVector, which leads to a -memory leak. Create a new function to specifically reset ioreq. - -Reported-by: Maik Wessler <address@hidden> -Signed-off-by: Roger Pau Monné <address@hidden> -Cc: address@hidden -Cc: Stefano Stabellini <address@hidden> -Cc: Anthony PERARD <address@hidden> ---- - hw/xen_disk.c | 28 ++++++++++++++++++++++++++-- - 1 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/hw/xen_disk.c b/hw/xen_disk.c -index a159ee5..1eb485a 100644 ---- a/tools/qemu-xen/hw/xen_disk.c -+++ b/tools/qemu-xen/hw/xen_disk.c -@@ -113,6 +113,31 @@ struct XenBlkDev { - - /* ------------------------------------------------------------- */ - -+static void ioreq_reset(struct ioreq *ioreq) -+{ -+ memset(&ioreq->req, 0, sizeof(ioreq->req)); -+ ioreq->status = 0; -+ ioreq->start = 0; -+ ioreq->presync = 0; -+ ioreq->postsync = 0; -+ ioreq->mapped = 0; -+ -+ memset(ioreq->domids, 0, sizeof(ioreq->domids)); -+ memset(ioreq->refs, 0, sizeof(ioreq->refs)); -+ ioreq->prot = 0; -+ memset(ioreq->page, 0, sizeof(ioreq->page)); -+ ioreq->pages = NULL; -+ -+ ioreq->aio_inflight = 0; -+ ioreq->aio_errors = 0; -+ -+ ioreq->blkdev = NULL; -+ memset(&ioreq->list, 0, sizeof(ioreq->list)); -+ memset(&ioreq->acct, 0, sizeof(ioreq->acct)); -+ -+ qemu_iovec_reset(&ioreq->v); -+} -+ - static struct ioreq *ioreq_start(struct XenBlkDev *blkdev) - { - struct ioreq *ioreq = NULL; -@@ -130,7 +155,6 @@ static struct ioreq *ioreq_start(struct XenBlkDev *blkdev) - /* get one from freelist */ - ioreq = QLIST_FIRST(&blkdev->freelist); - QLIST_REMOVE(ioreq, list); -- qemu_iovec_reset(&ioreq->v); - } - QLIST_INSERT_HEAD(&blkdev->inflight, ioreq, list); - blkdev->requests_inflight++; -@@ -154,7 +178,7 @@ static void ioreq_release(struct ioreq *ioreq, bool finish) - struct XenBlkDev *blkdev = ioreq->blkdev; - - QLIST_REMOVE(ioreq, list); -- memset(ioreq, 0, sizeof(*ioreq)); -+ ioreq_reset(ioreq); - ioreq->blkdev = blkdev; - QLIST_INSERT_HEAD(&blkdev->freelist, ioreq, list); - if (finish) { --- -1.7.7.5 (Apple Git-26) - diff --git a/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch b/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch deleted file mode 100644 index e2715f89ff17..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch +++ /dev/null @@ -1,30 +0,0 @@ -fix invalid installs of docs/man and config into /usr/local - ---- xen-4.2.2-orig/tools/Makefile 2013-04-23 18:42:55.000000000 +0200 -+++ xen-4.2.2/tools/Makefile 2013-07-29 17:01:33.764093405 +0200 -@@ -199,6 +199,9 @@ - --bindir=$(LIBEXEC) \ - --datadir=$(SHAREDIR)/qemu-xen \ - --disable-kvm \ -+ --mandir=/usr/share/man \ -+ --docdir=/usr/share/doc/xen \ -+ --sysconfdir=/etc \ - --python=$(PYTHON) \ - $(IOEMU_CONFIGURE_CROSS); \ - $(MAKE) all -diff --git a/tools/qemu-xen-traditional/configure b/tools/qemu-xen-traditional/configure -index 904e019..b70ee25 100755 ---- a/tools/qemu-xen-traditional/configure -+++ b/tools/qemu-xen-traditional/configure -@@ -1107,10 +1107,7 @@ elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lrt > /dev/null 2> /dev/null ; then - rt=yes - fi - --if test "$rt" = "yes" ; then -- # Hack, we should have a general purpose LIBS for this sort of thing -- AIOLIBS="$AIOLIBS -lrt" --fi -+AIOLIBS="$AIOLIBS -lrt" - - if test "$mingw32" = "yes" ; then - if test -z "$prefix" ; then diff --git a/app-emulation/xen-tools/files/xen-tools-4.2.2-rt-link.patch b/app-emulation/xen-tools/files/xen-tools-4.2.2-rt-link.patch deleted file mode 100644 index 93641ef094d6..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.2.2-rt-link.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/tools/qemu-xen/configure b/tools/qemu-xen/configure -index ea2f8f8..9726440 100755 ---- a/tools/qemu-xen/configure -+++ b/tools/qemu-xen/configure -@@ -2459,17 +2459,41 @@ fi - - - ########################################## -+# Do we need libm -+cat > $TMPC << EOF -+#include <math.h> -+int main(void) { return isnan(sin(0.0)); } -+EOF -+if compile_prog "" "" ; then -+ : -+elif compile_prog "" "-lm" ; then -+ LIBS="-lm $LIBS" -+ libs_qga="-lm $libs_qga" -+else -+ error_exit "libm check failed" -+fi -+ -+########################################## - # Do we need librt -+# uClibc provides 2 versions of clock_gettime(), one with realtime -+# support and one without. This means that the clock_gettime() don't -+# need -lrt. We still need it for timer_create() so we check for this -+# function in addition. - cat > $TMPC <<EOF - #include <signal.h> - #include <time.h> --int main(void) { clockid_t id; return clock_gettime(id, NULL); } -+int main(void) { -+ timer_create(CLOCK_REALTIME, NULL, NULL); -+ return clock_gettime(CLOCK_REALTIME, NULL); -+} - EOF - - if compile_prog "" "" ; then - : --elif compile_prog "" "-lrt" ; then -+# we need pthread for static linking. use previous pthread test result -+elif compile_prog "" "-lrt $pthread_lib" ; then - LIBS="-lrt $LIBS" -+ libs_qga="-lrt $libs_qga" - fi - - if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ diff --git a/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch b/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch deleted file mode 100644 index 0e1d67a02034..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xen-4.2.4.org/tools/hotplug/Linux/Makefile 2014-05-22 05:39:57.090009337 +0000 -+++ xen-4.2.4/tools/hotplug/Linux/Makefile 2014-05-22 05:41:03.816009464 +0000 -@@ -31,8 +31,8 @@ - XEN_HOTPLUG_SCRIPTS = xen-backend.agent - - UDEVVER = 0 --ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1) --UDEVVER = $(shell /sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' ) -+ifeq ($(shell [ -x $(shell which udevadm) ] && echo 1),1) -+UDEVVER = $(shell $(shell which udevadm) info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' ) - endif - ifeq ($(shell [ -x /usr/bin/udevinfo ] && echo 1),1) - UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' ) diff --git a/app-emulation/xen-tools/files/xen-tools-4.3-ar-cc.patch b/app-emulation/xen-tools/files/xen-tools-4.3-ar-cc.patch deleted file mode 100644 index 174b404826fd..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.3-ar-cc.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur xen-4.3.0.orig/tools/debugger/gdbsx/gx/Makefile xen-4.3.0/tools/debugger/gdbsx/gx/Makefile ---- tools/debugger/gdbsx/gx/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/debugger/gdbsx/gx/Makefile 2013-07-23 16:14:53.930752663 +0800 -@@ -3,6 +3,7 @@ - - GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o - GX_HDRS := $(wildcard *.h) -+AR="ar" - - .PHONY: all - all: gx_all.a -@@ -16,5 +17,5 @@ - # $(CC) -c $(CFLAGS) -o $@ $< - - gx_all.a: $(GX_OBJS) Makefile $(GX_HDRS) -- ar cr $@ $(GX_OBJS) # problem with ld using -m32 -+ $(AR) cr $@ $(GX_OBJS) # problem with ld using -m32 - -diff -ur xen-4.3.0.orig/tools/firmware/rombios/Makefile xen-4.3.0/tools/firmware/rombios/Makefile ---- tools/firmware/rombios/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/firmware/rombios/Makefile 2013-07-23 21:57:21.258085143 +0800 -@@ -1,5 +1,6 @@ - XEN_ROOT = $(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk -+CC="gcc" - - SUBDIRS := 32bit - -@@ -16,7 +17,7 @@ - rm -f $(DEPS) - - BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c -- gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c -+ $(CC) -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c - bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c - sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s - as86 _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt -@@ -26,6 +27,6 @@ - rm -f _rombios_.s - - biossums: biossums.c -- gcc -o biossums biossums.c -+ $(CC) -o biossums biossums.c - - -include $(DEPS) -diff -ur xen-4.3.0.orig/tools/firmware/vgabios/Makefile xen-4.3.0/tools/firmware/vgabios/Makefile ---- tools/firmware/vgabios/Makefile 2013-07-09 18:46:56.000000000 +0800 -+++ tools/firmware/vgabios/Makefile 2013-07-23 22:42:39.041261388 +0800 -@@ -37,7 +37,7 @@ - tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/ - - vgabios.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h -- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c -+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c - $(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c - sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s - $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt -@@ -47,7 +47,7 @@ - ls -l VGABIOS-lgpl-latest.bin - - vgabios.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h -- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c -+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c - $(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c - sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s - $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt -@@ -57,7 +57,7 @@ - ls -l VGABIOS-lgpl-latest.debug.bin - - vgabios-cirrus.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c -- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c -+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c - $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c - sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s - $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios-cirrus.txt -@@ -67,7 +67,7 @@ - ls -l VGABIOS-lgpl-latest.cirrus.bin - - vgabios-cirrus.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c -- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c -+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c - $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c - sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s - $(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios-cirrus.debug.txt diff --git a/app-emulation/xen-tools/files/xen-tools-4.4-api-fix.patch b/app-emulation/xen-tools/files/xen-tools-4.4-api-fix.patch deleted file mode 100644 index fc0124c4b062..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.4-api-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/tools/configure b/tools/configure -index afc3000..6187468 100755 ---- a/tools/configure -+++ b/tools/configure -@@ -4615,7 +4615,7 @@ if test x"${PERL}" = x"no" - then - as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 - fi --if test "x$xapi" = "xy"; then : -+if test "x$xenapi" = "xy"; then : - - # Extract the first word of "curl-config", so it can be a program name with args. - set dummy curl-config; ac_word=$2 -diff --git a/tools/configure.ac b/tools/configure.ac -index 0754f0e..cc884f7 100644 ---- a/tools/configure.ac -+++ b/tools/configure.ac -@@ -150,7 +150,7 @@ AC_PROG_INSTALL - AC_PATH_PROG([BISON], [bison]) - AC_PATH_PROG([FLEX], [flex]) - AX_PATH_PROG_OR_FAIL([PERL], [perl]) --AS_IF([test "x$xapi" = "xy"], [ -+AS_IF([test "x$xenapi" = "xy"], [ - AX_PATH_PROG_OR_FAIL([CURL], [curl-config]) - AX_PATH_PROG_OR_FAIL([XML], [xml2-config]) - ]) -diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile -index b66f0bc..94b854b 100644 ---- a/tools/libxen/Makefile -+++ b/tools/libxen/Makefile -@@ -22,12 +22,15 @@ MAJOR = 1.0 - MINOR = 0 - - CFLAGS += -Iinclude \ -- $(shell $(XML2_CONFIG) --cflags) \ -- $(shell $(CURL_CONFIG) --cflags) \ - -fPIC - -+ifeq ($(LIBXENAPI_BINDINGS),y) -+CFLAGS += $(shell $(XML2_CONFIG) --cflags) \ -+ $(shell $(CURL_CONFIG) --cflags) -+ - LDFLAGS += $(shell $(XML2_CONFIG) --libs) \ - $(shell $(CURL_CONFIG) --libs) -+endif - - LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h) include/xen/api/xen_all.h - LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c)) diff --git a/app-emulation/xen-tools/files/xend.initd-r2 b/app-emulation/xen-tools/files/xend.initd-r2 deleted file mode 100644 index 837deccede7b..000000000000 --- a/app-emulation/xen-tools/files/xend.initd-r2 +++ /dev/null @@ -1,52 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.5 2014/01/02 04:58:53 idella4 Exp $ - -extra_commands="status" - -depend() { - need net xenconsoled xenstored - before xendomains sshd -} - -await_daemons_up() { - for ((i=0; i<5; i++)); do - sleep 1 - /usr/sbin/xend status && return 0 - done - return 1 -} - -is_privileged_domain() { - grep -qsE '^control_d$' /proc/xen/capabilities - return $? -} - -start() { - if is_privileged_domain ; then - ebegin "Starting Xen control daemon" - /usr/sbin/xend start - /usr/sbin/xend status || await_daemons_up - eend $? - else - eerror "Can't start xend - this is not a privileged domain." - return 1 - fi -} - -stop() { - if [ "$(xm list | wc -l)" -gt 2 ]; then - ebegin " Stopping all domains" - /usr/sbin/xl shutdown -a -w >/dev/null - eend $? - fi - - ebegin "Stopping Xen control daemon" - /usr/sbin/xend stop - eend $? -} - -status() { - is_privileged_domain && /usr/sbin/xend status -} diff --git a/app-emulation/xen-tools/xen-tools-4.2.4-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r6.ebuild deleted file mode 100644 index 4a075e564083..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.2.4-r6.ebuild +++ /dev/null @@ -1,411 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r6.ebuild,v 1.4 2014/07/30 19:20:10 ssuominen Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="amd64 x86" - UPSTREAM_VER=3 - GENTOO_VER= - SEABIOS_VER=1.6.3.2 - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE}" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - dev-ml/findlib - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - ${PYTHON_DEPS} - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/transfig - media-gfx/graphviz - dev-tex/xcolor - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - ocaml? ( >=dev-lang/ocaml-4 ) - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - use api && export "LIBXENAPI_BINDINGS=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - # Drop .config, fixes to gcc-4.6 - epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch - - # Xend - if ! use xend; then - sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ - -i tools/misc/Makefile || die "Disabling xend failed" - sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || die "Disabling xend failed" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - # Fix texi2html build error with new texi2html, qemu.doc.html - epatch "${FILESDIR}"/${PN}-4-docfix.patch \ - "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Bug 496708 - epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch - use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch - - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Don't build ipxe with pie on hardened, Bug #360805 - if gcc-specs-pie; then - epatch "${FILESDIR}"/ipxe-nopie.patch - fi - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch - - # add missing header, Bug #467200 - epatch "${FILESDIR}"/xen-4-ulong.patch \ - "${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch - - # Set dom0-min-mem to kb; Bug #472982 - epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch - - # Bug 463840 - epatch "${FILESDIR}"/${PN}-4.2.2-install.patch - epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch - - # Bug 510976 - epatch "${FILESDIR}"/${P}-udev-rules.patch - - # bundled seabios - epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Bug 472438 - sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ - -i Config.mk || die - - # Bug 445986 - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - epatch_user -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - # Fix the remaining Python shebangs. - python_fix_shebang "${ED}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - # Reset bash completion dir; Bug 472438 - mv "${D}"bash-completion "${D}"usr/share/ || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - if use xend; then - newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" - fi - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem at boot." - elog "Add by use of rc-update on completion of the install" - - if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" - ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use xend; then - echo - elog "xend capability has been enabled and installed" - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.2.4-r7.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r7.ebuild deleted file mode 100644 index 407a2c500785..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.2.4-r7.ebuild +++ /dev/null @@ -1,411 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r7.ebuild,v 1.1 2014/08/19 14:16:01 dlan Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="~amd64 ~x86" - UPSTREAM_VER=4 - GENTOO_VER= - SEABIOS_VER=1.6.3.2 - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE}" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - dev-ml/findlib - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - ${PYTHON_DEPS} - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/transfig - media-gfx/graphviz - dev-tex/xcolor - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - ocaml? ( >=dev-lang/ocaml-4 ) - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - use api && export "LIBXENAPI_BINDINGS=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - # Drop .config, fixes to gcc-4.6 - epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch - - # Xend - if ! use xend; then - sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ - -i tools/misc/Makefile || die "Disabling xend failed" - sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || die "Disabling xend failed" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - # Fix texi2html build error with new texi2html, qemu.doc.html - epatch "${FILESDIR}"/${PN}-4-docfix.patch \ - "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Bug 496708 - epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch - use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch - - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Don't build ipxe with pie on hardened, Bug #360805 - if gcc-specs-pie; then - epatch "${FILESDIR}"/ipxe-nopie.patch - fi - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch - - # add missing header, Bug #467200 - epatch "${FILESDIR}"/xen-4-ulong.patch \ - "${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch - - # Set dom0-min-mem to kb; Bug #472982 - epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch - - # Bug 463840 - epatch "${FILESDIR}"/${PN}-4.2.2-install.patch - epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch - - # Bug 510976 - epatch "${FILESDIR}"/${P}-udev-rules.patch - - # bundled seabios - epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Bug 472438 - sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ - -i Config.mk || die - - # Bug 445986 - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - epatch_user -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - # Fix the remaining Python shebangs. - python_fix_shebang "${ED}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - # Reset bash completion dir; Bug 472438 - mv "${D}"bash-completion "${D}"usr/share/ || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - if use xend; then - newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" - fi - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem at boot." - elog "Add by use of rc-update on completion of the install" - - if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" - ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use xend; then - echo - elog "xend capability has been enabled and installed" - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.2.5.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5.ebuild deleted file mode 100644 index 0b00e22ad8c3..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.2.5.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="~amd64 ~x86" - UPSTREAM_VER= - # xen-tools's gentoo patches tarball - GENTOO_VER=0 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - SEABIOS_VER=1.6.3.2 - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE}" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - dev-ml/findlib - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - ${PYTHON_DEPS} - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/transfig - media-gfx/graphviz - dev-tex/xcolor - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - ocaml? ( >=dev-lang/ocaml-4 ) - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - use api && export "LIBXENAPI_BINDINGS=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - source "${FILESDIR}"/gentoo-patches.conf - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i - done - fi - - use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch - - if gcc-specs-pie; then - epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Bug 472438 - sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ - -i Config.mk || die - - # Bug 445986 - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - epatch_user -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - # Fix the remaining Python shebangs. - python_fix_shebang "${ED}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - # Reset bash completion dir; Bug 472438 - mv "${D}"bash-completion "${D}"usr/share/ || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem at boot." - elog "Add by use of rc-update on completion of the install" - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.3.2-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r5.ebuild deleted file mode 100644 index edfa041e3180..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.3.2-r5.ebuild +++ /dev/null @@ -1,445 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r5.ebuild,v 1.4 2014/10/07 05:58:38 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="amd64 -x86" - UPSTREAM_VER=3 - GENTOO_VER= - SEABIOS_VER=1.7.1-stable-xen - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE} - pygrub? ( python )" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - dev-python/markdown[${PYTHON_USEDEP}] - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/graphviz - dev-tex/xcolor - media-gfx/transfig - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi ) - qemu? ( x11-libs/pixman ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - # Drop .config, fixes to gcc-4.6 - epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch - - # Fix texi2html build error with new texi2html, qemu.doc.html - epatch "${FILESDIR}"/${PN}-4-docfix.patch \ - "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Bug 496708 - epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch - use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch - - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch - - # add missing header - epatch "${FILESDIR}"/xen-4-ulong.patch - - # Set dom0-min-mem to kb; Bug #472982 - epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch - - # Bug 477676 - epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch - - # Prevent file collision with qemu package Bug 478064 - epatch "${FILESDIR}"/qemu-bridge.patch - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # bundled seabios - epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Xend - if ! use xend; then - sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ - -i tools/misc/Makefile || die "Disabling xend failed" - sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || die "Disabling xend failed" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - # Bug 472438 - sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ - -i Config.mk || die - - use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844 - sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \ - -i tools/libxl/libxl_bootloader.c || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - epatch_user -} - -src_configure() { - local myconf="--prefix=/usr --disable-werror" - - if use ocaml - then - myconf="${myconf} $(use_enable ocaml ocamltools)" - else - myconf="${myconf} --disable-ocamltools" - fi - - if ! use pam - then - myconf="${myconf} --disable-pam" - fi - - econf ${myconf} -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - # Reset bash completion dir; Bug 472438 - mv "${D}"bash-completion "${D}"usr/share/ || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - if use xend; then - newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" - fi - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # Move files built with use qemu, Bug #477884 - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem At boot" - elog "Add by use of rc-update on completion of the install" - - if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" - ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use xend; then - elog"";elog "xend capability has been enabled and installed" - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.3.2-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r6.ebuild deleted file mode 100644 index fd11fd50646c..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.3.2-r6.ebuild +++ /dev/null @@ -1,445 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r6.ebuild,v 1.2 2014/10/07 05:58:38 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="~amd64 -x86" - UPSTREAM_VER=4 - GENTOO_VER= - SEABIOS_VER=1.7.1-stable-xen - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE} - pygrub? ( python )" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - dev-python/markdown[${PYTHON_USEDEP}] - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/graphviz - dev-tex/xcolor - media-gfx/transfig - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi ) - qemu? ( x11-libs/pixman ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - # Drop .config, fixes to gcc-4.6 - epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch - - # Fix texi2html build error with new texi2html, qemu.doc.html - epatch "${FILESDIR}"/${PN}-4-docfix.patch \ - "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Bug 496708 - epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch - use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch - - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch - - # add missing header - epatch "${FILESDIR}"/xen-4-ulong.patch - - # Set dom0-min-mem to kb; Bug #472982 - epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch - - # Bug 477676 - epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch - - # Prevent file collision with qemu package Bug 478064 - epatch "${FILESDIR}"/qemu-bridge.patch - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # bundled seabios - epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Xend - if ! use xend; then - sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ - -i tools/misc/Makefile || die "Disabling xend failed" - sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || die "Disabling xend failed" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - # Bug 472438 - sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ - -i Config.mk || die - - use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844 - sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \ - -i tools/libxl/libxl_bootloader.c || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - epatch_user -} - -src_configure() { - local myconf="--prefix=/usr --disable-werror" - - if use ocaml - then - myconf="${myconf} $(use_enable ocaml ocamltools)" - else - myconf="${myconf} --disable-ocamltools" - fi - - if ! use pam - then - myconf="${myconf} --disable-pam" - fi - - econf ${myconf} -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - # Reset bash completion dir; Bug 472438 - mv "${D}"bash-completion "${D}"usr/share/ || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - if use xend; then - newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" - fi - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # Move files built with use qemu, Bug #477884 - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem At boot" - elog "Add by use of rc-update on completion of the install" - - if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" - ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use xend; then - elog"";elog "xend capability has been enabled and installed" - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.3.3.ebuild b/app-emulation/xen-tools/xen-tools-4.3.3.ebuild deleted file mode 100644 index 9811bba80068..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.3.3.ebuild +++ /dev/null @@ -1,395 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild,v 1.3 2014/10/07 05:58:38 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="~amd64 -x86" - UPSTREAM_VER= - # xen-tools's gentoo patches tarball - GENTOO_VER=0 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - SEABIOS_VER=1.7.1-stable-xen - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE} - pygrub? ( python )" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - dev-python/markdown[${PYTHON_USEDEP}] - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/graphviz - dev-tex/xcolor - media-gfx/transfig - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi ) - qemu? ( x11-libs/pixman ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - source "${FILESDIR}"/gentoo-patches.conf - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Bug 496708 - use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch - - # Bug 478064 - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - # Bug 472438 - sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ - -i Config.mk || die - - use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844 - sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \ - -i tools/libxl/libxl_bootloader.c || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - epatch_user -} - -src_configure() { - local myconf="--prefix=/usr --disable-werror" - - if use ocaml - then - myconf="${myconf} $(use_enable ocaml ocamltools)" - else - myconf="${myconf} --disable-ocamltools" - fi - - if ! use pam - then - myconf="${myconf} --disable-pam" - fi - - econf ${myconf} -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - # Reset bash completion dir; Bug 472438 - mv "${D}"bash-completion "${D}"usr/share/ || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # Move files built with use qemu, Bug #477884 - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem At boot" - elog "Add by use of rc-update on completion of the install" - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} |