diff options
Diffstat (limited to 'app-emulation')
17 files changed, 228 insertions, 2120 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index 6933782dfb84..f61f6366db7a 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.114 2012/12/02 22:48:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.115 2012/12/04 12:00:12 idella4 Exp $ + +*xen-tools-4.2.0-r1 (05 Dec 2012) + + 05 Dec 2012; Ian Delaney <idella4@gentoo.org> + +files/xen-4.2.0-anti-download.patch, +files/xen-4.2.0-jserver.patch, + +files/xen-4.2.0-nostrip.patch, +xen-tools-4.2.0-r1.ebuild, + -files/xen-tools-3.3.1-sandbox-fix.patch, + -files/xen-tools-3.4.2-fix-definitions.patch, + -files/xen-tools-3.4.2-fix-include.patch, + -files/xen-tools-3.4.2-ldflags-respect.patch, + -files/xen-tools-3.4.2-remove-default-cflags.patch, + -files/xen-tools-3.4.2-werror-idiocy-v2.patch, + -files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch, + -xen-tools-3.4.2-r3.ebuild, -xen-tools-3.4.2-r5.ebuild, + -xen-tools-4.1.1-r5.ebuild, metadata.xml, xen-tools-4.1.1-r6.ebuild, + xen-tools-4.1.2-r3.ebuild: + initial 4.2.0 found in virtual overlay, bump to 4.2.0-r1, added patches fixing + QA issues, added edits to build of external packages 02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> xen-tools-3.4.2-r3.ebuild, xen-tools-3.4.2-r5.ebuild, @@ -680,4 +698,3 @@ easier maintenance. Switch to a snapshot versioning scheme that keeps release/snapshot versions in order. Add myself as an additional maintainer in metadata.xml - diff --git a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch new file mode 100644 index 000000000000..95a1ce6f0659 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch @@ -0,0 +1,28 @@ +diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile +--- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800 ++++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800 +@@ -28,13 +28,6 @@ + $(MAKE) -C $D/src bin/$(*F).rom + + $T: +- if ! wget -O _$T $(IPXE_TARBALL_URL); then \ +- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ +- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ +- $(IPXE_GIT_TAG) | gzip >../_$T); \ +- rm -rf $D.git; \ +- fi +- mv _$T $T + + $D/src/arch/i386/Makefile: $T Config + rm -rf $D +diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile +--- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800 ++++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800 +@@ -18,7 +18,6 @@ + cp ovmf-makefile ovmf/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-4.2.0-jserver.patch b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch new file mode 100644 index 000000000000..d42080c767d3 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..de06279bd33c --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch @@ -0,0 +1,37 @@ +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-tools-3.3.1-sandbox-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch deleted file mode 100644 index be0527a7c8f8..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN xen-3.3.1/tools/ioemu-qemu-xen/xen-setup xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup ---- xen-3.3.1/tools/ioemu-qemu-xen/xen-setup 2009-01-05 04:36:22.000000000 -0700 -+++ xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup 2009-04-25 17:55:03.000000000 -0600 -@@ -3,6 +3,8 @@ - - # git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/ - -+target=i386-dm -+ - rm -f $target/Makefile - rm -f $target/config.mak - rm -f config-host.mak -@@ -11,8 +13,6 @@ - - ./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr - --target=i386-dm -- - if [ "x$XEN_ROOT" != x ]; then - echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak - fi diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch deleted file mode 100644 index 403d6124ad7b..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/blktap/lib/blktaplib.h.orig 2011-09-21 19:29:30.240868534 +0800 -+++ tools/blktap/lib/blktaplib.h 2011-09-21 19:34:21.184868372 +0800 -@@ -195,8 +195,13 @@ - pid_t pid; - } msg_pid_t; - -+#ifndef READ - #define READ 0 -+#endif -+ -+#ifndef WRITE - #define WRITE 1 -+#endif - - /*Control Messages between manager and tapdev*/ - #define CTLMSG_PARAMS 1 diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch deleted file mode 100644 index 2fe3f05c417e..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:27:01.846896986 +0800 -+++ ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:29:09.910897067 +0800 -@@ -40,6 +40,7 @@ - #include <err.h> - #include <errno.h> - #include <sys/types.h> -+#include <sys/stat.h> - #include <sys/wait.h> - #include <signal.h> - #include <fcntl.h> ---- ./tools/blktap/drivers/block-qcow2.c 2011-09-22 04:15:49.339854677 +0800 -+++ ./tools/blktap/drivers/block-qcow2.c 2009-11-10 23:12:55.000000000 +0800 -@@ -26,6 +26,7 @@ - #include "aes.h" - #include <assert.h> - #include <stdint.h> -+#include <sys/stat.h> - #include <fcntl.h> - #include <stdio.h> - #include <stdlib.h> ---- ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:43:40.005898352 +0800 -+++ ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:26:53.979898723 +0800 -@@ -26,6 +26,7 @@ - #include <zlib.h> - #include "aes.h" - #include <assert.h> -+#include <sys/stat.h> - diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch deleted file mode 100644 index fd777126d498..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./tools/fs-back/Makefile 2011-09-26 23:14:30.454759297 +0800 -+++ ./tools/fs-back/Makefile 2011-09-27 16:37:57.445748680 +0800 -@@ -23,7 +23,7 @@ - all: $(IBIN) - - fs-backend: $(OBJS) fs-backend.c -- $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c - - install: all - $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR) ---- ./tools/libfsimage/common/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ ./tools/libfsimage/common/Makefile 2011-09-27 16:41:16.516748626 +0800 -@@ -6,7 +6,7 @@ - - LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS - LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU --LDFLAGS = $(LDFLAGS-y) -+#LDFLAGS = $(LDFLAGS-y) - - LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c - ---- ./tools/misc/lomount/Makefile 2011-09-27 14:23:26.596752233 +0800 -+++ ./tools/misc/lomount/Makefile 2011-09-27 16:37:57.445748680 +0800 -@@ -23,5 +23,5 @@ - $(RM) *.a *.so *.o *.rpm $(BIN) - - %: %.c $(HDRS) Makefile -- $(CC) $(CFLAGS) -o $@ $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< - diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch deleted file mode 100644 index 8ca546b55190..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch +++ /dev/null @@ -1,257 +0,0 @@ -Only in xen-3.4.2/: cflags.sh -diff -ur xen-3.4.2.orig//config/StdGNU.mk xen-3.4.2//config/StdGNU.mk ---- xen-3.4.2.orig//config/StdGNU.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//config/StdGNU.mk 2011-09-26 02:18:14.630771549 +0800 -@@ -48,7 +48,7 @@ - SHLIB_CFLAGS = -shared - - ifneq ($(debug),y) --CFLAGS += -O2 -fomit-frame-pointer -+CFLAGS += -fomit-frame-pointer - else - # Less than -O1 produces bad code and large stack frames - CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -diff -ur xen-3.4.2.orig//config/SunOS.mk xen-3.4.2//config/SunOS.mk ---- xen-3.4.2.orig//config/SunOS.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//config/SunOS.mk 2011-09-26 02:18:14.640771549 +0800 -@@ -45,7 +45,7 @@ - SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared - - ifneq ($(debug),y) --CFLAGS += -O2 -fno-omit-frame-pointer -+CFLAGS += -fno-omit-frame-pointer - else - # Less than -O1 produces bad code and large stack frames - CFLAGS += -O1 -fno-omit-frame-pointer -diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk ---- xen-3.4.2.orig//Config.mk 2011-09-26 02:17:29.221771569 +0800 -+++ xen-3.4.2//Config.mk 2011-09-26 02:18:14.686771549 +0800 -@@ -14,7 +14,7 @@ - - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist -diff -ur xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk xen-3.4.2//extras/mini-os/arch/ia64/arch.mk ---- xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//extras/mini-os/arch/ia64/arch.mk 2011-09-26 02:18:14.689771549 +0800 -@@ -1,8 +1,8 @@ - - ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp --ARCH_CFLAGS += -O2 -+#ARCH_CFLAGS += -O2 - ARCH_ASFLAGS := -x assembler-with-cpp --ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer -+ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 - ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp - - ARCH_LDFLAGS = -warn-common -diff -ur xen-3.4.2.orig//stubdom/grub.patches/00cvs xen-3.4.2//stubdom/grub.patches/00cvs ---- xen-3.4.2.orig//stubdom/grub.patches/00cvs 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//stubdom/grub.patches/00cvs 2011-09-26 02:18:14.549771549 +0800 -@@ -223,8 +223,8 @@ - +++ grub/configure.ac 2008-04-10 23:26:50.000000000 +0100 - @@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then - fi -- STAGE1_CFLAGS="-O2" -- GRUB_CFLAGS="-O2" -+ STAGE1_CFLAGS="" -+ GRUB_CFLAGSS="" - - AC_CACHE_CHECK([whether optimization for size works], size_flag, [ - + AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [ - saved_CFLAGS=$CFLAGS -@@ -237,7 +237,7 @@ - + if test "x$grub_cv_cc_Os" = xyes; then - STAGE2_CFLAGS="-Os" - else -- STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops" -+ STAGE2_CFLAGS=" -fno-strength-reduce -fno-unroll-loops" - @@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then - # OpenBSD has a GCC extension for protecting applications from - # stack smashing attacks, but GRUB doesn't want this feature. -diff -ur xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure ---- xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2011-09-26 02:24:37.261771380 +0800 -@@ -1849,7 +1849,7 @@ - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" -+CFLAGS="" - echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 - echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_g+set}" = set; then -@@ -1898,15 +1898,15 @@ - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="" - else -- CFLAGS="-g" -+ CFLAGS="" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+# CFLAGS="-O2" - else -- CFLAGS= -+ CFLAGS="" - fi - fi - echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -Only in xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver: configure~ -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2011-09-26 02:17:29.223771569 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-26 02:22:14.583771444 +0800 -@@ -464,7 +464,7 @@ - - - # default flags for all hosts --CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing" -+CFLAGS="$CFLAGS -g -fno-strict-aliasing" - CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" - LDFLAGS="$LDFLAGS -g" - if test "$werror" = "yes" ; then -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile 2011-09-26 02:18:14.264771549 +0800 -@@ -12,7 +12,7 @@ - OBJCOPY = $(CROSS)objcopy - - # we rely on GCC inline:ing the stuff we tell it to in many places here. --CFLAGS = -Winline -Wall -g -O2 -static -+CFLAGS = -Winline -Wall -g -static - NOSTDFLAGS = -nostartfiles -nostdlib - ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/cris/ - LDLIBS = -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c 2011-09-26 02:18:14.669771549 +0800 -@@ -6,7 +6,7 @@ - * http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml - * - * mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \ --* -O2 -static -o hello-mips hello-mips.c -+* -static -o hello-mips hello-mips.c - * - */ - #define __NR_SYSCALL_BASE 4000 -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile 2011-09-26 02:18:14.262771549 +0800 -@@ -2,7 +2,7 @@ - -include ../config-host.mak - VPATH=$(SRC_PATH)/tests - --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=-Wall -g -fno-strict-aliasing - #CFLAGS+=-msse2 - LDFLAGS= - -@@ -52,7 +52,7 @@ - - .PHONY: test-mmap - test-mmap: test-mmap.c -- $(CC) $(CFLAGS) -Wall -static -O2 $(LDFLAGS) -o $@ $< -+ $(CC) $(CFLAGS) -Wall -static $(LDFLAGS) -o $@ $< - -./test-mmap - -$(QEMU) ./test-mmap - -$(QEMU) -p 8192 ./test-mmap 8192 -@@ -88,17 +88,17 @@ - arm-linux-ld -o $@ $< - - hello-arm.o: hello-arm.c -- arm-linux-gcc -Wall -g -O2 -c -o $@ $< -+ arm-linux-gcc -Wall -g -c -o $@ $< - - test-arm-iwmmxt: test-arm-iwmmxt.s - cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@ - - # MIPS test - hello-mips: hello-mips.c -- mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $< -+ mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $< - - hello-mipsel: hello-mips.c -- mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $< -+ mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $< - - # testsuite for the CRIS port. - test-cris: -diff -ur xen-3.4.2.orig//tools/libaio/src/Makefile xen-3.4.2//tools/libaio/src/Makefile ---- xen-3.4.2.orig//tools/libaio/src/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libaio/src/Makefile 2011-09-26 02:18:14.288771549 +0800 -@@ -6,7 +6,7 @@ - libdir=$(prefix)/lib - - ARCH := $(shell uname -m | sed -e s/i.86/i386/) --CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC -+CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -fPIC - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= -diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist ---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2011-09-26 02:17:29.223771569 +0800 -+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-26 02:18:14.553771549 +0800 -@@ -22,7 +22,7 @@ - CFLAGS = -Iinclude \ - $(shell xml2-config --cflags) \ - $(shell curl-config --cflags) \ -- -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC -+ -W -Wall -Wmissing-prototypes -std=c99 -fPIC - - LDFLAGS = $(shell xml2-config --libs) \ - $(shell curl-config --libs) -diff -ur xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 ---- xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 2011-09-26 02:18:14.659771549 +0800 -@@ -62,7 +62,7 @@ - CFLAGS += -Wno-unused-parameter - - CFLAGS += -g --CFLAGS += -O2 -+#CFLAGS += -O2 - CFLAGS += -fno-strict-aliasing - CFLAGS += -fno-common - #CFLAGS += -fomit-frame-pointer -diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk ---- xen-3.4.2.orig//extras/mini-os/minios.mk 2011-09-26 02:29:41.869771248 +0800 -+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-26 02:33:55.708771108 +0800 -@@ -23,7 +23,7 @@ - DEF_CFLAGS += -DGNT_DEBUG - DEF_CFLAGS += -DGNTMAP_DEBUG - else --DEF_CFLAGS += -O3 -+#DEF_CFLAGS += -O3 - endif - - # Make the headers define our internal stuff -diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile ---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2011-09-26 02:29:41.872771248 +0800 -+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-26 02:37:59.835771029 +0800 -@@ -26,7 +26,7 @@ - - $(call cc-option-add,CFLAGS,CC,-fgnu89-inline) - CFLAGS += -fno-strict-aliasing --CFLAGS += -O3 -+#CFLAGS += -O3 - #CFLAGS += -g - - MAJOR := 3.0 -diff -ur xen-3.4.2.orig//tools/vnet/vnetd/Makefile xen-3.4.2//tools/vnet/vnetd/Makefile ---- xen-3.4.2.orig//tools/vnet/vnetd/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vnet/vnetd/Makefile 2011-09-26 02:37:59.834771029 +0800 -@@ -44,7 +44,7 @@ - CPPFLAGS += -D __ARCH_I386_ATOMIC__ - - #---------------------------------------------------------------------------- --CFLAGS += -O3 -+#CFLAGS += -O3 - CFLAGS += $(INCLUDES) $(LIBS) - - LDFLAGS += $(LIBS)
\ No newline at end of file diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch deleted file mode 100644 index f9c746d6a631..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch +++ /dev/null @@ -1,429 +0,0 @@ -diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk ---- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800 -+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800 -@@ -14,7 +14,7 @@ - - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist -diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk ---- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +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-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile ---- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800 -@@ -5,7 +5,7 @@ - QCOW_UTIL = img2qcow qcow2raw qcow-create - LIBAIO_DIR = ../../libaio/src - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -I../lib - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile ---- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800 -@@ -13,7 +13,7 @@ - SRCS := - SRCS += xenbus.c blkif.c xs_api.c - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -fPIC - # get asprintf(): -diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile ---- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800 -@@ -2,7 +2,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenstore) -diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile ---- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../../.. - include $(XEN_ROOT)/tools/Rules.mk - --#CFLAGS += -Werror -g -O0 -+#CFLAGS += -g -O0 - - CFLAGS += $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk ---- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800 -@@ -10,7 +10,7 @@ - CFLAGS += -DNDEBUG - endif - --CFLAGS += -Werror -+CFLAGS += - - # Disable PIE/SSP if GCC supports them. They can break us. - $(call cc-option-add,CFLAGS,CC,-nopie) -diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile ---- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800 -@@ -9,7 +9,7 @@ - SRCS := - SRCS += flask_op.c - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -fno-strict-aliasing - CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE) - -diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile ---- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800 -@@ -6,7 +6,7 @@ - LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask - - PROFILE=#-pg --BASECFLAGS=-Wall -g -Werror -+BASECFLAGS=-Wall -g - BASECFLAGS+= $(PROFILE) - #BASECFLAGS+= -I$(XEN_ROOT)/tools - BASECFLAGS+= $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile ---- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800 -@@ -5,7 +5,7 @@ - - IBIN = fs-backend - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800 -@@ -468,7 +468,7 @@ - CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" - LDFLAGS="$LDFLAGS -g" - if test "$werror" = "yes" ; then --CFLAGS="$CFLAGS -Werror" -+CFLAGS="$CFLAGS" - fi - - if test "$solaris" = "no" ; then -@@ -1150,7 +1150,7 @@ - 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-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800 -@@ -26,7 +26,7 @@ - TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) - VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw - CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H --#CFLAGS+=-Werror -+#CFLAGS+= - LIBS= - # user emulator name - ifndef TARGET_ARCH2 -diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile ---- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +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-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk ---- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800 -@@ -1,6 +1,6 @@ - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ - LDFLAGS += -L../common/ - - PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile ---- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800 -+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800 -@@ -52,7 +52,7 @@ - - -include $(XEN_TARGET_ARCH)/Makefile - --CFLAGS += -Werror -Wmissing-prototypes -+CFLAGS += -Wmissing-prototypes - CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include - - # Needed for posix_fadvise64() in xc_linux.c -diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist ---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +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-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile ---- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - HDRS = $(wildcard *.h) - OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) -diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile ---- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - INCLUDES += -I $(XEN_XC) - INCLUDES += -I $(XEN_LIBXC) -diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py ---- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +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-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py ---- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800 -@@ -4,7 +4,7 @@ - - XEN_ROOT = "../.." - --extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] -+extra_compile_args = [ "-fno-strict-aliasing" ] - - include_dirs = [ XEN_ROOT + "/tools/libxc", - XEN_ROOT + "/tools/xenstore", -diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile ---- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -fno-strict-aliasing - CFLAGS += -I. $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile ---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800 -@@ -25,7 +25,7 @@ - PIC_OBJS := $(LIB_SRCS:.c=.opic) - - $(call cc-option-add,CFLAGS,CC,-fgnu89-inline) --CFLAGS += -Werror -fno-strict-aliasing -+CFLAGS += -fno-strict-aliasing - CFLAGS += -O3 - #CFLAGS += -g - -diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk ---- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800 -@@ -9,7 +9,7 @@ - TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - # General compiler flags --CFLAGS = -Werror -g3 -I. -+CFLAGS = -g3 -I. - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk ---- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800 -@@ -9,7 +9,7 @@ - TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - # General compiler flags --CFLAGS = -Werror -g3 -I. -+CFLAGS = -g3 -I. - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile ---- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800 -@@ -11,7 +11,7 @@ - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) - - PROGRAMS = xc_restore xc_save readnotes lsevtchn -diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile ---- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800 -@@ -13,7 +13,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -I $(XEN_XC) - CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile ---- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenstore) - LDFLAGS += $(LDFLAGS_libxenstore) - -diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile ---- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800 -@@ -34,7 +34,7 @@ - OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o - SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) - --WARN_FLAGS=-Wall -Werror -+WARN_FLAGS=-Wall - - CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE) - LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ -diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile ---- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800 -@@ -18,7 +18,7 @@ - all install xentop: - else - --CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) -+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT) - LDFLAGS += -L$(XEN_LIBXENSTAT) - LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) - CFLAGS += -DHOST_$(XEN_OS) -diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile ---- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800 -@@ -4,7 +4,7 @@ - MAJOR = 3.0 - MINOR = 0 - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -I. - CFLAGS += $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c ---- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800 -@@ -865,7 +865,7 @@ - { - unsigned int offset, datalen; - struct node *node; -- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */ -+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */ - char *name; - - /* Extra "strings" can be created by binary data. */ -diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile ---- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) -Only in xen-3.4.2/: Werror.sh -diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk ---- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800 -@@ -68,7 +68,7 @@ - CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK - endif - ifeq ($(no_warns),y) --CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized -+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized - endif - ifneq ($(vhpt_disable),y) - CFLAGS += -DVHPT_ENABLED=1 -diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk ---- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800 -@@ -8,7 +8,7 @@ - $(call cc-option-add,CFLAGS,CC,-fno-stack-protector) - $(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all) - --CFLAGS += -Werror -fno-builtin -msoft-float -+CFLAGS += -fno-builtin -msoft-float - - # NB. awk invocation is a portable alternative to 'head -n -1' - %.S: %.bin -diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk ---- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800 -@@ -17,7 +17,7 @@ - endif - - CFLAGS += -fno-builtin -fno-common --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 --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch deleted file mode 100644 index ef511a7db92c..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch +++ /dev/null @@ -1,731 +0,0 @@ -# HG changeset patch -# User Keir Fraser <keir@xen.org> -# Date 1311171934 -3600 -# Node ID 1976adbf2b807e505fdf0356c29ec0c0499ed533 -# Parent 411b38f8f90bc042a9e6839b6840dd57cbee4a8c -hvmloader: Switch to absolute addressing for calling hypercall stubs. - -This is clearer and less fragile than trying to make relative calls -work. In particular, the old approach failed if _start was not -== HVMLOADER_PHYSICAL_ADDRESS. This was the case for some modern -toolchains which reorder functions. - -Signed-off-by: Keir Fraser <keir@xen.org> -xen-unstable changeset: 23730:dd5eecf739d1 -xen-unstable date: Wed Jul 20 15:02:16 2011 +0100 - - -hvmloader: Remove hard tabs from source files. - -Signed-off-by: Keir Fraser <keir@xen.org> -xen-unstable changeset: 23729:4f1109af9c63 -xen-unstable date: Wed Jul 20 14:52:16 2011 +0100 - -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/hypercall.h ---- a/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:25:34 2011 +0100 -@@ -35,147 +35,148 @@ - #include <xen/xen.h> - #include "config.h" - --/* -- * NB. Hypercall address needs to be relative to a linkage symbol for -- * some version of ld to relocate the relative calls properly. -- */ --#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \ -- " + " STR(HYPERCALL_PHYSICAL_ADDRESS) -+#define hcall_addr(name) \ -+ ((unsigned long)HYPERCALL_PHYSICAL_ADDRESS + __HYPERVISOR_##name * 32) - --#define _hypercall0(type, name) \ --({ \ -- long __res; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res) \ -- : \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall0(type, name) \ -+({ \ -+ long __res; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res) \ -+ : "0" (hcall_addr(name)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall1(type, name, a1) \ --({ \ -- long __res, __ign1; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1) \ -- : "1" ((long)(a1)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall1(type, name, a1) \ -+({ \ -+ long __res, __ign1; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall2(type, name, a1, a2) \ --({ \ -- long __res, __ign1, __ign2; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ -- : "1" ((long)(a1)), "2" ((long)(a2)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall2(type, name, a1, a2) \ -+({ \ -+ long __res, __ign1, __ign2; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall3(type, name, a1, a2, a3) \ --({ \ -- long __res, __ign1, __ign2, __ign3; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -- "=d" (__ign3) \ -- : "1" ((long)(a1)), "2" ((long)(a2)), \ -- "3" ((long)(a3)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall3(type, name, a1, a2, a3) \ -+({ \ -+ long __res, __ign1, __ign2, __ign3; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -+ "=d" (__ign3) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)), \ -+ "3" ((long)(a3)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall4(type, name, a1, a2, a3, a4) \ --({ \ -- long __res, __ign1, __ign2, __ign3, __ign4; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -- "=d" (__ign3), "=S" (__ign4) \ -- : "1" ((long)(a1)), "2" ((long)(a2)), \ -- "3" ((long)(a3)), "4" ((long)(a4)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall4(type, name, a1, a2, a3, a4) \ -+({ \ -+ long __res, __ign1, __ign2, __ign3, __ign4; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -+ "=d" (__ign3), "=S" (__ign4) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)), \ -+ "3" ((long)(a3)), "4" ((long)(a4)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ --({ \ -- long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -- "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ -- : "1" ((long)(a1)), "2" ((long)(a2)), \ -- "3" ((long)(a3)), "4" ((long)(a4)), \ -- "5" ((long)(a5)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ -+({ \ -+ long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -+ "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)), \ -+ "3" ((long)(a3)), "4" ((long)(a4)), \ -+ "5" ((long)(a5)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - - static inline int - hypercall_sched_op( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, sched_op, cmd, arg); -+ return _hypercall2(int, sched_op, cmd, arg); - } - - static inline int - hypercall_memory_op( -- unsigned int cmd, void *arg) -+ unsigned int cmd, void *arg) - { -- return _hypercall2(int, memory_op, cmd, arg); -+ return _hypercall2(int, memory_op, cmd, arg); - } - - static inline int - hypercall_multicall( -- void *call_list, int nr_calls) -+ void *call_list, int nr_calls) - { -- return _hypercall2(int, multicall, call_list, nr_calls); -+ return _hypercall2(int, multicall, call_list, nr_calls); - } - - static inline int - hypercall_event_channel_op( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, event_channel_op, cmd, arg); -+ return _hypercall2(int, event_channel_op, cmd, arg); - } - - static inline int - hypercall_xen_version( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, xen_version, cmd, arg); -+ return _hypercall2(int, xen_version, cmd, arg); - } - - static inline int - hypercall_console_io( -- int cmd, int count, char *str) -+ int cmd, int count, char *str) - { -- return _hypercall3(int, console_io, cmd, count, str); -+ return _hypercall3(int, console_io, cmd, count, str); - } - - static inline int - hypercall_vm_assist( -- unsigned int cmd, unsigned int type) -+ unsigned int cmd, unsigned int type) - { -- return _hypercall2(int, vm_assist, cmd, type); -+ return _hypercall2(int, vm_assist, cmd, type); - } - - static inline int - hypercall_vcpu_op( -- int cmd, int vcpuid, void *extra_args) -+ int cmd, int vcpuid, void *extra_args) - { -- return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); -+ return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); - } - - static inline int - hypercall_hvm_op( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, hvm_op, cmd, arg); -+ return _hypercall2(int, hvm_op, cmd, arg); - } - - #endif /* __HVMLOADER_HYPERCALL_H__ */ -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/pci_regs.h ---- a/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:25:34 2011 +0100 -@@ -1,69 +1,69 @@ - /* -- * pci_regs.h -+ * pci_regs.h - * -- * PCI standard defines -- * Copyright 1994, Drew Eckhardt -- * Copyright 1997--1999 Martin Mares <mj@ucw.cz> -+ * PCI standard defines -+ * Copyright 1994, Drew Eckhardt -+ * Copyright 1997--1999 Martin Mares <mj@ucw.cz> - * -- * For more information, please consult the following manuals (look at -- * http://www.pcisig.com/ for how to get them): -+ * For more information, please consult the following manuals (look at -+ * http://www.pcisig.com/ for how to get them): - * -- * PCI BIOS Specification -- * PCI Local Bus Specification -- * PCI to PCI Bridge Specification -- * PCI System Design Guide -+ * PCI BIOS Specification -+ * PCI Local Bus Specification -+ * PCI to PCI Bridge Specification -+ * PCI System Design Guide - */ - - #ifndef __HVMLOADER_PCI_REGS_H__ - #define __HVMLOADER_PCI_REGS_H__ - --#define PCI_VENDOR_ID 0x00 /* 16 bits */ --#define PCI_DEVICE_ID 0x02 /* 16 bits */ --#define PCI_COMMAND 0x04 /* 16 bits */ --#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ --#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ --#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */ --#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */ --#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */ --#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */ --#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */ --#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */ --#define PCI_COMMAND_SERR 0x100 /* Enable SERR */ --#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ -+#define PCI_VENDOR_ID 0x00 /* 16 bits */ -+#define PCI_DEVICE_ID 0x02 /* 16 bits */ -+#define PCI_COMMAND 0x04 /* 16 bits */ -+#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ -+#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ -+#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */ -+#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */ -+#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */ -+#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */ -+#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */ -+#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */ -+#define PCI_COMMAND_SERR 0x100 /* Enable SERR */ -+#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ - #define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */ - --#define PCI_STATUS 0x06 /* 16 bits */ --#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ --#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ --#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */ --#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */ --#define PCI_STATUS_PARITY 0x100 /* Detected parity error */ --#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */ --#define PCI_STATUS_DEVSEL_FAST 0x000 --#define PCI_STATUS_DEVSEL_MEDIUM 0x200 --#define PCI_STATUS_DEVSEL_SLOW 0x400 --#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */ --#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */ --#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */ --#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */ --#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */ -+#define PCI_STATUS 0x06 /* 16 bits */ -+#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ -+#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ -+#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */ -+#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */ -+#define PCI_STATUS_PARITY 0x100 /* Detected parity error */ -+#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */ -+#define PCI_STATUS_DEVSEL_FAST 0x000 -+#define PCI_STATUS_DEVSEL_MEDIUM 0x200 -+#define PCI_STATUS_DEVSEL_SLOW 0x400 -+#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */ -+#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */ -+#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */ -+#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */ -+#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */ - --#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ --#define PCI_REVISION_ID 0x08 /* Revision ID */ --#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */ --#define PCI_CLASS_DEVICE 0x0a /* Device class */ -+#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ -+#define PCI_REVISION_ID 0x08 /* Revision ID */ -+#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */ -+#define PCI_CLASS_DEVICE 0x0a /* Device class */ - --#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */ --#define PCI_LATENCY_TIMER 0x0d /* 8 bits */ --#define PCI_HEADER_TYPE 0x0e /* 8 bits */ --#define PCI_HEADER_TYPE_NORMAL 0 --#define PCI_HEADER_TYPE_BRIDGE 1 --#define PCI_HEADER_TYPE_CARDBUS 2 -+#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */ -+#define PCI_LATENCY_TIMER 0x0d /* 8 bits */ -+#define PCI_HEADER_TYPE 0x0e /* 8 bits */ -+#define PCI_HEADER_TYPE_NORMAL 0 -+#define PCI_HEADER_TYPE_BRIDGE 1 -+#define PCI_HEADER_TYPE_CARDBUS 2 - --#define PCI_BIST 0x0f /* 8 bits */ --#define PCI_BIST_CODE_MASK 0x0f /* Return result */ --#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */ --#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */ -+#define PCI_BIST 0x0f /* 8 bits */ -+#define PCI_BIST_CODE_MASK 0x0f /* Return result */ -+#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */ -+#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */ - - /* - * Base addresses specify locations in memory or I/O space. -@@ -71,38 +71,38 @@ - * 0xffffffff to the register, and reading it back. Only - * 1 bits are decoded. - */ --#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */ --#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */ --#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */ --#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */ --#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */ --#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */ --#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */ --#define PCI_BASE_ADDRESS_SPACE_IO 0x01 --#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 --#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 --#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */ --#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ --#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ --#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ --#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) --#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) -+#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */ -+#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */ -+#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */ -+#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */ -+#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */ -+#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */ -+#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */ -+#define PCI_BASE_ADDRESS_SPACE_IO 0x01 -+#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 -+#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 -+#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */ -+#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ -+#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ -+#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ -+#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) -+#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) - /* bit 1 is reserved if address_space = 1 */ - - /* Header type 0 (normal devices) */ --#define PCI_CARDBUS_CIS 0x28 --#define PCI_SUBSYSTEM_VENDOR_ID 0x2c --#define PCI_SUBSYSTEM_ID 0x2e --#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ --#define PCI_ROM_ADDRESS_ENABLE 0x01 --#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) -+#define PCI_CARDBUS_CIS 0x28 -+#define PCI_SUBSYSTEM_VENDOR_ID 0x2c -+#define PCI_SUBSYSTEM_ID 0x2e -+#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ -+#define PCI_ROM_ADDRESS_ENABLE 0x01 -+#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) - --#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ -+#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ - - /* 0x35-0x3b are reserved */ --#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ --#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ --#define PCI_MIN_GNT 0x3e /* 8 bits */ --#define PCI_MAX_LAT 0x3f /* 8 bits */ -+#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ -+#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ -+#define PCI_MIN_GNT 0x3e /* 8 bits */ -+#define PCI_MAX_LAT 0x3f /* 8 bits */ - - #endif /* __HVMLOADER_PCI_REGS_H__ */ -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/smbios_types.h ---- a/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:25:34 2011 +0100 -@@ -32,157 +32,157 @@ - between 0xf0000 and 0xfffff. - */ - struct smbios_entry_point { -- char anchor_string[4]; -- uint8_t checksum; -- uint8_t length; -- uint8_t smbios_major_version; -- uint8_t smbios_minor_version; -- uint16_t max_structure_size; -- uint8_t entry_point_revision; -- uint8_t formatted_area[5]; -- char intermediate_anchor_string[5]; -- uint8_t intermediate_checksum; -- uint16_t structure_table_length; -- uint32_t structure_table_address; -- uint16_t number_of_structures; -- uint8_t smbios_bcd_revision; -+ char anchor_string[4]; -+ uint8_t checksum; -+ uint8_t length; -+ uint8_t smbios_major_version; -+ uint8_t smbios_minor_version; -+ uint16_t max_structure_size; -+ uint8_t entry_point_revision; -+ uint8_t formatted_area[5]; -+ char intermediate_anchor_string[5]; -+ uint8_t intermediate_checksum; -+ uint16_t structure_table_length; -+ uint32_t structure_table_address; -+ uint16_t number_of_structures; -+ uint8_t smbios_bcd_revision; - } __attribute__ ((packed)); - - /* This goes at the beginning of every SMBIOS structure. */ - struct smbios_structure_header { -- uint8_t type; -- uint8_t length; -- uint16_t handle; -+ uint8_t type; -+ uint8_t length; -+ uint16_t handle; - } __attribute__ ((packed)); - - /* SMBIOS type 0 - BIOS Information */ - struct smbios_type_0 { -- struct smbios_structure_header header; -- uint8_t vendor_str; -- uint8_t version_str; -- uint16_t starting_address_segment; -- uint8_t release_date_str; -- uint8_t rom_size; -- uint8_t characteristics[8]; -- uint8_t characteristics_extension_bytes[2]; -- uint8_t major_release; -- uint8_t minor_release; -- uint8_t embedded_controller_major; -- uint8_t embedded_controller_minor; -+ struct smbios_structure_header header; -+ uint8_t vendor_str; -+ uint8_t version_str; -+ uint16_t starting_address_segment; -+ uint8_t release_date_str; -+ uint8_t rom_size; -+ uint8_t characteristics[8]; -+ uint8_t characteristics_extension_bytes[2]; -+ uint8_t major_release; -+ uint8_t minor_release; -+ uint8_t embedded_controller_major; -+ uint8_t embedded_controller_minor; - } __attribute__ ((packed)); - - /* SMBIOS type 1 - System Information */ - struct smbios_type_1 { -- struct smbios_structure_header header; -- uint8_t manufacturer_str; -- uint8_t product_name_str; -- uint8_t version_str; -- uint8_t serial_number_str; -- uint8_t uuid[16]; -- uint8_t wake_up_type; -- uint8_t sku_str; -- uint8_t family_str; -+ struct smbios_structure_header header; -+ uint8_t manufacturer_str; -+ uint8_t product_name_str; -+ uint8_t version_str; -+ uint8_t serial_number_str; -+ uint8_t uuid[16]; -+ uint8_t wake_up_type; -+ uint8_t sku_str; -+ uint8_t family_str; - } __attribute__ ((packed)); - - /* SMBIOS type 3 - System Enclosure */ - struct smbios_type_3 { -- struct smbios_structure_header header; -- uint8_t manufacturer_str; -- uint8_t type; -- uint8_t version_str; -- uint8_t serial_number_str; -- uint8_t asset_tag_str; -- uint8_t boot_up_state; -- uint8_t power_supply_state; -- uint8_t thermal_state; -- uint8_t security_status; -+ struct smbios_structure_header header; -+ uint8_t manufacturer_str; -+ uint8_t type; -+ uint8_t version_str; -+ uint8_t serial_number_str; -+ uint8_t asset_tag_str; -+ uint8_t boot_up_state; -+ uint8_t power_supply_state; -+ uint8_t thermal_state; -+ uint8_t security_status; - } __attribute__ ((packed)); - - /* SMBIOS type 4 - Processor Information */ - struct smbios_type_4 { -- struct smbios_structure_header header; -- uint8_t socket_designation_str; -- uint8_t processor_type; -- uint8_t processor_family; -- uint8_t manufacturer_str; -- uint32_t cpuid[2]; -- uint8_t version_str; -- uint8_t voltage; -- uint16_t external_clock; -- uint16_t max_speed; -- uint16_t current_speed; -- uint8_t status; -- uint8_t upgrade; -+ struct smbios_structure_header header; -+ uint8_t socket_designation_str; -+ uint8_t processor_type; -+ uint8_t processor_family; -+ uint8_t manufacturer_str; -+ uint32_t cpuid[2]; -+ uint8_t version_str; -+ uint8_t voltage; -+ uint16_t external_clock; -+ uint16_t max_speed; -+ uint16_t current_speed; -+ uint8_t status; -+ uint8_t upgrade; - } __attribute__ ((packed)); - - /* SMBIOS type 11 - OEM Strings */ - struct smbios_type_11 { -- struct smbios_structure_header header; -- uint8_t count; -+ struct smbios_structure_header header; -+ uint8_t count; - } __attribute__ ((packed)); - - /* SMBIOS type 16 - Physical Memory Array - * Associated with one type 17 (Memory Device). - */ - struct smbios_type_16 { -- struct smbios_structure_header header; -- uint8_t location; -- uint8_t use; -- uint8_t error_correction; -- uint32_t maximum_capacity; -- uint16_t memory_error_information_handle; -- uint16_t number_of_memory_devices; -+ struct smbios_structure_header header; -+ uint8_t location; -+ uint8_t use; -+ uint8_t error_correction; -+ uint32_t maximum_capacity; -+ uint16_t memory_error_information_handle; -+ uint16_t number_of_memory_devices; - } __attribute__ ((packed)); - - /* SMBIOS type 17 - Memory Device - * Associated with one type 19 - */ - struct smbios_type_17 { -- struct smbios_structure_header header; -- uint16_t physical_memory_array_handle; -- uint16_t memory_error_information_handle; -- uint16_t total_width; -- uint16_t data_width; -- uint16_t size; -- uint8_t form_factor; -- uint8_t device_set; -- uint8_t device_locator_str; -- uint8_t bank_locator_str; -- uint8_t memory_type; -- uint16_t type_detail; -+ struct smbios_structure_header header; -+ uint16_t physical_memory_array_handle; -+ uint16_t memory_error_information_handle; -+ uint16_t total_width; -+ uint16_t data_width; -+ uint16_t size; -+ uint8_t form_factor; -+ uint8_t device_set; -+ uint8_t device_locator_str; -+ uint8_t bank_locator_str; -+ uint8_t memory_type; -+ uint16_t type_detail; - } __attribute__ ((packed)); - - /* SMBIOS type 19 - Memory Array Mapped Address */ - struct smbios_type_19 { -- struct smbios_structure_header header; -- uint32_t starting_address; -- uint32_t ending_address; -- uint16_t memory_array_handle; -- uint8_t partition_width; -+ struct smbios_structure_header header; -+ uint32_t starting_address; -+ uint32_t ending_address; -+ uint16_t memory_array_handle; -+ uint8_t partition_width; - } __attribute__ ((packed)); - - /* SMBIOS type 20 - Memory Device Mapped Address */ - struct smbios_type_20 { -- struct smbios_structure_header header; -- uint32_t starting_address; -- uint32_t ending_address; -- uint16_t memory_device_handle; -- uint16_t memory_array_mapped_address_handle; -- uint8_t partition_row_position; -- uint8_t interleave_position; -- uint8_t interleaved_data_depth; -+ struct smbios_structure_header header; -+ uint32_t starting_address; -+ uint32_t ending_address; -+ uint16_t memory_device_handle; -+ uint16_t memory_array_mapped_address_handle; -+ uint8_t partition_row_position; -+ uint8_t interleave_position; -+ uint8_t interleaved_data_depth; - } __attribute__ ((packed)); - - /* SMBIOS type 32 - System Boot Information */ - struct smbios_type_32 { -- struct smbios_structure_header header; -- uint8_t reserved[6]; -- uint8_t boot_status; -+ struct smbios_structure_header header; -+ uint8_t reserved[6]; -+ uint8_t boot_status; - } __attribute__ ((packed)); - - /* SMBIOS type 127 -- End-of-table */ - struct smbios_type_127 { -- struct smbios_structure_header header; -+ struct smbios_structure_header header; - } __attribute__ ((packed)); - - #endif /* SMBIOS_TYPES_H */ -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/util.c ---- a/tools/firmware/hvmloader/util.c Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/util.c Wed Jul 20 15:25:34 2011 +0100 -@@ -125,11 +125,11 @@ - - int strncmp(const char *s1, const char *s2, uint32_t n) - { -- uint32_t ctr; -- for (ctr = 0; ctr < n; ctr++) -- if (s1[ctr] != s2[ctr]) -- return (int)(s1[ctr] - s2[ctr]); -- return 0; -+ uint32_t ctr; -+ for (ctr = 0; ctr < n; ctr++) -+ if (s1[ctr] != s2[ctr]) -+ return (int)(s1[ctr] - s2[ctr]); -+ return 0; - } - - void *memcpy(void *dest, const void *src, unsigned n) diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml index 209d937f8e7b..50d1a7d0e909 100644 --- a/app-emulation/xen-tools/metadata.xml +++ b/app-emulation/xen-tools/metadata.xml @@ -8,11 +8,9 @@ <description>Proxy maintainer</description> </maintainer> <use> - <flag name='acm'>Enable the ACM/sHype XSM module from IBM for xen-3</flag> <flag name='api'>Build the C libxenapi bindings</flag> <flag name='flask'>Enable the Flask XSM module from NSA</flag> <flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v)</flag> - <flag name='ioemu'>Enable IOEMU support</flag> <flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag> <flag name='pygrub'>Install the pygrub boot loader</flag> <flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag> diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild deleted file mode 100644 index 5b9d0e9357f0..000000000000 --- a/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $ - -EAPI="3" - -inherit base flag-o-matic eutils multilib python - -# TPMEMUFILE=tpm_emulator-0.4.tar.gz - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" -# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )" -S="${WORKDIR}/xen-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc debug screen custom-cflags pygrub hvm api acm flask" - -CDEPEND="dev-lang/python[ncurses,threads] - sys-libs/zlib - hvm? ( media-libs/libsdl ) - acm? ( dev-libs/libxml2 ) - api? ( dev-libs/libxml2 net-misc/curl )" -# vtpm? ( dev-libs/gmp dev-libs/openssl ) - -DEPEND="${CDEPEND} - sys-devel/gettext - sys-devel/gcc - dev-lang/perl - dev-lang/python[ssl] - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - dev-texlive/texlive-latexextra - media-gfx/transfig - media-gfx/graphviz - ) - hvm? ( - x11-proto/xproto - sys-devel/dev86 - )" - -RDEPEND="${CDEPEND} - sys-apps/iproute2 - net-misc/bridge-utils - dev-python/pyxml - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( virtual/udev sys-apps/hotplug )" - -PATCHES=( - "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - "${FILESDIR}/${PN}-3.3.0-nostrip.patch" - "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch" - "${FILESDIR}/${P}-as-needed.patch" - "${FILESDIR}/${P}-fix-definitions.patch" - "${FILESDIR}/${P}-fix-include.patch" - "${FILESDIR}/${P}-werror-idiocy-v2.patch" -) - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" -QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32 - usr/share/xen/qemu/openbios-sparc64" - -pkg_setup() { - export "CONFIG_LOMOUNT=y" - - if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then - eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" - eerror "an amd64 multilib profile is required. Remove the hvm use flag" - eerror "to build xen-tools on your current profile." - die "USE=hvm is unsupported on this system." - 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 vtpm && export "VTPM_TOOLS=y" - use api && export "LIBXENAPI_BINDINGS=y" - use acm && export "ACM_SECURITY=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - base_src_prepare - - # use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm - - # 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 custom-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 {} \; - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - chmod 644 tools/check/check_x11_devel - sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk - sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile - fi - - if ! use pygrub; then - sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile - fi - - sed -e '/texi2html/ s/-number/&-sections/' \ - -i tools/ioemu-qemu-xen/Makefile || die #409333 -} - -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 - - emake -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake docs || die "compiling docs failed" - emake dev-docs || die "make dev-docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - dodoc README docs/README.xen-bugtool docs/ChangeLog - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ - || die "install docs failed" - - dohtml -r docs/api/ - docinto pdf - dodoc docs/api/tools/python/latex/refman.pdf - - [ -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?/* - - newinitd "${FILESDIR}"/xend.initd-r1 xend \ - || die "Couldn't install xen.initd" - newconfd "${FILESDIR}"/xendomains.confd xendomains \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \ - || die "Couldn't install xendomains.initd" - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - 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 -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " http://www.gentoo.org/doc/en/xen-guide.xml" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - if [[ "$(scanelf -s __guard -q $(type -P 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 probablem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - 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 multilib system is required to build HVM support." - echo - elog "The ioemu use flag has been removed and replaced with hvm." - 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 - - python_mod_optimize $(use pygrub && echo grub) xen -} - -pkg_postrm() { - python_mod_cleanup $(use pygrub && echo grub) xen -} diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild deleted file mode 100644 index 87068922c0f3..000000000000 --- a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.6 2012/12/02 22:48:42 ssuominen Exp $ - -EAPI="3" - -inherit base flag-o-matic eutils multilib python toolchain-funcs - -# TPMEMUFILE=tpm_emulator-0.4.tar.gz - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" -# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )" -S="${WORKDIR}/xen-${PV}" -QA_PRESTRIPPED="/usr/share/xen/qemu/openbios-ppc \ - /usr/share/xen/qemu/openbios-sparc64 \ - /usr/share/xen/qemu/openbios-sparc32" -QA_WX_LOAD="${QA_PRESTRIPPED}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags pygrub hvm api acm flask" - -CDEPEND="dev-lang/python[ncurses,threads] - sys-libs/zlib - hvm? ( media-libs/libsdl ) - acm? ( dev-libs/libxml2 ) - api? ( dev-libs/libxml2 net-misc/curl )" -# vtpm? ( dev-libs/gmp dev-libs/openssl ) - -DEPEND="${CDEPEND} - sys-devel/gettext - sys-devel/gcc - dev-lang/perl - dev-lang/python[ssl] - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/transfig - media-gfx/graphviz - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexextra - dev-texlive/texlive-latexrecommended - ) - hvm? ( - x11-proto/xproto - sys-devel/dev86 - )" - -RDEPEND="${CDEPEND} - sys-apps/iproute2 - net-misc/bridge-utils - dev-python/pyxml - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( virtual/udev sys-apps/hotplug )" - -PATCHES=( - "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - "${FILESDIR}/${PN}-3.3.0-nostrip.patch" - "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch" - "${FILESDIR}/${P}-as-needed.patch" - "${FILESDIR}/${P}-fix-definitions.patch" - "${FILESDIR}/${P}-fix-include.patch" - "${FILESDIR}/${P}-werror-idiocy-v2.patch" - "${FILESDIR}/${P}-ldflags-respect.patch" -) - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" -QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32 - usr/share/xen/qemu/openbios-sparc64" - -pkg_setup() { - if [ -x /.config/ ]; then - die "the system has a dir /.config; this needs to be removed to allow the package to emerge" - fi - - export "CONFIG_LOMOUNT=y" - - if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then - eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" - eerror "an amd64 multilib profile is required. Remove the hvm use flag" - eerror "to build xen-tools on your current profile." - die "USE=hvm is unsupported on this system." - 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 vtpm && export "VTPM_TOOLS=y" - use api && export "LIBXENAPI_BINDINGS=y" - use acm && export "ACM_SECURITY=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - base_src_prepare - - # use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm - - # if the user *really* wants to use their own custom-cflags, let them - # Try and remove all the default custom-cflags - if use custom-cflags; then - epatch "${FILESDIR}/${P}-remove-default-cflags.patch" - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - chmod 644 tools/check/check_x11_devel - sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk - sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile - fi - - if ! use pygrub; then - sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile - fi - - sed -e '/texi2html/ s/-number/&-sections/' \ - -i tools/ioemu-qemu-xen/Makefile || die #409333 -} - -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 - - emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake docs || die "compiling docs failed" - emake dev-docs || die "make dev-docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - # Remove unneeded static-libs - rm "${D}"/usr/lib64/libxenctrl.a "${D}"/usr/lib64/libxenguest.a \ - "${D}"/usr/lib64/libflask.a "${D}"/usr/lib64/libxenstore.a \ - "${D}"/usr/lib64/libblktap.a "${D}"/usr/lib64/libxenapi.a - - dodoc README docs/README.xen-bugtool docs/ChangeLog - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ - || die "install docs failed" - - dohtml -r docs/api/ - docinto pdf - dodoc docs/api/tools/python/latex/refman.pdf - - [ -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?/* - - newinitd "${FILESDIR}"/xend.initd-r1 xend \ - || die "Couldn't install xen.initd" - newconfd "${FILESDIR}"/xendomains.confd xendomains \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \ - || die "Couldn't install xendomains.initd" - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - 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 -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " http://www.gentoo.org/doc/en/xen-guide.xml" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - if [[ "$(scanelf -s __guard -q $(type -P 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 probablem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - 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 multilib system is required to build HVM support." - echo - elog "The ioemu use flag has been removed and replaced with hvm." - 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 - - python_mod_optimize $(use pygrub && echo grub) xen -} - -pkg_postrm() { - python_mod_cleanup $(use pygrub && echo grub) xen -} diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild index d274e2983000..a8e8710f18a8 100644 --- a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2012 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.1.1-r6.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.6 2012/12/04 12:00:12 idella4 Exp $ EAPI="3" +PATCH23104="http://dev.gentoo.org/~idella4/${P}-upstream-23104-1976adbf2b80.patch" + if [[ $PV == *9999 ]]; then KEYWORDS="" REPO="xen-unstable.hg" @@ -14,7 +16,8 @@ else KEYWORDS="amd64 ~x86" XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \ - $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz" + $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz + $PATCH23104" S="${WORKDIR}/xen-${PV}" fi @@ -66,7 +69,7 @@ RDEPEND="${CDEPEND} app-misc/screen app-admin/logrotate ) - || ( virtual/udev sys-apps/hotplug )" + || ( sys-fs/udev sys-apps/hotplug )" # hvmloader is used to bootstrap a fully virtualized kernel # Approved by QA team in bug #144032 @@ -185,7 +188,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-4.1.1-libxl-tap.patch" # Patch from bug #382329 for hvmloader - epatch "${FILESDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch" + epatch "${DISTDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch" # Prevent the downloading of ipxe sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \ diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild index 8364d1f02cb8..c39c7d3a8cdf 100644 --- a/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.1.2-r3.ebuild,v 1.2 2012/12/02 22:48:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.3 2012/12/04 12:00:12 idella4 Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -78,7 +78,7 @@ RDEPEND="${CDEPEND} app-misc/screen app-admin/logrotate ) - || ( virtual/udev sys-apps/hotplug ) + || ( sys-fs/udev sys-apps/hotplug ) selinux? ( sec-policy/selinux-xen )" # hvmloader is used to bootstrap a fully virtualized kernel diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild index d7de26992643..1e8e5e4909eb 100644 --- a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild @@ -1,8 +1,13 @@ # Copyright 1999-2012 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.1.1-r5.ebuild,v 1.7 2012/12/02 22:48:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild,v 1.1 2012/12/04 12:00:12 idella4 Exp $ -EAPI="3" +EAPI="4" +PYTHON_DEPEND="2" +PYTHON_USE_WITH="xml threads" + +IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" +XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2" if [[ $PV == *9999 ]]; then KEYWORDS="" @@ -11,25 +16,32 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="~amd64 x86" - XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \ - $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz" + KEYWORDS="~amd64 ~x86" + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz + $IPXE_TARBALL_URL + $XEN_SEABIOS_URL" S="${WORKDIR}/xen-${PV}" fi - inherit flag-o-matic eutils multilib python toolchain-funcs ${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 pygrub screen xend" +IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen static-libs xend" + +REQUIRED_USE="hvm? ( qemu )" -CDEPEND="dev-lang/python +CDEPEND="<dev-libs/yajl-2 dev-python/lxml + dev-python/pypam + dev-python/pyxml sys-libs/zlib + sys-devel/bin86 + sys-devel/dev86 + dev-ml/findlib hvm? ( media-libs/libsdl sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl )" @@ -41,7 +53,7 @@ DEPEND="${CDEPEND} dev-ml/findlib doc? ( app-doc/doxygen - dev-tex/latex2html + dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor @@ -55,28 +67,34 @@ DEPEND="${CDEPEND} hvm? ( x11-proto/xproto sys-devel/dev86 - )" + ) pygrub? ( dev-lang/python[ncurses] ) + " RDEPEND="${CDEPEND} sys-apps/iproute2 net-misc/bridge-utils - dev-python/pyxml >=dev-lang/ocaml-3.12.0 screen? ( app-misc/screen app-admin/logrotate ) - || ( virtual/udev sys-apps/hotplug )" + || ( sys-fs/udev sys-apps/hotplug )" # hvmloader is used to bootstrap a fully virtualized kernel # Approved by QA team in bug #144032 QA_WX_LOAD="usr/lib/xen/boot/hvmloader" -QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32 - usr/share/xen/qemu/openbios-sparc64" + +RESTRICT="test" pkg_setup() { + python_set_active_version 2 + python_pkg_setup export "CONFIG_LOMOUNT=y" + if has_version dev-libs/libgcrypt; then + export "CONFIG_GCRYPT=y" + fi + if use qemu; then export "CONFIG_IOEMU=y" else @@ -102,99 +120,85 @@ pkg_setup() { fi fi - if use doc && ! has_version "dev-tex/latex2html[png,gif]"; then - # die early instead of later - eerror "USE=doc requires latex2html with image support. Please add" - eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html" - die "latex2html missing both png and gif flags" - fi - - if use pygrub && ! has_version "dev-lang/python[ncurses]"; then - eerror "USE=pygrub requires python to be built with ncurses support. Please add" - eerror "'ncurses' to your use flags and re-emerge python" - die "python is missing ncurses flags" - fi - - if ! has_version "dev-lang/python[threads]"; then - eerror "Python is required to be built with threading support. Please add" - eerror "'threads' to your use flags and re-emerge python" - die "python is missing threads flags" - fi - use api && export "LIBXENAPI_BINDINGS=y" use flask && export "FLASK_ENABLE=y" - - if use hvm && ! use qemu; then - elog "With qemu disabled, it is not possible to use HVM machines " \ - "or PVM machines with a framebuffer attached in the kernel config" \ - "The addition of use flag qemu is required when use flag hvm ise selected" - fi } src_prepare() { - cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS" + # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + # 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" + -i tools/misc/Makefile || die "Disabling xend failed" || die sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || "Disabling xend failed" + -i tools/examples/Makefile || "Disabling xend failed" || die 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 custom-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 {} \; + + # try and remove all the default custom-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 - chmod 644 tools/check/check_x11_devel - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile + sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die + sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die fi - if ! use pygrub; then - sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile - 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 - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" \ - -i Makefile + 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 build for gcc-4.6 - sed -e "s:-Werror::g" -i tools/xenstat/xentop/Makefile + find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) -exec sed \ + -e "s:-Werror::g" \ + -i {} \; || die "Failed to remove -Werror" + + # Fix texi2html build error with new texi2html + sed -r -e "s:(texi2html.*) -number:\1:" -i tools/qemu-xen-traditional/Makefile + # Fix network broadcast on bridged networks epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - # Do not strip binaries - epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch" + # Prevent the downloading of ipxe, seabios + epatch "${FILESDIR}"/${P/-tools/}-anti-download.patch + cp $DISTDIR/ipxe.tar.gz tools/firmware/etherboot/ || die + mv ../seabios-dir-remote tools/firmware/ || die + pushd tools/firmware/ > /dev/null + ln -s seabios-dir-remote seabios-dir || die + popd > /dev/null - # Patch to libxl bug #380343 - epatch "${FILESDIR}/${PN}-4.1.1-libxl-tap.patch" + # Fix bridge by idella4, bug #362575 + epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - # Patch from bug #382329 for hvmloader - epatch "${FILESDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch" + # Don't build ipxe with pie on hardened, Bug #360805 + if gcc-specs-pie; then + epatch "${FILESDIR}/ipxe-nopie.patch" + fi - # Prevent the downloading of ipxe - sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \ - -e 's:^\tfi:#\tfi:' -i \ - -e 's:^\tmv _$T $T:#\tmv _$T $T:' \ - -i tools/firmware/etherboot/Makefile || die + # Prevent double stripping of files at install + epatch "${FILESDIR}"/${P/-tools/}-nostrip.patch - sed -e '/texi2html/ s/-number/&-sections/' \ - -i tools/ioemu-qemu-xen/Makefile || die #409333 + # fix jobserver in Makefile + epatch "${FILESDIR}"/${P/-tools/}-jserver.patch } src_compile() { @@ -208,15 +212,16 @@ src_compile() { fi unset LDFLAGS - emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed" + unset CFLAGS + emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} if use doc; then sh ./docs/check_pkgs || die "package check failed" - emake docs || die "compiling docs failed" - emake dev-docs || die "make dev-docs failed" + emake docs + emake dev-docs fi - emake -C docs man-pages || die "make man-pages failed" + emake -C docs man-pages } src_install() { @@ -224,11 +229,10 @@ src_install() { export INITD_DIR=/etc/init.d export CONFIG_LEAF_DIR=default - make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ - || die "install failed" + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools # Remove RedHat-specific stuff - rm -r "${D}"/etc/init.d/xen* "${D}"/etc/default || die + rm -rf "${ED}"/etc/init.d/xen* "${ED}"/etc/default || die # uncomment lines in xl.conf sed -e 's:^#autoballoon=1:autoballoon=1:' \ @@ -236,48 +240,55 @@ src_install() { -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ -i tools/examples/xl.conf || die - dodoc README docs/README.xen-bugtool docs/ChangeLog if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ - || die "install docs failed" + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs dohtml -r docs/api/ docinto pdf - dodoc docs/api/tools/python/latex/refman.pdf - - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html + dodoc ${DOCS[@]} + [ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html fi - rm -rf "${D}"/usr/share/doc/xen/ + rm -rf "${ED}"/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 \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \ - || die "Couldn't install xendomains.initd" - newinitd "${FILESDIR}"/xenstored.initd xenstored \ - || die "Couldn't install xenstored.initd" - newconfd "${FILESDIR}"/xenstored.confd xenstored \ - || die "Couldn't install xenstored.confd" - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled \ - || die "Couldn't install xenconsoled.initd" - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled \ - || die "Couldn't install xenconsoled.confd" + 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 if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ + 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 + # For -static-libs wrt Bug 384355 + if ! use static-libs; then + rm -f ${ED}usr/$(get_libdir)/*.a ${ED}usr/$(get_libdir)/ocaml/*/*.a + fi + + #python_convert_shebangs -r 2 "${ED}" # 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 + mkdir -p "${ED}"$(get_libdir) + mv "${ED}"etc/udev "${ED}"$(get_libdir) + + # Remove files failing QA AFTER emake installs them, avoiding seeking absent files + rm -f $(find "${ED}" -name openbios-sparc32) \ + $(find "${ED}" -name openbios-sparc64) \ + $(find "${ED}" -name openbios-ppc) \ + $(find "${ED}" -name palcode-clipper) || die } pkg_postinst() { @@ -312,16 +323,17 @@ pkg_postinst() { echo elog "The qemu use flag has been removed and replaced with hvm." 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 - python_mod_optimize $(use pygrub && echo grub) xen } |