summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/xen-tools/ChangeLog10
-rw-r--r--app-emulation/xen-tools/Manifest25
-rw-r--r--app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy.patch71
-rw-r--r--app-emulation/xen-tools/xen-tools-3.4.2-r2.ebuild (renamed from app-emulation/xen-tools/xen-tools-3.4.2-r1.ebuild)32
4 files changed, 97 insertions, 41 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 69b185b763be..3947af692654 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-emulation/xen-tools
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.89 2011/09/21 21:13:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.90 2011/09/23 17:09:51 chainsaw Exp $
+
+*xen-tools-3.4.2-r2 (23 Sep 2011)
+
+ 23 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -xen-tools-3.4.2-r1.ebuild,
+ +xen-tools-3.4.2-r2.ebuild, +files/xen-tools-3.4.2-werror-idiocy.patch:
+ Patch by Ian "idella4" Delaney to clear -Werror, stopping GCC 4.5 build
+ failures. Closes bug #383977. Moved to using a PATCHES array and the base
+ eclass.
21 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org>
files/xen-tools-3.4.2-fix-definitions.patch,
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 4555c04c76a9..0949ab36e5a3 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
AUX xen-tools-3.3.0-nostrip.patch 1021 RMD160 f702b588596dfdebf71fafbf866d270ac5bb549e SHA1 bb4db097af6e206ed68bcc1a1c3ef48b02e9a4c5 SHA256 2debac718c01a7eac4daf3182a7ae04aa562137d791cd510ecf1848d7eaccebd
AUX xen-tools-3.3.1-sandbox-fix.patch 828 RMD160 6c637b0883b72f12ce33b9c6d2dc7cf5267fc85a SHA1 51b35f096c0ad5c83e9654cfe0267b8efc51367e SHA256 519236a71e81e1da1c9a7616745422e6f205f4f7901abba7af0e0aef665af343
@@ -8,6 +5,7 @@ AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 RMD160 3a8c57fe70837861f6
AUX xen-tools-3.4.2-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772
AUX xen-tools-3.4.2-fix-definitions.patch 358 RMD160 d9cbf9cacb780f5de2ad7f05d981d292aa7dc994 SHA1 1a6163deb6b177b00e013fdfc6f1faf0bf20769e SHA256 0e43548bb3727beff625050fadacd04c1b2a0bec315531f793928a6808654aa8
AUX xen-tools-3.4.2-fix-include.patch 894 RMD160 c1c17e63f4296b175159cae579b9d25f8654d7d3 SHA1 f7549495b1cecf8142c98ea4601d77e5f69619ec SHA256 3095dc197c48d0e4bf3ee122e427e00bfdd8e52f4e2b421fdca30ce32886d476
+AUX xen-tools-3.4.2-werror-idiocy.patch 2802 RMD160 15ed7cd5890abefe25b4c4105812ab71d338fe27 SHA1 7007a1e71b5655bb8c2ab76beaf945d79af4bae4 SHA256 717a7301010536915570f3bd76660a8649392a19dffcf28d44f81044c0f7c7d1
AUX xen-tools-4.1.1-libxl-tap.patch 1071 RMD160 a345fab381af82ffdf7a4206d9db30f6845e5867 SHA1 bbe2ddd9eb8119ae172fd9671fe58bda80bf9095 SHA256 ee03a5b68a9edf5d4fe78a322ff261e13f6ded879f3898b0ea72c407f678f885
AUX xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 RMD160 7d3bd028c5da4b2a48f1e992900bbf1866c9c4ea SHA1 55c5476e632649d4d635db1023193216455d076d SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f
AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060
@@ -23,26 +21,9 @@ AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 983
DIST ipxe-git-v1.0.0.tar.gz 1996881 RMD160 dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 SHA1 da052c8de5f3485fe0253c19cf52ed6d72528485 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723
DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
-EBUILD xen-tools-3.4.2-r1.ebuild 7296 RMD160 71efba76364ddb84a590172354d44d9cbe9d4db1 SHA1 bb839ea3f993d72eda2efedf9fa9c84dce27756a SHA256 7a6df3b65045b304d104bd71bf21190a332c70be5fa6d00c0ca48fb21ce7b4c5
+EBUILD xen-tools-3.4.2-r2.ebuild 7051 RMD160 892e637d949aa8fd218a294e8694ad58268a46a1 SHA1 e8705112e4d9d2609c3c05b6fecb854ff8722d4e SHA256 06d3248319485f7c65e9278c3243b71d1bd5e9e6ca87029787ab05e1f76a67fc
EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
EBUILD xen-tools-4.1.1-r5.ebuild 9876 RMD160 91ca02b8248405104ebaaa78115054fbff8ec8da SHA1 570b4c64976ecbacdc7204da859feb069820959f SHA256 5389eda3315eff848c71c1dea463881061ea776d3343ed6f6ffd3168ea81c51c
EBUILD xen-tools-9999.ebuild 9682 RMD160 2f60aa64bb720767cee6b7a88a421613f92dcf02 SHA1 69a5487f75dd757d5da96bb2339c38819fe6d4d6 SHA256 20770f7c8a02ea141be8a8772624e6dcf8266dbee477b31e87f265695b939a69
-MISC ChangeLog 21719 RMD160 d3827085dfa7419c0f06016170dbaedcdf18b095 SHA1 6363693d356d8a198de0a0ccd97f7bfe3ba7b048 SHA256 45e80d272f5c53e199124307d65abd23374b3d39040713531e36af345edcc4e0
+MISC ChangeLog 22067 RMD160 7326f85963abc5284793ae2cb8ae8779cb16a77e SHA1 f5fccaa709dfa2dda5778ef48de4a98778841e48 SHA256 b7700de66d450b0254493823c3a20eddf2eaf59c6c8abe49324be49cf5e4f364
MISC metadata.xml 865 RMD160 7188d730684d02d8bcf8dbce413c01ae50b84ad1 SHA1 4815bcf6d0c2c61c6186ecde52d984669c44ccfd SHA256 08f789d1d92184515d9360b20c7ec0f8554977c470c702c659e79aced68edf38
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCAAGBQJOelMeAAoJEOf+E+/4L5Lmn2cP/2+8vBJCIPYvXJeWwQqeuoRi
-qWzCvKps78oR3lBGLo9Dmh2KEQ1fHHCYjzxx/Ej08PYILtrERkbskcZZeLFkbgCI
-5BfqfNs/MDKHvCd5+UN1JHlKLYLuu5Quj8KBpVI9LvA6VKnW74/ynFhWGsI+bRWq
-606qHOj8wWamE30Xy0thgH0OUPNWQowWS64cOTBQKLl+heU3ytp1u+WHfD86GG9d
-2xJL/8rjkeUo3So1BtsY20rn8VHvH2TJD07KR096eAeR0jxA012dTXQnrnuaG6vA
-Bd63qbFOI7VzCd4tML2uXvlN90fQn8C04h2WUBa8V6/TfFvpR5ErruY/8+wT53uY
-gHT7ouQfoWBL1bo4H+YrjDLb6W2R5ScuSmtwzVCPyQvheqDVj4YGtx5ClJHZzL1X
-mCik0hcAeKehzaPyttknC9jYokKTou3+FogWwpjMAGW8Ry9E2EspM1hjleYdD9jN
-wO9uDeOxAE6ZTqjSQE7gmA5xOV4HNr7X/h7WDNBMEE63B3H0vvD/lv6ywSl2dL6k
-8BkatVTOQySKkkgNyDTbd21dIr5fZCThwXSmvQk7mUVzwK34tCApTGNN6RDNos1r
-VZX4zjq6fk9n+OMJkiiefi9/mJSmFleR1HWYXfJweysy/kDyqRZ3XJnROIf1n3mm
-cY/zEbAcZSn+s+k84PWQ
-=2WOz
------END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy.patch
new file mode 100644
index 000000000000..a5bda0d92c23
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy.patch
@@ -0,0 +1,71 @@
+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-24 00:47:42.426816068 +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/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-24 00:47:42.428816067 +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/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-24 00:47:42.424816065 +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-24 00:47:42.423816061 +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//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-24 00:47:42.432816065 +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/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-24 00:47:42.435816065 +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 \ No newline at end of file
diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r2.ebuild
index 85f475d98997..6358ca8ed8fc 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.2-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/09/21 17:27:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r2.ebuild,v 1.1 2011/09/23 17:09:51 chainsaw Exp $
EAPI="3"
-inherit flag-o-matic eutils multilib python
+inherit base flag-o-matic eutils multilib python
# TPMEMUFILE=tpm_emulator-0.4.tar.gz
@@ -54,6 +54,16 @@ RDEPEND="${CDEPEND}
)
|| ( sys-fs/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.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"
@@ -89,6 +99,8 @@ pkg_setup() {
}
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
@@ -114,22 +126,6 @@ src_prepare() {
if ! use pygrub; then
sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
fi
-
- # 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"
-
- # fix variable declaration to avoid sandbox issue, #253134
- epatch "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
-
- # Fix --as-needed issues, bug 296631
- epatch "${FILESDIR}/${P}-as-needed.patch" || die "as-needed patch failed to apply"
-
- # Fix WRITE define, bug #379815
- epatch "${FILESDIR}/${P}-fix-definitions.patch" \
- "${FILESDIR}/${P}-fix-include.patch" || die "include patch failed to apply"
}
src_compile() {