1 |
commit: 91eeab213a1a18e7c7e1470ebf0647504409fe72 |
2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 28 15:41:25 2011 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 28 15:41:25 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=91eeab21 |
7 |
|
8 |
Revork ebuilds |
9 |
|
10 |
(Portage version: 2.2.0_alpha78/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
app-emulation/xen-tools/Manifest | 40 +-- |
14 |
.../files/xen-tools-3.3.1-sandbox-fix.patch | 21 - |
15 |
.../files/xen-tools-3.4.2-as-needed.patch | 13 - |
16 |
.../files/xen-tools-3.4.2-fix-definitions.patch | 16 - |
17 |
.../files/xen-tools-3.4.2-fix-include.patch | 28 -- |
18 |
.../files/xen-tools-3.4.2-ldflags-respect.patch | 31 -- |
19 |
.../xen-tools-3.4.2-remove-default-cflags.patch | 257 ------------ |
20 |
.../files/xen-tools-3.4.2-werror-idiocy-v2.patch | 429 -------------------- |
21 |
.../files/xen-tools-4.1.1-libxl-tap.patch | 37 -- |
22 |
app-emulation/xen-tools/files/xend.initd-r1 | 71 ---- |
23 |
app-emulation/xen-tools/files/xendomains.initd-r1 | 117 ------ |
24 |
app-emulation/xen-tools/metadata.xml | 2 - |
25 |
app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild | 250 ------------ |
26 |
...s-4.1.2-r1.ebuild => xen-tools-4.1.2-r2.ebuild} | 38 +-- |
27 |
14 files changed, 11 insertions(+), 1339 deletions(-) |
28 |
|
29 |
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest |
30 |
index b28974f..a4ed5c6 100644 |
31 |
--- a/app-emulation/xen-tools/Manifest |
32 |
+++ b/app-emulation/xen-tools/Manifest |
33 |
@@ -1,38 +1,2 @@ |
34 |
-AUX ipxe-nopie.patch 952 RMD160 243c65b1e9e27fde14b10c5f605cce635de88032 SHA1 06870bb3bb063aabe16e721f487f0756a5889e8f SHA256 22d1e84568e4bdf204404c45cd4d323a78a1b5a5a29cc4a0707894e22f40bd48 |
35 |
-AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 |
36 |
-AUX xen-tools-3.3.0-nostrip.patch 1021 RMD160 f702b588596dfdebf71fafbf866d270ac5bb549e SHA1 bb4db097af6e206ed68bcc1a1c3ef48b02e9a4c5 SHA256 2debac718c01a7eac4daf3182a7ae04aa562137d791cd510ecf1848d7eaccebd |
37 |
-AUX xen-tools-3.3.1-sandbox-fix.patch 828 RMD160 6c637b0883b72f12ce33b9c6d2dc7cf5267fc85a SHA1 51b35f096c0ad5c83e9654cfe0267b8efc51367e SHA256 519236a71e81e1da1c9a7616745422e6f205f4f7901abba7af0e0aef665af343 |
38 |
-AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 RMD160 3a8c57fe70837861f6f69d1d260c6fa6adad43e3 SHA1 cc02643eee7a39e97b53674066516c80ec0c3b38 SHA256 d00a1954447fc29500ab2f1a8c7900310e0dee81942be5c922ad66b6b42dfb74 |
39 |
-AUX xen-tools-3.4.2-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772 |
40 |
-AUX xen-tools-3.4.2-fix-definitions.patch 358 RMD160 d9cbf9cacb780f5de2ad7f05d981d292aa7dc994 SHA1 1a6163deb6b177b00e013fdfc6f1faf0bf20769e SHA256 0e43548bb3727beff625050fadacd04c1b2a0bec315531f793928a6808654aa8 |
41 |
-AUX xen-tools-3.4.2-fix-include.patch 894 RMD160 c1c17e63f4296b175159cae579b9d25f8654d7d3 SHA1 f7549495b1cecf8142c98ea4601d77e5f69619ec SHA256 3095dc197c48d0e4bf3ee122e427e00bfdd8e52f4e2b421fdca30ce32886d476 |
42 |
-AUX xen-tools-3.4.2-ldflags-respect.patch 1057 RMD160 d463f678e845e1d92012ec7013e211f52489839b SHA1 54916dd7f1d2c83df0219a5a092fcb2db8d2f71b SHA256 d1afe208eab5b00f5c3204b231b8f68a2d2335699a42b913f1ea9101f280736c |
43 |
-AUX xen-tools-3.4.2-remove-default-cflags.patch 10646 RMD160 cc8175c33251310645fd6cc400c6180a7fcdcf75 SHA1 5e94fce8db6b67df6264e92a69f9f3802610b93f SHA256 f234c45b0a96c4eb5c97e7a8d76fb1f4a3dff110c4ea2ec68e8db71e03044d98 |
44 |
-AUX xen-tools-3.4.2-werror-idiocy-v2.patch 16827 RMD160 80fe78d3fd5f2d23d4852cf8608c616ae7e4e8b6 SHA1 619f42bf7ac7886a4b214bf813ad3369265f424b SHA256 45dfc85ea28c7a70bfcf94986758370e27c32698d78b90a2066335dd378f3669 |
45 |
-AUX xen-tools-4.1.1-bridge.patch 449 RMD160 165524a3a92014f79e886b0a20dba8b1c1920cc2 SHA1 32db884422a48819d71003860f99779b7b82540a SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db36c1882e20cf0ef8143af527782b |
46 |
-AUX xen-tools-4.1.1-curl.patch 550 RMD160 87e09f92f292d89c86416036d4207b0460a3dc6e SHA1 dec0e47d62d85cb21d9fb6d097ab183f02b80310 SHA256 4bdb2875b36e7dbb0bd8d61b697da78007bb22922f56e020795c91ebb9ddd50b |
47 |
-AUX xen-tools-4.1.1-libxl-tap.patch 1071 RMD160 a345fab381af82ffdf7a4206d9db30f6845e5867 SHA1 bbe2ddd9eb8119ae172fd9671fe58bda80bf9095 SHA256 ee03a5b68a9edf5d4fe78a322ff261e13f6ded879f3898b0ea72c407f678f885 |
48 |
-AUX xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 RMD160 7d3bd028c5da4b2a48f1e992900bbf1866c9c4ea SHA1 55c5476e632649d4d635db1023193216455d076d SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f |
49 |
-AUX xen-tools-4.1.2-pyxml.patch 408 RMD160 131ff6e6a1b3bd71ff584d3cbfca4b078abd77b1 SHA1 5fa6ce64ef125e97df65ed357e1c40964a7a3619 SHA256 6a8d8ca5478bc68850fd930749ca22207807c87f8624c0c3596a8cd70bc06c65 |
50 |
-AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 |
51 |
-AUX xenconsoled.initd 652 RMD160 5aa785e9c73c5eb8460863af2c1bc50d2a07faf4 SHA1 dceffade1f3f5f2503fc6c3ccb4b9f9788365d00 SHA256 1a5594e4e924b94490c5c942b1b63e5fe857b8ad8061060e5d8a3bdfc9f0f1b7 |
52 |
-AUX xend.initd-r1 1664 RMD160 8d7ea19e96c49631a8f432dd93ae91ca4f37d26b SHA1 bd3a8f083288cd89624d31f3c7932e1a831d99a3 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d |
53 |
-AUX xend.initd-r2 1064 RMD160 07b94d60a9c93577864086945389ef9821913522 SHA1 60f246da00f829776f1bb9a16ec07a6f91cbd24e SHA256 b9dcd925856eb5213b9052169492492d686b5d1ccae65b1c94a8ac944708d155 |
54 |
-AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a |
55 |
-AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc |
56 |
-AUX xendomains.initd-r1 2930 RMD160 9a1c467d63043ce04c5f3c268745a30e4db1d006 SHA1 e649a34fae4cfc25f9f904008a79603c47df9836 SHA256 cf03eb7d8eb6d79bce02e857a4a6bcff68a6a63c55ff283f18ebb8d013a27111 |
57 |
-AUX xendomains.initd-r2 2933 RMD160 31d35c58d0286a34bebd636e85a9368054b8f6c0 SHA1 5e9cbdb5f2b1770bf30ba99ca7c67dbf38b78e84 SHA256 da69c146e5213df5376bd9b2758d9d5957c802e5513c6ea510e604d00f1d9e40 |
58 |
-AUX xenstored.confd 42 RMD160 3407e1ff0958d5797e257da284798a21fe31a5db SHA1 c18f64d2a41de25695b7dfb924478e3fa64ed0c3 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831 |
59 |
-AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 9837c052afac31ee623ef02280a43114866869c8 SHA256 8f9df8ad835e45f9c995244e9e80d1a9ee630787bf2da88b7c4a73354d056fd8 |
60 |
-DIST ipxe-git-v1.0.0.tar.gz 1996881 RMD160 dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 SHA1 da052c8de5f3485fe0253c19cf52ed6d72528485 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723 |
61 |
-DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b |
62 |
-DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b |
63 |
-DIST xen-4.1.2.tar.gz 10365786 RMD160 457797ec4be286afbbcad940a9ce04e44f3f40d6 SHA1 db584cb0a0cc614888d7df3b196d514fdb2edd6e SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d |
64 |
-EBUILD xen-tools-3.4.2-r3.ebuild 7049 RMD160 05ffd0fdba6761df2d59f3bd7421599e1f20f4a1 SHA1 e36b7900c84de2ca1f861af081678ff3c7eb943a SHA256 d1513d443231dd27cb0267acac47c00c9bf95c25aa296e90ee6bb21a134e1e51 |
65 |
-EBUILD xen-tools-3.4.2-r5.ebuild 7383 RMD160 b31318f590f2d563c036a7acffe65cecc9bf677f SHA1 34312c51b92c28dc7d7ab718c1b5f67b1554be61 SHA256 0ae0c406503dbc8342d5a4abc72d896ec0205317c9e6ec8690f71a40bd7bb8c4 |
66 |
-EBUILD xen-tools-4.1.1-r5.ebuild 10316 RMD160 92450a0dba081cda3e23e94072953b858538d31e SHA1 f1af2fba3958c0813b37adc16c82d69d720f2458 SHA256 80485abdbcaf256d21289f0cf260de671d72bbcc023bf49df3bd99db99b23720 |
67 |
-EBUILD xen-tools-4.1.1-r6.ebuild 10651 RMD160 993111049c34acbbf59857b3794e68319a50e301 SHA1 4af2c578e12f6f9b29490dc04488a956d526af4c SHA256 4147a0918b80cda6c22cfe4219c4767a5b2a50b65790852de9f33ce0c16122fd |
68 |
-EBUILD xen-tools-4.1.2-r1.ebuild 10661 RMD160 e6d79f599d28ba19f8452f2cd953e537ca263a31 SHA1 9c5858944006f46cf53234a83867de8889ce44ea SHA256 e80e19f6fb1feebd4f52c55de17564792b32e2c8da89b5a6bc7eceee10f4d9f7 |
69 |
-EBUILD xen-tools-9999.ebuild 9797 RMD160 a295e2bc881a274318a8c1c047c5eb7f0d3c9873 SHA1 064ff777ba534f689303c4b89bfd23b9add7d1df SHA256 795b2d62d02001ee304880e0c9fa1611e12e969e7c94fb0e4aecb1a850ba7e13 |
70 |
-MISC ChangeLog 26416 RMD160 9dedc8200cef808e17460fc462dfa58b4697a00b SHA1 527ac5a862ec32895ab6b1bc476721a6564a929b SHA256 6177a750826abbe6084535a884b47bf43d5109c037a36bd320db079f54edffa3 |
71 |
-MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60 |
72 |
+DIST ipxe-git-v1.0.0.tar.gz 1996881 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723 SHA512 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 WHIRLPOOL 160e24eea479c9d67a8a5c7c5182864904ee594167f061adc40a3e74974197b6befe2ecdb76af1c101ff1a5697b060dae71dd3f9f969c8e18054526584d57031 |
73 |
+DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566 |
74 |
|
75 |
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 |
76 |
deleted file mode 100644 |
77 |
index be0527a..0000000 |
78 |
--- a/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch |
79 |
+++ /dev/null |
80 |
@@ -1,21 +0,0 @@ |
81 |
-diff -urN xen-3.3.1/tools/ioemu-qemu-xen/xen-setup xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup |
82 |
---- xen-3.3.1/tools/ioemu-qemu-xen/xen-setup 2009-01-05 04:36:22.000000000 -0700 |
83 |
-+++ xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup 2009-04-25 17:55:03.000000000 -0600 |
84 |
-@@ -3,6 +3,8 @@ |
85 |
- |
86 |
- # 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:/ |
87 |
- |
88 |
-+target=i386-dm |
89 |
-+ |
90 |
- rm -f $target/Makefile |
91 |
- rm -f $target/config.mak |
92 |
- rm -f config-host.mak |
93 |
-@@ -11,8 +13,6 @@ |
94 |
- |
95 |
- ./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr |
96 |
- |
97 |
--target=i386-dm |
98 |
-- |
99 |
- if [ "x$XEN_ROOT" != x ]; then |
100 |
- echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak |
101 |
- fi |
102 |
|
103 |
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-as-needed.patch |
104 |
deleted file mode 100644 |
105 |
index 5d97373..0000000 |
106 |
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-as-needed.patch |
107 |
+++ /dev/null |
108 |
@@ -1,13 +0,0 @@ |
109 |
---- xen-3.4.2.orig/tools/libxc/Makefile 2009-11-10 16:12:56.000000000 +0100 |
110 |
-+++ xen-3.4.2/tools/libxc/Makefile 2009-12-12 18:46:27.547714651 +0100 |
111 |
-@@ -167,9 +167,8 @@ |
112 |
- xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) |
113 |
- xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) |
114 |
- |
115 |
--libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l) |
116 |
- libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so |
117 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) |
118 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l) |
119 |
- |
120 |
- -include $(DEPS) |
121 |
- |
122 |
|
123 |
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 |
124 |
deleted file mode 100644 |
125 |
index 403d612..0000000 |
126 |
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch |
127 |
+++ /dev/null |
128 |
@@ -1,16 +0,0 @@ |
129 |
---- tools/blktap/lib/blktaplib.h.orig 2011-09-21 19:29:30.240868534 +0800 |
130 |
-+++ tools/blktap/lib/blktaplib.h 2011-09-21 19:34:21.184868372 +0800 |
131 |
-@@ -195,8 +195,13 @@ |
132 |
- pid_t pid; |
133 |
- } msg_pid_t; |
134 |
- |
135 |
-+#ifndef READ |
136 |
- #define READ 0 |
137 |
-+#endif |
138 |
-+ |
139 |
-+#ifndef WRITE |
140 |
- #define WRITE 1 |
141 |
-+#endif |
142 |
- |
143 |
- /*Control Messages between manager and tapdev*/ |
144 |
- #define CTLMSG_PARAMS 1 |
145 |
|
146 |
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 |
147 |
deleted file mode 100644 |
148 |
index 2fe3f05..0000000 |
149 |
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch |
150 |
+++ /dev/null |
151 |
@@ -1,28 +0,0 @@ |
152 |
---- ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:27:01.846896986 +0800 |
153 |
-+++ ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:29:09.910897067 +0800 |
154 |
-@@ -40,6 +40,7 @@ |
155 |
- #include <err.h> |
156 |
- #include <errno.h> |
157 |
- #include <sys/types.h> |
158 |
-+#include <sys/stat.h> |
159 |
- #include <sys/wait.h> |
160 |
- #include <signal.h> |
161 |
- #include <fcntl.h> |
162 |
---- ./tools/blktap/drivers/block-qcow2.c 2011-09-22 04:15:49.339854677 +0800 |
163 |
-+++ ./tools/blktap/drivers/block-qcow2.c 2009-11-10 23:12:55.000000000 +0800 |
164 |
-@@ -26,6 +26,7 @@ |
165 |
- #include "aes.h" |
166 |
- #include <assert.h> |
167 |
- #include <stdint.h> |
168 |
-+#include <sys/stat.h> |
169 |
- #include <fcntl.h> |
170 |
- #include <stdio.h> |
171 |
- #include <stdlib.h> |
172 |
---- ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:43:40.005898352 +0800 |
173 |
-+++ ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:26:53.979898723 +0800 |
174 |
-@@ -26,6 +26,7 @@ |
175 |
- #include <zlib.h> |
176 |
- #include "aes.h" |
177 |
- #include <assert.h> |
178 |
-+#include <sys/stat.h> |
179 |
- |
180 |
|
181 |
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 |
182 |
deleted file mode 100644 |
183 |
index fd77712..0000000 |
184 |
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch |
185 |
+++ /dev/null |
186 |
@@ -1,31 +0,0 @@ |
187 |
---- ./tools/fs-back/Makefile 2011-09-26 23:14:30.454759297 +0800 |
188 |
-+++ ./tools/fs-back/Makefile 2011-09-27 16:37:57.445748680 +0800 |
189 |
-@@ -23,7 +23,7 @@ |
190 |
- all: $(IBIN) |
191 |
- |
192 |
- fs-backend: $(OBJS) fs-backend.c |
193 |
-- $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c |
194 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c |
195 |
- |
196 |
- install: all |
197 |
- $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR) |
198 |
---- ./tools/libfsimage/common/Makefile 2009-11-10 23:12:56.000000000 +0800 |
199 |
-+++ ./tools/libfsimage/common/Makefile 2011-09-27 16:41:16.516748626 +0800 |
200 |
-@@ -6,7 +6,7 @@ |
201 |
- |
202 |
- LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS |
203 |
- LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU |
204 |
--LDFLAGS = $(LDFLAGS-y) |
205 |
-+#LDFLAGS = $(LDFLAGS-y) |
206 |
- |
207 |
- LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c |
208 |
- |
209 |
---- ./tools/misc/lomount/Makefile 2011-09-27 14:23:26.596752233 +0800 |
210 |
-+++ ./tools/misc/lomount/Makefile 2011-09-27 16:37:57.445748680 +0800 |
211 |
-@@ -23,5 +23,5 @@ |
212 |
- $(RM) *.a *.so *.o *.rpm $(BIN) |
213 |
- |
214 |
- %: %.c $(HDRS) Makefile |
215 |
-- $(CC) $(CFLAGS) -o $@ $< |
216 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
217 |
- |
218 |
|
219 |
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 |
220 |
deleted file mode 100644 |
221 |
index 8ca546b..0000000 |
222 |
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch |
223 |
+++ /dev/null |
224 |
@@ -1,257 +0,0 @@ |
225 |
-Only in xen-3.4.2/: cflags.sh |
226 |
-diff -ur xen-3.4.2.orig//config/StdGNU.mk xen-3.4.2//config/StdGNU.mk |
227 |
---- xen-3.4.2.orig//config/StdGNU.mk 2009-11-10 23:12:55.000000000 +0800 |
228 |
-+++ xen-3.4.2//config/StdGNU.mk 2011-09-26 02:18:14.630771549 +0800 |
229 |
-@@ -48,7 +48,7 @@ |
230 |
- SHLIB_CFLAGS = -shared |
231 |
- |
232 |
- ifneq ($(debug),y) |
233 |
--CFLAGS += -O2 -fomit-frame-pointer |
234 |
-+CFLAGS += -fomit-frame-pointer |
235 |
- else |
236 |
- # Less than -O1 produces bad code and large stack frames |
237 |
- CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls |
238 |
-diff -ur xen-3.4.2.orig//config/SunOS.mk xen-3.4.2//config/SunOS.mk |
239 |
---- xen-3.4.2.orig//config/SunOS.mk 2009-11-10 23:12:55.000000000 +0800 |
240 |
-+++ xen-3.4.2//config/SunOS.mk 2011-09-26 02:18:14.640771549 +0800 |
241 |
-@@ -45,7 +45,7 @@ |
242 |
- SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared |
243 |
- |
244 |
- ifneq ($(debug),y) |
245 |
--CFLAGS += -O2 -fno-omit-frame-pointer |
246 |
-+CFLAGS += -fno-omit-frame-pointer |
247 |
- else |
248 |
- # Less than -O1 produces bad code and large stack frames |
249 |
- CFLAGS += -O1 -fno-omit-frame-pointer |
250 |
-diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk |
251 |
---- xen-3.4.2.orig//Config.mk 2011-09-26 02:17:29.221771569 +0800 |
252 |
-+++ xen-3.4.2//Config.mk 2011-09-26 02:18:14.686771549 +0800 |
253 |
-@@ -14,7 +14,7 @@ |
254 |
- |
255 |
- # Tools to run on system hosting the build |
256 |
- HOSTCC = gcc |
257 |
--HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer |
258 |
-+HOSTCFLAGS = -Wall -Wstrict-prototypes -fomit-frame-pointer |
259 |
- HOSTCFLAGS += -fno-strict-aliasing |
260 |
- |
261 |
- DISTDIR ?= $(XEN_ROOT)/dist |
262 |
-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 |
263 |
---- xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk 2009-11-10 23:12:55.000000000 +0800 |
264 |
-+++ xen-3.4.2//extras/mini-os/arch/ia64/arch.mk 2011-09-26 02:18:14.689771549 +0800 |
265 |
-@@ -1,8 +1,8 @@ |
266 |
- |
267 |
- ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp |
268 |
--ARCH_CFLAGS += -O2 |
269 |
-+#ARCH_CFLAGS += -O2 |
270 |
- ARCH_ASFLAGS := -x assembler-with-cpp |
271 |
--ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer |
272 |
-+ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 |
273 |
- ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp |
274 |
- |
275 |
- ARCH_LDFLAGS = -warn-common |
276 |
-diff -ur xen-3.4.2.orig//stubdom/grub.patches/00cvs xen-3.4.2//stubdom/grub.patches/00cvs |
277 |
---- xen-3.4.2.orig//stubdom/grub.patches/00cvs 2009-11-10 23:12:55.000000000 +0800 |
278 |
-+++ xen-3.4.2//stubdom/grub.patches/00cvs 2011-09-26 02:18:14.549771549 +0800 |
279 |
-@@ -223,8 +223,8 @@ |
280 |
- +++ grub/configure.ac 2008-04-10 23:26:50.000000000 +0100 |
281 |
- @@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then |
282 |
- fi |
283 |
-- STAGE1_CFLAGS="-O2" |
284 |
-- GRUB_CFLAGS="-O2" |
285 |
-+ STAGE1_CFLAGS="" |
286 |
-+ GRUB_CFLAGSS="" |
287 |
- - AC_CACHE_CHECK([whether optimization for size works], size_flag, [ |
288 |
- + AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [ |
289 |
- saved_CFLAGS=$CFLAGS |
290 |
-@@ -237,7 +237,7 @@ |
291 |
- + if test "x$grub_cv_cc_Os" = xyes; then |
292 |
- STAGE2_CFLAGS="-Os" |
293 |
- else |
294 |
-- STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops" |
295 |
-+ STAGE2_CFLAGS=" -fno-strength-reduce -fno-unroll-loops" |
296 |
- @@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then |
297 |
- # OpenBSD has a GCC extension for protecting applications from |
298 |
- # stack smashing attacks, but GRUB doesn't want this feature. |
299 |
-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 |
300 |
---- 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 |
301 |
-+++ xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2011-09-26 02:24:37.261771380 +0800 |
302 |
-@@ -1849,7 +1849,7 @@ |
303 |
- GCC=`test $ac_compiler_gnu = yes && echo yes` |
304 |
- ac_test_CFLAGS=${CFLAGS+set} |
305 |
- ac_save_CFLAGS=$CFLAGS |
306 |
--CFLAGS="-g" |
307 |
-+CFLAGS="" |
308 |
- echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
309 |
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 |
310 |
- if test "${ac_cv_prog_cc_g+set}" = set; then |
311 |
-@@ -1898,15 +1898,15 @@ |
312 |
- CFLAGS=$ac_save_CFLAGS |
313 |
- elif test $ac_cv_prog_cc_g = yes; then |
314 |
- if test "$GCC" = yes; then |
315 |
-- CFLAGS="-g -O2" |
316 |
-+ CFLAGS="" |
317 |
- else |
318 |
-- CFLAGS="-g" |
319 |
-+ CFLAGS="" |
320 |
- fi |
321 |
- else |
322 |
- if test "$GCC" = yes; then |
323 |
-- CFLAGS="-O2" |
324 |
-+# CFLAGS="-O2" |
325 |
- else |
326 |
-- CFLAGS= |
327 |
-+ CFLAGS="" |
328 |
- fi |
329 |
- fi |
330 |
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 |
331 |
-Only in xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver: configure~ |
332 |
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure |
333 |
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2011-09-26 02:17:29.223771569 +0800 |
334 |
-+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-26 02:22:14.583771444 +0800 |
335 |
-@@ -464,7 +464,7 @@ |
336 |
- |
337 |
- |
338 |
- # default flags for all hosts |
339 |
--CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing" |
340 |
-+CFLAGS="$CFLAGS -g -fno-strict-aliasing" |
341 |
- CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" |
342 |
- LDFLAGS="$LDFLAGS -g" |
343 |
- if test "$werror" = "yes" ; then |
344 |
-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 |
345 |
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile 2009-11-05 19:44:56.000000000 +0800 |
346 |
-+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile 2011-09-26 02:18:14.264771549 +0800 |
347 |
-@@ -12,7 +12,7 @@ |
348 |
- OBJCOPY = $(CROSS)objcopy |
349 |
- |
350 |
- # we rely on GCC inline:ing the stuff we tell it to in many places here. |
351 |
--CFLAGS = -Winline -Wall -g -O2 -static |
352 |
-+CFLAGS = -Winline -Wall -g -static |
353 |
- NOSTDFLAGS = -nostartfiles -nostdlib |
354 |
- ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/cris/ |
355 |
- LDLIBS = |
356 |
-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 |
357 |
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c 2009-11-05 19:44:56.000000000 +0800 |
358 |
-+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c 2011-09-26 02:18:14.669771549 +0800 |
359 |
-@@ -6,7 +6,7 @@ |
360 |
- * http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml |
361 |
- * |
362 |
- * mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \ |
363 |
--* -O2 -static -o hello-mips hello-mips.c |
364 |
-+* -static -o hello-mips hello-mips.c |
365 |
- * |
366 |
- */ |
367 |
- #define __NR_SYSCALL_BASE 4000 |
368 |
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile |
369 |
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile 2009-11-05 19:44:56.000000000 +0800 |
370 |
-+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile 2011-09-26 02:18:14.262771549 +0800 |
371 |
-@@ -2,7 +2,7 @@ |
372 |
- -include ../config-host.mak |
373 |
- VPATH=$(SRC_PATH)/tests |
374 |
- |
375 |
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing |
376 |
-+CFLAGS=-Wall -g -fno-strict-aliasing |
377 |
- #CFLAGS+=-msse2 |
378 |
- LDFLAGS= |
379 |
- |
380 |
-@@ -52,7 +52,7 @@ |
381 |
- |
382 |
- .PHONY: test-mmap |
383 |
- test-mmap: test-mmap.c |
384 |
-- $(CC) $(CFLAGS) -Wall -static -O2 $(LDFLAGS) -o $@ $< |
385 |
-+ $(CC) $(CFLAGS) -Wall -static $(LDFLAGS) -o $@ $< |
386 |
- -./test-mmap |
387 |
- -$(QEMU) ./test-mmap |
388 |
- -$(QEMU) -p 8192 ./test-mmap 8192 |
389 |
-@@ -88,17 +88,17 @@ |
390 |
- arm-linux-ld -o $@ $< |
391 |
- |
392 |
- hello-arm.o: hello-arm.c |
393 |
-- arm-linux-gcc -Wall -g -O2 -c -o $@ $< |
394 |
-+ arm-linux-gcc -Wall -g -c -o $@ $< |
395 |
- |
396 |
- test-arm-iwmmxt: test-arm-iwmmxt.s |
397 |
- cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@ |
398 |
- |
399 |
- # MIPS test |
400 |
- hello-mips: hello-mips.c |
401 |
-- mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $< |
402 |
-+ mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $< |
403 |
- |
404 |
- hello-mipsel: hello-mips.c |
405 |
-- mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $< |
406 |
-+ mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $< |
407 |
- |
408 |
- # testsuite for the CRIS port. |
409 |
- test-cris: |
410 |
-diff -ur xen-3.4.2.orig//tools/libaio/src/Makefile xen-3.4.2//tools/libaio/src/Makefile |
411 |
---- xen-3.4.2.orig//tools/libaio/src/Makefile 2009-11-10 23:12:56.000000000 +0800 |
412 |
-+++ xen-3.4.2//tools/libaio/src/Makefile 2011-09-26 02:18:14.288771549 +0800 |
413 |
-@@ -6,7 +6,7 @@ |
414 |
- libdir=$(prefix)/lib |
415 |
- |
416 |
- ARCH := $(shell uname -m | sed -e s/i.86/i386/) |
417 |
--CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC |
418 |
-+CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -fPIC |
419 |
- SO_CFLAGS=-shared $(CFLAGS) |
420 |
- L_CFLAGS=$(CFLAGS) |
421 |
- LINK_FLAGS= |
422 |
-diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist |
423 |
---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2011-09-26 02:17:29.223771569 +0800 |
424 |
-+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-26 02:18:14.553771549 +0800 |
425 |
-@@ -22,7 +22,7 @@ |
426 |
- CFLAGS = -Iinclude \ |
427 |
- $(shell xml2-config --cflags) \ |
428 |
- $(shell curl-config --cflags) \ |
429 |
-- -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC |
430 |
-+ -W -Wall -Wmissing-prototypes -std=c99 -fPIC |
431 |
- |
432 |
- LDFLAGS = $(shell xml2-config --libs) \ |
433 |
- $(shell curl-config --libs) |
434 |
-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 |
435 |
---- xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 2009-11-10 23:12:57.000000000 +0800 |
436 |
-+++ xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 2011-09-26 02:18:14.659771549 +0800 |
437 |
-@@ -62,7 +62,7 @@ |
438 |
- CFLAGS += -Wno-unused-parameter |
439 |
- |
440 |
- CFLAGS += -g |
441 |
--CFLAGS += -O2 |
442 |
-+#CFLAGS += -O2 |
443 |
- CFLAGS += -fno-strict-aliasing |
444 |
- CFLAGS += -fno-common |
445 |
- #CFLAGS += -fomit-frame-pointer |
446 |
-diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk |
447 |
---- xen-3.4.2.orig//extras/mini-os/minios.mk 2011-09-26 02:29:41.869771248 +0800 |
448 |
-+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-26 02:33:55.708771108 +0800 |
449 |
-@@ -23,7 +23,7 @@ |
450 |
- DEF_CFLAGS += -DGNT_DEBUG |
451 |
- DEF_CFLAGS += -DGNTMAP_DEBUG |
452 |
- else |
453 |
--DEF_CFLAGS += -O3 |
454 |
-+#DEF_CFLAGS += -O3 |
455 |
- endif |
456 |
- |
457 |
- # Make the headers define our internal stuff |
458 |
-diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile |
459 |
---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2011-09-26 02:29:41.872771248 +0800 |
460 |
-+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-26 02:37:59.835771029 +0800 |
461 |
-@@ -26,7 +26,7 @@ |
462 |
- |
463 |
- $(call cc-option-add,CFLAGS,CC,-fgnu89-inline) |
464 |
- CFLAGS += -fno-strict-aliasing |
465 |
--CFLAGS += -O3 |
466 |
-+#CFLAGS += -O3 |
467 |
- #CFLAGS += -g |
468 |
- |
469 |
- MAJOR := 3.0 |
470 |
-diff -ur xen-3.4.2.orig//tools/vnet/vnetd/Makefile xen-3.4.2//tools/vnet/vnetd/Makefile |
471 |
---- xen-3.4.2.orig//tools/vnet/vnetd/Makefile 2009-11-10 23:12:57.000000000 +0800 |
472 |
-+++ xen-3.4.2//tools/vnet/vnetd/Makefile 2011-09-26 02:37:59.834771029 +0800 |
473 |
-@@ -44,7 +44,7 @@ |
474 |
- CPPFLAGS += -D __ARCH_I386_ATOMIC__ |
475 |
- |
476 |
- #---------------------------------------------------------------------------- |
477 |
--CFLAGS += -O3 |
478 |
-+#CFLAGS += -O3 |
479 |
- CFLAGS += $(INCLUDES) $(LIBS) |
480 |
- |
481 |
- LDFLAGS += $(LIBS) |
482 |
\ No newline at end of file |
483 |
|
484 |
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 |
485 |
deleted file mode 100644 |
486 |
index f9c746d..0000000 |
487 |
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch |
488 |
+++ /dev/null |
489 |
@@ -1,429 +0,0 @@ |
490 |
-diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk |
491 |
---- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800 |
492 |
-+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800 |
493 |
-@@ -14,7 +14,7 @@ |
494 |
- |
495 |
- # Tools to run on system hosting the build |
496 |
- HOSTCC = gcc |
497 |
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer |
498 |
-+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer |
499 |
- HOSTCFLAGS += -fno-strict-aliasing |
500 |
- |
501 |
- DISTDIR ?= $(XEN_ROOT)/dist |
502 |
-diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk |
503 |
---- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800 |
504 |
-+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800 |
505 |
-@@ -6,7 +6,7 @@ |
506 |
- |
507 |
- # Define some default flags. |
508 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
509 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
510 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
511 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
512 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
513 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
514 |
-diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile |
515 |
---- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800 |
516 |
-+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800 |
517 |
-@@ -5,7 +5,7 @@ |
518 |
- QCOW_UTIL = img2qcow qcow2raw qcow-create |
519 |
- LIBAIO_DIR = ../../libaio/src |
520 |
- |
521 |
--CFLAGS += -Werror |
522 |
-+CFLAGS += |
523 |
- CFLAGS += -Wno-unused |
524 |
- CFLAGS += -I../lib |
525 |
- CFLAGS += $(CFLAGS_libxenctrl) |
526 |
-diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile |
527 |
---- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800 |
528 |
-+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800 |
529 |
-@@ -13,7 +13,7 @@ |
530 |
- SRCS := |
531 |
- SRCS += xenbus.c blkif.c xs_api.c |
532 |
- |
533 |
--CFLAGS += -Werror |
534 |
-+CFLAGS += |
535 |
- CFLAGS += -Wno-unused |
536 |
- CFLAGS += -fPIC |
537 |
- # get asprintf(): |
538 |
-diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile |
539 |
---- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800 |
540 |
-+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800 |
541 |
-@@ -2,7 +2,7 @@ |
542 |
- XEN_ROOT=../.. |
543 |
- include $(XEN_ROOT)/tools/Rules.mk |
544 |
- |
545 |
--CFLAGS += -Werror |
546 |
-+CFLAGS += |
547 |
- |
548 |
- CFLAGS += $(CFLAGS_libxenctrl) |
549 |
- CFLAGS += $(CFLAGS_libxenstore) |
550 |
-diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile |
551 |
---- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800 |
552 |
-+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800 |
553 |
-@@ -1,7 +1,7 @@ |
554 |
- XEN_ROOT=../../.. |
555 |
- include $(XEN_ROOT)/tools/Rules.mk |
556 |
- |
557 |
--#CFLAGS += -Werror -g -O0 |
558 |
-+#CFLAGS += -g -O0 |
559 |
- |
560 |
- CFLAGS += $(CFLAGS_libxenctrl) |
561 |
- |
562 |
-diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk |
563 |
---- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800 |
564 |
-+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800 |
565 |
-@@ -10,7 +10,7 @@ |
566 |
- CFLAGS += -DNDEBUG |
567 |
- endif |
568 |
- |
569 |
--CFLAGS += -Werror |
570 |
-+CFLAGS += |
571 |
- |
572 |
- # Disable PIE/SSP if GCC supports them. They can break us. |
573 |
- $(call cc-option-add,CFLAGS,CC,-nopie) |
574 |
-diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile |
575 |
---- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800 |
576 |
-+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800 |
577 |
-@@ -9,7 +9,7 @@ |
578 |
- SRCS := |
579 |
- SRCS += flask_op.c |
580 |
- |
581 |
--CFLAGS += -Werror |
582 |
-+CFLAGS += |
583 |
- CFLAGS += -fno-strict-aliasing |
584 |
- CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE) |
585 |
- |
586 |
-diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile |
587 |
---- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800 |
588 |
-+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800 |
589 |
-@@ -6,7 +6,7 @@ |
590 |
- LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask |
591 |
- |
592 |
- PROFILE=#-pg |
593 |
--BASECFLAGS=-Wall -g -Werror |
594 |
-+BASECFLAGS=-Wall -g |
595 |
- BASECFLAGS+= $(PROFILE) |
596 |
- #BASECFLAGS+= -I$(XEN_ROOT)/tools |
597 |
- BASECFLAGS+= $(CFLAGS_libxenctrl) |
598 |
-diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile |
599 |
---- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800 |
600 |
-+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800 |
601 |
-@@ -5,7 +5,7 @@ |
602 |
- |
603 |
- IBIN = fs-backend |
604 |
- |
605 |
--CFLAGS += -Werror |
606 |
-+CFLAGS += |
607 |
- CFLAGS += -Wno-unused |
608 |
- CFLAGS += -fno-strict-aliasing |
609 |
- CFLAGS += $(CFLAGS_libxenctrl) |
610 |
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure |
611 |
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800 |
612 |
-+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800 |
613 |
-@@ -468,7 +468,7 @@ |
614 |
- CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" |
615 |
- LDFLAGS="$LDFLAGS -g" |
616 |
- if test "$werror" = "yes" ; then |
617 |
--CFLAGS="$CFLAGS -Werror" |
618 |
-+CFLAGS="$CFLAGS" |
619 |
- fi |
620 |
- |
621 |
- if test "$solaris" = "no" ; then |
622 |
-@@ -1150,7 +1150,7 @@ |
623 |
- echo "sparse enabled $sparse" |
624 |
- echo "profiler $profiler" |
625 |
- echo "static build $static" |
626 |
--echo "-Werror enabled $werror" |
627 |
-+ |
628 |
- if test "$darwin" = "yes" ; then |
629 |
- echo "Cocoa support $cocoa" |
630 |
- fi |
631 |
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target |
632 |
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800 |
633 |
-+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800 |
634 |
-@@ -26,7 +26,7 @@ |
635 |
- TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) |
636 |
- VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw |
637 |
- CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H |
638 |
--#CFLAGS+=-Werror |
639 |
-+#CFLAGS+= |
640 |
- LIBS= |
641 |
- # user emulator name |
642 |
- ifndef TARGET_ARCH2 |
643 |
-diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile |
644 |
---- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800 |
645 |
-+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800 |
646 |
-@@ -4,7 +4,7 @@ |
647 |
- HARNESS_SRCS:=main.c |
648 |
- # io_queue.c |
649 |
- |
650 |
--CFLAGS=-Wall -Werror -g -O -laio |
651 |
-+CFLAGS=-Wall -g -O -laio |
652 |
- #-lpthread -lrt |
653 |
- |
654 |
- all: $(PROGS) |
655 |
-diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk |
656 |
---- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800 |
657 |
-+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800 |
658 |
-@@ -1,6 +1,6 @@ |
659 |
- include $(XEN_ROOT)/tools/Rules.mk |
660 |
- |
661 |
--CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror |
662 |
-+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ |
663 |
- LDFLAGS += -L../common/ |
664 |
- |
665 |
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) |
666 |
-diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile |
667 |
---- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800 |
668 |
-+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800 |
669 |
-@@ -52,7 +52,7 @@ |
670 |
- |
671 |
- -include $(XEN_TARGET_ARCH)/Makefile |
672 |
- |
673 |
--CFLAGS += -Werror -Wmissing-prototypes |
674 |
-+CFLAGS += -Wmissing-prototypes |
675 |
- CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include |
676 |
- |
677 |
- # Needed for posix_fadvise64() in xc_linux.c |
678 |
-diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist |
679 |
---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800 |
680 |
-+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800 |
681 |
-@@ -22,7 +22,7 @@ |
682 |
- CFLAGS = -Iinclude \ |
683 |
- $(shell xml2-config --cflags) \ |
684 |
- $(shell curl-config --cflags) \ |
685 |
-- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC |
686 |
-+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC |
687 |
- |
688 |
- LDFLAGS = $(shell xml2-config --libs) \ |
689 |
- $(shell curl-config --libs) |
690 |
-diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile |
691 |
---- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800 |
692 |
-+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800 |
693 |
-@@ -1,7 +1,7 @@ |
694 |
- XEN_ROOT=../../.. |
695 |
- include $(XEN_ROOT)/tools/Rules.mk |
696 |
- |
697 |
--CFLAGS += -Werror |
698 |
-+CFLAGS += |
699 |
- |
700 |
- HDRS = $(wildcard *.h) |
701 |
- OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) |
702 |
-diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile |
703 |
---- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800 |
704 |
-+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800 |
705 |
-@@ -1,7 +1,7 @@ |
706 |
- XEN_ROOT=../.. |
707 |
- include $(XEN_ROOT)/tools/Rules.mk |
708 |
- |
709 |
--CFLAGS += -Werror |
710 |
-+CFLAGS += |
711 |
- |
712 |
- INCLUDES += -I $(XEN_XC) |
713 |
- INCLUDES += -I $(XEN_LIBXC) |
714 |
-diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py |
715 |
---- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800 |
716 |
-+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800 |
717 |
-@@ -3,7 +3,7 @@ |
718 |
- import os |
719 |
- import sys |
720 |
- |
721 |
--extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] |
722 |
-+extra_compile_args = [ "-fno-strict-aliasing" ] |
723 |
- |
724 |
- XEN_ROOT = "../.." |
725 |
- |
726 |
-diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py |
727 |
---- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800 |
728 |
-+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800 |
729 |
-@@ -4,7 +4,7 @@ |
730 |
- |
731 |
- XEN_ROOT = "../.." |
732 |
- |
733 |
--extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] |
734 |
-+extra_compile_args = [ "-fno-strict-aliasing" ] |
735 |
- |
736 |
- include_dirs = [ XEN_ROOT + "/tools/libxc", |
737 |
- XEN_ROOT + "/tools/xenstore", |
738 |
-diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile |
739 |
---- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800 |
740 |
-+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800 |
741 |
-@@ -1,7 +1,7 @@ |
742 |
- XEN_ROOT = ../.. |
743 |
- include $(XEN_ROOT)/tools/Rules.mk |
744 |
- |
745 |
--CFLAGS += -Werror |
746 |
-+CFLAGS += |
747 |
- CFLAGS += -fno-strict-aliasing |
748 |
- CFLAGS += -I. $(CFLAGS_libxenctrl) |
749 |
- |
750 |
-diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile |
751 |
---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800 |
752 |
-+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800 |
753 |
-@@ -25,7 +25,7 @@ |
754 |
- PIC_OBJS := $(LIB_SRCS:.c=.opic) |
755 |
- |
756 |
- $(call cc-option-add,CFLAGS,CC,-fgnu89-inline) |
757 |
--CFLAGS += -Werror -fno-strict-aliasing |
758 |
-+CFLAGS += -fno-strict-aliasing |
759 |
- CFLAGS += -O3 |
760 |
- #CFLAGS += -g |
761 |
- |
762 |
-diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk |
763 |
---- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800 |
764 |
-+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800 |
765 |
-@@ -9,7 +9,7 @@ |
766 |
- TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin |
767 |
- |
768 |
- # General compiler flags |
769 |
--CFLAGS = -Werror -g3 -I. |
770 |
-+CFLAGS = -g3 -I. |
771 |
- |
772 |
- # Generic project files |
773 |
- HDRS = $(wildcard *.h) |
774 |
-diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk |
775 |
---- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800 |
776 |
-+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800 |
777 |
-@@ -9,7 +9,7 @@ |
778 |
- TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin |
779 |
- |
780 |
- # General compiler flags |
781 |
--CFLAGS = -Werror -g3 -I. |
782 |
-+CFLAGS = -g3 -I. |
783 |
- |
784 |
- # Generic project files |
785 |
- HDRS = $(wildcard *.h) |
786 |
-diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile |
787 |
---- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800 |
788 |
-+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800 |
789 |
-@@ -11,7 +11,7 @@ |
790 |
- XEN_ROOT = ../.. |
791 |
- include $(XEN_ROOT)/tools/Rules.mk |
792 |
- |
793 |
--CFLAGS += -Werror |
794 |
-+CFLAGS += |
795 |
- CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) |
796 |
- |
797 |
- PROGRAMS = xc_restore xc_save readnotes lsevtchn |
798 |
-diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile |
799 |
---- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800 |
800 |
-+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800 |
801 |
-@@ -13,7 +13,7 @@ |
802 |
- XEN_ROOT=../.. |
803 |
- include $(XEN_ROOT)/tools/Rules.mk |
804 |
- |
805 |
--CFLAGS += -Werror |
806 |
-+CFLAGS += |
807 |
- CFLAGS += -I $(XEN_XC) |
808 |
- CFLAGS += $(CFLAGS_libxenctrl) |
809 |
- LDFLAGS += $(LDFLAGS_libxenctrl) |
810 |
-diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile |
811 |
---- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800 |
812 |
-+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800 |
813 |
-@@ -1,7 +1,7 @@ |
814 |
- XEN_ROOT=../.. |
815 |
- include $(XEN_ROOT)/tools/Rules.mk |
816 |
- |
817 |
--CFLAGS += -Werror |
818 |
-+CFLAGS += |
819 |
- CFLAGS += $(CFLAGS_libxenstore) |
820 |
- LDFLAGS += $(LDFLAGS_libxenstore) |
821 |
- |
822 |
-diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile |
823 |
---- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800 |
824 |
-+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800 |
825 |
-@@ -34,7 +34,7 @@ |
826 |
- OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o |
827 |
- SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) |
828 |
- |
829 |
--WARN_FLAGS=-Wall -Werror |
830 |
-+WARN_FLAGS=-Wall |
831 |
- |
832 |
- CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE) |
833 |
- LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ |
834 |
-diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile |
835 |
---- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800 |
836 |
-+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800 |
837 |
-@@ -18,7 +18,7 @@ |
838 |
- all install xentop: |
839 |
- else |
840 |
- |
841 |
--CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) |
842 |
-+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT) |
843 |
- LDFLAGS += -L$(XEN_LIBXENSTAT) |
844 |
- LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) |
845 |
- CFLAGS += -DHOST_$(XEN_OS) |
846 |
-diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile |
847 |
---- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800 |
848 |
-+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800 |
849 |
-@@ -4,7 +4,7 @@ |
850 |
- MAJOR = 3.0 |
851 |
- MINOR = 0 |
852 |
- |
853 |
--CFLAGS += -Werror |
854 |
-+CFLAGS += |
855 |
- CFLAGS += -I. |
856 |
- CFLAGS += $(CFLAGS_libxenctrl) |
857 |
- |
858 |
-diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c |
859 |
---- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800 |
860 |
-+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800 |
861 |
-@@ -865,7 +865,7 @@ |
862 |
- { |
863 |
- unsigned int offset, datalen; |
864 |
- struct node *node; |
865 |
-- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */ |
866 |
-+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */ |
867 |
- char *name; |
868 |
- |
869 |
- /* Extra "strings" can be created by binary data. */ |
870 |
-diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile |
871 |
---- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800 |
872 |
-+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800 |
873 |
-@@ -1,7 +1,7 @@ |
874 |
- XEN_ROOT=../.. |
875 |
- include $(XEN_ROOT)/tools/Rules.mk |
876 |
- |
877 |
--CFLAGS += -Werror |
878 |
-+CFLAGS += |
879 |
- |
880 |
- CFLAGS += $(CFLAGS_libxenctrl) |
881 |
- LDFLAGS += $(LDFLAGS_libxenctrl) |
882 |
-Only in xen-3.4.2/: Werror.sh |
883 |
-diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk |
884 |
---- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800 |
885 |
-+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800 |
886 |
-@@ -68,7 +68,7 @@ |
887 |
- CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK |
888 |
- endif |
889 |
- ifeq ($(no_warns),y) |
890 |
--CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized |
891 |
-+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized |
892 |
- endif |
893 |
- ifneq ($(vhpt_disable),y) |
894 |
- CFLAGS += -DVHPT_ENABLED=1 |
895 |
-diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk |
896 |
---- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800 |
897 |
-+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800 |
898 |
-@@ -8,7 +8,7 @@ |
899 |
- $(call cc-option-add,CFLAGS,CC,-fno-stack-protector) |
900 |
- $(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all) |
901 |
- |
902 |
--CFLAGS += -Werror -fno-builtin -msoft-float |
903 |
-+CFLAGS += -fno-builtin -msoft-float |
904 |
- |
905 |
- # NB. awk invocation is a portable alternative to 'head -n -1' |
906 |
- %.S: %.bin |
907 |
-diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk |
908 |
---- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800 |
909 |
-+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800 |
910 |
-@@ -17,7 +17,7 @@ |
911 |
- endif |
912 |
- |
913 |
- CFLAGS += -fno-builtin -fno-common |
914 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
915 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
916 |
- CFLAGS += -I$(BASEDIR)/include |
917 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic |
918 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default |
919 |
|
920 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-libxl-tap.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-libxl-tap.patch |
921 |
deleted file mode 100644 |
922 |
index ba72c49..0000000 |
923 |
--- a/app-emulation/xen-tools/files/xen-tools-4.1.1-libxl-tap.patch |
924 |
+++ /dev/null |
925 |
@@ -1,37 +0,0 @@ |
926 |
-Index: xen-tools-4.1.1/tools/libxl/libxl_dm.c |
927 |
-=================================================================== |
928 |
---- xen-4.1.1.orig/tools/libxl/libxl_dm.c Tue Mar 15 10:14:27 2011 +0000 |
929 |
-+++ xen-4.1.1/tools/libxl/libxl_dm.c Tue Mar 15 18:19:47 2011 +0000 |
930 |
-@@ -828,8 +828,29 @@ |
931 |
- goto out; |
932 |
- } |
933 |
- |
934 |
-- if (nr_disks > 0 && !libxl__blktap_enabled(&gc)) |
935 |
-- ret = 1; |
936 |
-+ if (nr_disks > 0) { |
937 |
-+ int blktap_enabled = -1; |
938 |
-+ for (i = 0; i < nr_disks; i++) { |
939 |
-+ switch (disks[i].backend) { |
940 |
-+ case DISK_BACKEND_TAP: |
941 |
-+ if (blktap_enabled == -1) |
942 |
-+ blktap_enabled = libxl__blktap_enabled(&gc); |
943 |
-+ if (!blktap_enabled) { |
944 |
-+ ret = 1; |
945 |
-+ goto out; |
946 |
-+ } |
947 |
-+ break; |
948 |
-+ |
949 |
-+ case DISK_BACKEND_QDISK: |
950 |
-+ ret = 1; |
951 |
-+ goto out; |
952 |
-+ |
953 |
-+ case DISK_BACKEND_PHY: |
954 |
-+ case DISK_BACKEND_UNKNOWN: |
955 |
-+ break; |
956 |
-+ } |
957 |
-+ } |
958 |
-+ } |
959 |
- |
960 |
- out: |
961 |
- libxl__free_all(&gc); |
962 |
- |
963 |
|
964 |
diff --git a/app-emulation/xen-tools/files/xend.initd-r1 b/app-emulation/xen-tools/files/xend.initd-r1 |
965 |
deleted file mode 100644 |
966 |
index d1e49b0..0000000 |
967 |
--- a/app-emulation/xen-tools/files/xend.initd-r1 |
968 |
+++ /dev/null |
969 |
@@ -1,71 +0,0 @@ |
970 |
-#!/sbin/runscript |
971 |
-# Copyright 1999-2005 Gentoo Foundation |
972 |
-# Distributed under the terms of the GNU General Public License v2 |
973 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r1,v 1.1 2009/09/01 09:56:36 wschlich Exp $ |
974 |
- |
975 |
-opts="start stop status restart" |
976 |
- |
977 |
-depend() { |
978 |
- need net |
979 |
- before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp |
980 |
-} |
981 |
- |
982 |
-await_daemons_up() { |
983 |
- for ((i=0; i<5; i++)); do |
984 |
- /usr/sbin/xend status && return 0 |
985 |
- sleep 1 |
986 |
- done |
987 |
- return 1 |
988 |
-} |
989 |
- |
990 |
-is_privileged_domain() { |
991 |
- grep -qsE '^control_d$' /proc/xen/capabilities |
992 |
- return $? |
993 |
-} |
994 |
- |
995 |
-start() { |
996 |
- if is_privileged_domain ; then |
997 |
- ebegin "Starting Xen control daemon" |
998 |
- /usr/sbin/xend start && await_daemons_up |
999 |
- eend $? |
1000 |
- else |
1001 |
- eerror "Can't start xend - this is not a privileged domain." |
1002 |
- return 1 |
1003 |
- fi |
1004 |
-} |
1005 |
- |
1006 |
-stop() { |
1007 |
- if [ "$(xm list 2>/dev/null | wc -l)" -gt 2 ]; then |
1008 |
- ebegin "Stopping all Xen domains" |
1009 |
- /usr/sbin/xm shutdown --all --wait >/dev/null |
1010 |
- eend $? |
1011 |
- fi |
1012 |
- |
1013 |
- ebegin "Stopping Xen control daemon" |
1014 |
- /usr/sbin/xend stop |
1015 |
- eend $? |
1016 |
- |
1017 |
- #ebegin "Stopping xenconsoled" |
1018 |
- #kill $(</var/run/xenconsoled.pid) |
1019 |
- #eend $? |
1020 |
- |
1021 |
- #ebegin "Stopping xenstored" |
1022 |
- #kill $(</var/run/xenstore.pid) |
1023 |
- #eend $? |
1024 |
-} |
1025 |
- |
1026 |
-restart() { |
1027 |
- # IMPORTANT: do NOT restart xenstored/xenconsoled when restarting |
1028 |
- # just xend, as this can be fatal! |
1029 |
- # When restarting xend, leave alone xenstored/xenconsoled and all |
1030 |
- # running domains. |
1031 |
- # See http://article.gmane.org/gmane.comp.emulators.xen.user/40656 |
1032 |
- ebegin "Restarting Xen control daemon" |
1033 |
- /usr/sbin/xend restart |
1034 |
- eend $? |
1035 |
- # we fool /etc/init.d/runscript.sh:svc_restart() here: svc_stop svc_start |
1036 |
-} |
1037 |
- |
1038 |
-status() { |
1039 |
- is_privileged_domain && /usr/sbin/xend status |
1040 |
-} |
1041 |
|
1042 |
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r1 b/app-emulation/xen-tools/files/xendomains.initd-r1 |
1043 |
deleted file mode 100755 |
1044 |
index c7f6f88..0000000 |
1045 |
--- a/app-emulation/xen-tools/files/xendomains.initd-r1 |
1046 |
+++ /dev/null |
1047 |
@@ -1,117 +0,0 @@ |
1048 |
-#!/sbin/runscript |
1049 |
-# Copyright 1999-2011 Gentoo Foundation |
1050 |
-# Distributed under the terms of the GNU General Public License v2 |
1051 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r1,v 1.2 2011/10/13 19:30:37 alexxy Exp $ |
1052 |
- |
1053 |
-opts="start stop status restart" |
1054 |
- |
1055 |
-depend() { |
1056 |
- need xend |
1057 |
- after dhcp |
1058 |
-} |
1059 |
- |
1060 |
-get_domname() { |
1061 |
- local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1) |
1062 |
- |
1063 |
- if [[ -z ${name_from_file} ]] ; then |
1064 |
- basename "${1}" |
1065 |
- else |
1066 |
- echo ${name_from_file} |
1067 |
- fi |
1068 |
-} |
1069 |
- |
1070 |
-is_running() { |
1071 |
- /usr/sbin/xm list "${1}" >/dev/null 2>&1 |
1072 |
-} |
1073 |
- |
1074 |
-using_screen() { |
1075 |
- [[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]] |
1076 |
-} |
1077 |
- |
1078 |
-set_screen_cmd() { |
1079 |
- screen_cmd="screen -c ${SCREENRC:-/dev/null} -q -r ${SCREEN_NAME:=xen} -X" |
1080 |
-} |
1081 |
- |
1082 |
-start() { |
1083 |
- set_screen_cmd |
1084 |
- |
1085 |
- einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}" |
1086 |
- if using_screen ; then |
1087 |
- ebegin "Creating screen session to hold domain consoles" |
1088 |
- ( screen -c ${SCREENRC:-/dev/null} -d -m -S ${SCREEN_NAME} -t dom0 && sleep 3 \ |
1089 |
- && ${screen_cmd} zombie dr \ |
1090 |
- && logrotate -f /etc/xen/xen-consoles.logrotate \ |
1091 |
- && ${screen_cmd} logfile /var/log/xen-consoles/%t.log \ |
1092 |
- && ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \ |
1093 |
- && ${screen_cmd} log on \ |
1094 |
- && ${screen_cmd} deflog on ) >/dev/null |
1095 |
- if [[ $? -ne 0 ]] ; then |
1096 |
- eend 1 |
1097 |
- return 1 |
1098 |
- else |
1099 |
- eend |
1100 |
- fi |
1101 |
- fi |
1102 |
- # Create all domains with config files in AUTODIR. |
1103 |
- for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do |
1104 |
- name=$(get_domname ${dom}) |
1105 |
- if ! is_running ${name} ; then |
1106 |
- ebegin " Starting domain ${name}" |
1107 |
- if using_screen ; then |
1108 |
- ${screen_cmd} screen -t ${name} xm create ${dom} -c |
1109 |
- else |
1110 |
- xm create --quiet ${dom} |
1111 |
- fi |
1112 |
- eend $? |
1113 |
- else |
1114 |
- einfo " Not starting domain ${name} - already running" |
1115 |
- fi |
1116 |
- done |
1117 |
-} |
1118 |
- |
1119 |
-stop() { |
1120 |
- set_screen_cmd |
1121 |
- |
1122 |
- einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}" |
1123 |
- # Stop all domains with config files in AUTODIR. |
1124 |
- DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)" |
1125 |
- |
1126 |
- if [[ "$PARALLEL_SHUTDOWN" = "yes" ]] ; then |
1127 |
- for dom in $DOMAINS ; do |
1128 |
- name=$(get_domname ${dom}) |
1129 |
- if is_running ${name} ; then |
1130 |
- ebegin " Asking domain ${name} to shutdown in the background..." |
1131 |
- xm shutdown --wait ${name} >/dev/null & |
1132 |
- else |
1133 |
- einfo " Not stopping domain ${name} - not running" |
1134 |
- fi |
1135 |
- done |
1136 |
- einfo " Waiting for shutdown of domains that are still running" |
1137 |
- wait |
1138 |
- eend $? |
1139 |
- else |
1140 |
- for dom in $DOMAINS ; do |
1141 |
- name=$(get_domname ${dom}) |
1142 |
- if is_running ${name} ; then |
1143 |
- ebegin " Waiting for domain ${name} to shutdown" |
1144 |
- xm shutdown --wait ${name} >/dev/null |
1145 |
- eend $? |
1146 |
- else |
1147 |
- einfo " Not stopping domain ${name} - not running" |
1148 |
- fi |
1149 |
- done |
1150 |
- fi |
1151 |
- if using_screen ; then |
1152 |
- if ${screen_cmd} sleep 0 >/dev/null 2>&1 ; then |
1153 |
- ebegin "Closing screen session ${SCREEN_NAME}" |
1154 |
- ${screen_cmd} quit |
1155 |
- eend $? |
1156 |
- else |
1157 |
- eend 0 |
1158 |
- fi |
1159 |
- fi |
1160 |
-} |
1161 |
- |
1162 |
-status() { |
1163 |
- /usr/sbin/xm list |
1164 |
-} |
1165 |
|
1166 |
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml |
1167 |
index 501368b..f4c43a5 100644 |
1168 |
--- a/app-emulation/xen-tools/metadata.xml |
1169 |
+++ b/app-emulation/xen-tools/metadata.xml |
1170 |
@@ -7,11 +7,9 @@ |
1171 |
<name>Ian Delaney aka idella4 proxy maintainer</name> |
1172 |
</maintainer> |
1173 |
<use> |
1174 |
- <flag name='acm'>Enable the ACM/sHype XSM module from IBM for xen-3</flag> |
1175 |
<flag name='api'>Build the C libxenapi bindings</flag> |
1176 |
<flag name='flask'>Enable the Flask XSM module from NSA</flag> |
1177 |
<flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v)</flag> |
1178 |
- <flag name='ioemu'>Enable IOEMU support</flag> |
1179 |
<flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag> |
1180 |
<flag name='pygrub'>Install the pygrub boot loader</flag> |
1181 |
<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag> |
1182 |
|
1183 |
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 |
1184 |
deleted file mode 100644 |
1185 |
index c31830b..0000000 |
1186 |
--- a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild |
1187 |
+++ /dev/null |
1188 |
@@ -1,250 +0,0 @@ |
1189 |
-# Copyright 1999-2011 Gentoo Foundation |
1190 |
-# Distributed under the terms of the GNU General Public License v2 |
1191 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.4 2011/10/25 18:40:28 alexxy Exp $ |
1192 |
- |
1193 |
-EAPI="3" |
1194 |
- |
1195 |
-inherit base flag-o-matic eutils multilib python toolchain-funcs |
1196 |
- |
1197 |
-# TPMEMUFILE=tpm_emulator-0.4.tar.gz |
1198 |
- |
1199 |
-DESCRIPTION="Xend daemon and tools" |
1200 |
-HOMEPAGE="http://xen.org/" |
1201 |
-SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" |
1202 |
-# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )" |
1203 |
-S="${WORKDIR}/xen-${PV}" |
1204 |
-QA_PRESTRIPPED="/usr/share/xen/qemu/openbios-ppc \ |
1205 |
- /usr/share/xen/qemu/openbios-sparc64 \ |
1206 |
- /usr/share/xen/qemu/openbios-sparc32" |
1207 |
-QA_WX_LOAD="${QA_PRESTRIPPED}" |
1208 |
- |
1209 |
-LICENSE="GPL-2" |
1210 |
-SLOT="0" |
1211 |
-KEYWORDS="~amd64 ~x86" |
1212 |
-IUSE="doc debug screen custom-cflags pygrub hvm api acm flask" |
1213 |
- |
1214 |
-CDEPEND="dev-lang/python[ncurses,threads] |
1215 |
- sys-libs/zlib |
1216 |
- hvm? ( media-libs/libsdl ) |
1217 |
- acm? ( dev-libs/libxml2 ) |
1218 |
- api? ( dev-libs/libxml2 net-misc/curl )" |
1219 |
-# vtpm? ( dev-libs/gmp dev-libs/openssl ) |
1220 |
- |
1221 |
-DEPEND="${CDEPEND} |
1222 |
- sys-devel/gettext |
1223 |
- sys-devel/gcc |
1224 |
- dev-lang/perl |
1225 |
- dev-lang/python[ssl] |
1226 |
- app-misc/pax-utils |
1227 |
- doc? ( |
1228 |
- app-doc/doxygen |
1229 |
- dev-tex/latex2html[png,gif] |
1230 |
- media-gfx/transfig |
1231 |
- media-gfx/graphviz |
1232 |
- virtual/latex-base |
1233 |
- dev-tex/latexmk |
1234 |
- dev-texlive/texlive-latex |
1235 |
- dev-texlive/texlive-pictures |
1236 |
- dev-texlive/texlive-latexextra |
1237 |
- dev-texlive/texlive-latexrecommended |
1238 |
- ) |
1239 |
- hvm? ( |
1240 |
- x11-proto/xproto |
1241 |
- sys-devel/dev86 |
1242 |
- )" |
1243 |
- |
1244 |
-RDEPEND="${CDEPEND} |
1245 |
- sys-apps/iproute2 |
1246 |
- net-misc/bridge-utils |
1247 |
- dev-python/pyxml |
1248 |
- screen? ( |
1249 |
- app-misc/screen |
1250 |
- app-admin/logrotate |
1251 |
- ) |
1252 |
- || ( sys-fs/udev sys-apps/hotplug )" |
1253 |
- |
1254 |
-PATCHES=( |
1255 |
- "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
1256 |
- "${FILESDIR}/${PN}-3.3.0-nostrip.patch" |
1257 |
- "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch" |
1258 |
- "${FILESDIR}/${P}-as-needed.patch" |
1259 |
- "${FILESDIR}/${P}-fix-definitions.patch" |
1260 |
- "${FILESDIR}/${P}-fix-include.patch" |
1261 |
- "${FILESDIR}/${P}-werror-idiocy-v2.patch" |
1262 |
- "${FILESDIR}/${P}-ldflags-respect.patch" |
1263 |
-) |
1264 |
- |
1265 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
1266 |
-# Approved by QA team in bug #144032 |
1267 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
1268 |
-QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32 |
1269 |
- usr/share/xen/qemu/openbios-sparc64" |
1270 |
- |
1271 |
-pkg_setup() { |
1272 |
- if [ -x /.config/ ]; then |
1273 |
- die "the system has a dir /.config; this needs to be removed to allow the package to emerge" |
1274 |
- fi |
1275 |
- |
1276 |
- export "CONFIG_LOMOUNT=y" |
1277 |
- |
1278 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
1279 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
1280 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
1281 |
- eerror "to build xen-tools on your current profile." |
1282 |
- die "USE=hvm is unsupported on this system." |
1283 |
- fi |
1284 |
- |
1285 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
1286 |
- if use x86 && use amd64; then |
1287 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
1288 |
- elif use x86; then |
1289 |
- export XEN_TARGET_ARCH="x86_32" |
1290 |
- elif use amd64 ; then |
1291 |
- export XEN_TARGET_ARCH="x86_64" |
1292 |
- else |
1293 |
- die "Unsupported architecture!" |
1294 |
- fi |
1295 |
- fi |
1296 |
- |
1297 |
-# use vtpm && export "VTPM_TOOLS=y" |
1298 |
- use api && export "LIBXENAPI_BINDINGS=y" |
1299 |
- use acm && export "ACM_SECURITY=y" |
1300 |
- use flask && export "FLASK_ENABLE=y" |
1301 |
-} |
1302 |
- |
1303 |
-src_prepare() { |
1304 |
- base_src_prepare |
1305 |
- |
1306 |
- # use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm |
1307 |
- |
1308 |
- # if the user *really* wants to use their own custom-cflags, let them |
1309 |
- # Try and remove all the default custom-cflags |
1310 |
- if use custom-cflags; then |
1311 |
- epatch "${FILESDIR}/${P}-remove-default-cflags.patch" |
1312 |
- fi |
1313 |
- |
1314 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
1315 |
- if ! use hvm; then |
1316 |
- chmod 644 tools/check/check_x11_devel |
1317 |
- sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk |
1318 |
- sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile |
1319 |
- fi |
1320 |
- |
1321 |
- if ! use pygrub; then |
1322 |
- sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile |
1323 |
- fi |
1324 |
-} |
1325 |
- |
1326 |
-src_compile() { |
1327 |
- export VARTEXFONTS="${T}/fonts" |
1328 |
- local myopt |
1329 |
- use debug && myopt="${myopt} debug=y" |
1330 |
- |
1331 |
- use custom-cflags || unset CFLAGS |
1332 |
- if test-flag-CC -fno-strict-overflow; then |
1333 |
- append-flags -fno-strict-overflow |
1334 |
- fi |
1335 |
- |
1336 |
- emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed" |
1337 |
- |
1338 |
- if use doc; then |
1339 |
- sh ./docs/check_pkgs || die "package check failed" |
1340 |
- emake docs || die "compiling docs failed" |
1341 |
- emake dev-docs || die "make dev-docs failed" |
1342 |
- fi |
1343 |
- |
1344 |
- emake -C docs man-pages || die "make man-pages failed" |
1345 |
-} |
1346 |
- |
1347 |
-src_install() { |
1348 |
- make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ |
1349 |
- || die "install failed" |
1350 |
- |
1351 |
- # Remove RedHat-specific stuff |
1352 |
- rm -rf "${D}"/etc/sysconfig |
1353 |
- |
1354 |
- # Remove unneeded static-libs |
1355 |
- rm "${D}"/usr/lib64/libxenctrl.a "${D}"/usr/lib64/libxenguest.a \ |
1356 |
- "${D}"/usr/lib64/libflask.a "${D}"/usr/lib64/libxenstore.a \ |
1357 |
- "${D}"/usr/lib64/libblktap.a "${D}"/usr/lib64/libxenapi.a |
1358 |
- |
1359 |
- dodoc README docs/README.xen-bugtool docs/ChangeLog |
1360 |
- if use doc; then |
1361 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ |
1362 |
- || die "install docs failed" |
1363 |
- |
1364 |
- dohtml -r docs/api/ |
1365 |
- docinto pdf |
1366 |
- dodoc docs/api/tools/python/latex/refman.pdf |
1367 |
- |
1368 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
1369 |
- fi |
1370 |
- rm -rf "${D}"/usr/share/doc/xen/ |
1371 |
- |
1372 |
- doman docs/man?/* |
1373 |
- |
1374 |
- newinitd "${FILESDIR}"/xend.initd-r1 xend \ |
1375 |
- || die "Couldn't install xen.initd" |
1376 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains \ |
1377 |
- || die "Couldn't install xendomains.confd" |
1378 |
- newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \ |
1379 |
- || die "Couldn't install xendomains.initd" |
1380 |
- |
1381 |
- if use screen; then |
1382 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains |
1383 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ |
1384 |
- keepdir /var/log/xen-consoles |
1385 |
- fi |
1386 |
- |
1387 |
- # xend expects these to exist |
1388 |
- keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
1389 |
- |
1390 |
- # for xendomains |
1391 |
- keepdir /etc/xen/auto |
1392 |
-} |
1393 |
- |
1394 |
-pkg_postinst() { |
1395 |
- elog "Official Xen Guide and the unoffical wiki page:" |
1396 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
1397 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
1398 |
- |
1399 |
- if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then |
1400 |
- echo |
1401 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
1402 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
1403 |
- ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug." |
1404 |
- fi |
1405 |
- |
1406 |
- if ! has_version "dev-lang/python[ncurses]"; then |
1407 |
- echo |
1408 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
1409 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
1410 |
- fi |
1411 |
- |
1412 |
- if has_version "sys-apps/iproute2[minimal]"; then |
1413 |
- echo |
1414 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
1415 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
1416 |
- fi |
1417 |
- |
1418 |
- if ! use hvm; then |
1419 |
- echo |
1420 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
1421 |
- elog "support enable the hvm use flag." |
1422 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
1423 |
- echo |
1424 |
- elog "The ioemu use flag has been removed and replaced with hvm." |
1425 |
- fi |
1426 |
- |
1427 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
1428 |
- echo |
1429 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
1430 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
1431 |
- fi |
1432 |
- |
1433 |
- python_mod_optimize $(use pygrub && echo grub) xen |
1434 |
-} |
1435 |
- |
1436 |
-pkg_postrm() { |
1437 |
- python_mod_cleanup $(use pygrub && echo grub) xen |
1438 |
-} |
1439 |
|
1440 |
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild |
1441 |
similarity index 89% |
1442 |
rename from app-emulation/xen-tools/xen-tools-4.1.2-r1.ebuild |
1443 |
rename to app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild |
1444 |
index e27e24d..2a305e5 100644 |
1445 |
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r1.ebuild |
1446 |
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild |
1447 |
@@ -5,7 +5,7 @@ |
1448 |
EAPI="4" |
1449 |
|
1450 |
PYTHON_DEPEND="2" |
1451 |
-PYTHON_USE_WITH="xml" |
1452 |
+PYTHON_USE_WITH="xml threads" |
1453 |
|
1454 |
if [[ $PV == *9999 ]]; then |
1455 |
KEYWORDS="" |
1456 |
@@ -30,6 +30,9 @@ DOCS=( README docs/README.xen-bugtool docs/ChangeLog ) |
1457 |
LICENSE="GPL-2" |
1458 |
SLOT="0" |
1459 |
IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen xend" |
1460 |
+ |
1461 |
+REQUIRED_USE="hvm? ( qemu )" |
1462 |
+ |
1463 |
QA_PRESTRIPPED="/usr/share/xen/qemu/openbios-ppc \ |
1464 |
/usr/share/xen/qemu/openbios-sparc64 \ |
1465 |
/usr/share/xen/qemu/openbios-sparc32" |
1466 |
@@ -51,7 +54,7 @@ DEPEND="${CDEPEND} |
1467 |
dev-ml/findlib |
1468 |
doc? ( |
1469 |
app-doc/doxygen |
1470 |
- dev-tex/latex2html |
1471 |
+ dev-tex/latex2html[png,gif] |
1472 |
media-gfx/transfig |
1473 |
media-gfx/graphviz |
1474 |
dev-tex/xcolor |
1475 |
@@ -65,7 +68,9 @@ DEPEND="${CDEPEND} |
1476 |
hvm? ( |
1477 |
x11-proto/xproto |
1478 |
sys-devel/dev86 |
1479 |
- )" |
1480 |
+ ) |
1481 |
+ pygrub? ( dev-lang/python[ncurses] ) |
1482 |
+ " |
1483 |
|
1484 |
RDEPEND="${CDEPEND} |
1485 |
sys-apps/iproute2 |
1486 |
@@ -114,33 +119,8 @@ pkg_setup() { |
1487 |
fi |
1488 |
fi |
1489 |
|
1490 |
- if use doc && ! has_version "dev-tex/latex2html[png,gif]"; then |
1491 |
- # die early instead of later |
1492 |
- eerror "USE=doc requires latex2html with image support. Please add" |
1493 |
- eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html" |
1494 |
- die "latex2html missing both png and gif flags" |
1495 |
- fi |
1496 |
- |
1497 |
- if use pygrub && ! has_version "dev-lang/python[ncurses]"; then |
1498 |
- eerror "USE=pygrub requires python to be built with ncurses support. Please add" |
1499 |
- eerror "'ncurses' to your use flags and re-emerge python" |
1500 |
- die "python is missing ncurses flags" |
1501 |
- fi |
1502 |
- |
1503 |
- if ! has_version "dev-lang/python[threads]"; then |
1504 |
- eerror "Python is required to be built with threading support. Please add" |
1505 |
- eerror "'threads' to your use flags and re-emerge python" |
1506 |
- die "python is missing threads flags" |
1507 |
- fi |
1508 |
- |
1509 |
use api && export "LIBXENAPI_BINDINGS=y" |
1510 |
use flask && export "FLASK_ENABLE=y" |
1511 |
- |
1512 |
- if use hvm && ! use qemu; then |
1513 |
- elog "With qemu disabled, it is not possible to use HVM machines " \ |
1514 |
- "or PVM machines with a framebuffer attached in the kernel config" \ |
1515 |
- "The addition of use flag qemu is required when use flag hvm ise selected" |
1516 |
- fi |
1517 |
} |
1518 |
|
1519 |
src_prepare() { |
1520 |
@@ -205,7 +185,7 @@ src_prepare() { |
1521 |
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
1522 |
|
1523 |
# Remove check_curl, new fix to Bug #386487 |
1524 |
- epatch "${FILESDIR}/xen-tools-4.1.1-curl.patch" |
1525 |
+ epatch "${FILESDIR}/${PN}-4.1.1-curl.patch" |
1526 |
sed -i -e 's|has_or_fail curl-config|has_or_fail curl-config\nset -ux|' \ |
1527 |
tools/check/check_curl || die |