1 |
commit: b9288affd0aa5333d1f98d0c2999e7300da24c85 |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 23 03:06:36 2014 +0000 |
4 |
Commit: Lan Yixun <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 23 03:06:36 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=b9288aff |
7 |
|
8 |
xen-tools: sync portage |
9 |
|
10 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
11 |
|
12 |
--- |
13 |
app-emulation/xen-tools/ChangeLog | 61 ++- |
14 |
app-emulation/xen-tools/Manifest | 55 +-- |
15 |
.../files/xen-4-CVE-2012-6075-XSA-41.patch | 39 -- |
16 |
.../xen-tools/files/xen-4-CVE-XSA-86.patch | 171 -------- |
17 |
.../xen-tools/files/xen-4.2.0-anti-download.patch | 28 -- |
18 |
.../xen-tools/files/xen-4.3-anti-download.patch | 28 -- |
19 |
.../files/xen-tools-4-CVE-2014-1950-XSA-88.patch | 27 -- |
20 |
.../files/xen-tools-4-qemu-fix-po-collision.patch | 26 ++ |
21 |
.../files/xen-tools-4.2.4-udev-rules.patch | 13 + |
22 |
app-emulation/xen-tools/metadata.xml | 1 + |
23 |
...s-4.2.3-r1.ebuild => xen-tools-4.2.4-r2.ebuild} | 4 +- |
24 |
...s-4.2.4-r1.ebuild => xen-tools-4.2.4-r3.ebuild} | 7 +- |
25 |
app-emulation/xen-tools/xen-tools-4.2.4.ebuild | 399 ------------------- |
26 |
app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild | 435 -------------------- |
27 |
app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild | 428 -------------------- |
28 |
app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild | 436 --------------------- |
29 |
...ools-4.3.2.ebuild => xen-tools-4.3.2-r2.ebuild} | 6 +- |
30 |
app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild | 427 -------------------- |
31 |
...ools-4.4.0.ebuild => xen-tools-4.4.0-r4.ebuild} | 30 +- |
32 |
19 files changed, 157 insertions(+), 2464 deletions(-) |
33 |
|
34 |
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog |
35 |
index 1fcbcdd..13d029f 100644 |
36 |
--- a/app-emulation/xen-tools/ChangeLog |
37 |
+++ b/app-emulation/xen-tools/ChangeLog |
38 |
@@ -1,6 +1,65 @@ |
39 |
# ChangeLog for app-emulation/xen-tools |
40 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
41 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.233 2014/04/04 01:06:31 idella4 Exp $ |
42 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.243 2014/05/22 06:14:50 dlan Exp $ |
43 |
+ |
44 |
+*xen-tools-4.2.4-r3 (22 May 2014) |
45 |
+ |
46 |
+ 22 May 2014; Yixun Lan <dlan@g.o> +xen-tools-4.2.4-r3.ebuild, |
47 |
+ +files/xen-tools-4.2.4-udev-rules.patch: |
48 |
+ fix missing udev rules, bug #510976, thanks Tomoatsu Shimada |
49 |
+ |
50 |
+ 17 May 2014; Yixun Lan <dlan@g.o> -xen-tools-4.2.3-r1.ebuild, |
51 |
+ -xen-tools-4.2.4-r1.ebuild, -xen-tools-4.3.1-r5.ebuild, |
52 |
+ -xen-tools-4.3.1-r6.ebuild, -xen-tools-4.3.2-r1.ebuild, |
53 |
+ -files/xen-4-CVE-2012-6075-XSA-41.patch, |
54 |
+ -files/xen-tools-4-CVE-2014-1950-XSA-88.patch, |
55 |
+ -files/xen-4.2.0-anti-download.patch, -files/xen-4-CVE-XSA-86.patch, |
56 |
+ -files/xen-4.3-anti-download.patch: |
57 |
+ clean old ebuilds |
58 |
+ |
59 |
+ 17 May 2014; Agostino Sarubbo <ago@g.o> xen-tools-4.2.4-r2.ebuild: |
60 |
+ Stable for x86, wrt bug #509054 |
61 |
+ |
62 |
+ 17 May 2014; Agostino Sarubbo <ago@g.o> xen-tools-4.2.4-r2.ebuild, |
63 |
+ xen-tools-4.3.2-r2.ebuild: |
64 |
+ Stable for amd64, wrt bug #509054 |
65 |
+ |
66 |
+*xen-tools-4.4.0-r4 (16 May 2014) |
67 |
+ |
68 |
+ 16 May 2014; Yixun Lan <dlan@g.o> -xen-tools-4.4.0-r3.ebuild, |
69 |
+ +xen-tools-4.4.0-r4.ebuild: |
70 |
+ force depend on >=seabios-1.7.4, fix bug #510492, thanks Tomas Mozes |
71 |
+ |
72 |
+*xen-tools-4.4.0-r3 (14 May 2014) |
73 |
+ |
74 |
+ 14 May 2014; Yixun Lan <dlan@g.o> -xen-tools-4.4.0-r2.ebuild, |
75 |
+ +xen-tools-4.4.0-r3.ebuild: |
76 |
+ upstream patches bump, fix security bug #510312 |
77 |
+ |
78 |
+ 11 May 2014; Yixun Lan <dlan@g.o> xen-tools-4.4.0-r2.ebuild: |
79 |
+ silent QA warning, bug #510072, thanks iamnr3 |
80 |
+ |
81 |
+*xen-tools-4.4.0-r2 (09 May 2014) |
82 |
+*xen-tools-4.3.2-r2 (09 May 2014) |
83 |
+*xen-tools-4.2.4-r2 (09 May 2014) |
84 |
+ |
85 |
+ 09 May 2014; Yixun Lan <dlan@g.o> +xen-tools-4.2.4-r2.ebuild, |
86 |
+ +xen-tools-4.3.2-r2.ebuild, +xen-tools-4.4.0-r2.ebuild, |
87 |
+ +files/xen-tools-4-qemu-fix-po-collision.patch: |
88 |
+ 1) bump security patches, bug 508510, 508424, 509054, 509176 2) fix file |
89 |
+ collision with app-emulation/qemu, bug 508302 3) drop old |
90 |
+ |
91 |
+ 12 Apr 2014; Ian Delaney <idella4@g.o> xen-tools-4.3.1-r5.ebuild, |
92 |
+ xen-tools-4.3.1-r6.ebuild, xen-tools-4.3.2.ebuild, xen-tools-4.4.0.ebuild: |
93 |
+ minor correction to deps |
94 |
+ |
95 |
+*xen-tools-4.4.0-r1 (12 Apr 2014) |
96 |
+*xen-tools-4.3.2-r1 (12 Apr 2014) |
97 |
+*xen-tools-4.2.4-r1 (12 Apr 2014) |
98 |
+ |
99 |
+ 12 Apr 2014; Yixun Lan <dlan@g.o> +xen-tools-4.2.4-r1.ebuild, |
100 |
+ +xen-tools-4.3.2-r1.ebuild, +xen-tools-4.4.0-r1.ebuild: |
101 |
+ bump upstream patches, add IUSE=system-qemu to 4.4.x |
102 |
|
103 |
04 Apr 2014; Ian Delaney <idella4@g.o> xen-tools-4.4.0.ebuild: |
104 |
Add revised configure option, fixes Bug #506072 by Sven |
105 |
|
106 |
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest |
107 |
index e57c305..5a3e0e6 100644 |
108 |
--- a/app-emulation/xen-tools/Manifest |
109 |
+++ b/app-emulation/xen-tools/Manifest |
110 |
@@ -1,24 +1,23 @@ |
111 |
+-----BEGIN PGP SIGNED MESSAGE----- |
112 |
+Hash: SHA256 |
113 |
+ |
114 |
AUX fix-gold-ld.patch 408 SHA256 9ed4a989562890a87c05f6a63c2c2a81528e79f9e2fe5b7ebaafbc4ba874007c SHA512 7456bd9055a84490c5ac156a39ae9cda02dbe38712db5beb7adf572870f619cd897c70d4c24491dbfa3334df7ca56fd0af7494ce070f99f7d6275b9f32e48563 WHIRLPOOL f78caad306e7305bd3bc04a8c6acfda9a7a77cc405bfa74f824138b3bca85e61e8a948e112546c217aa56fe12b2b7f8dff948060bd7e61b9ac28adeca72a2a85 |
115 |
AUX ipxe-nopie.patch 964 SHA256 0b70407969735f36587fade77f524c1c2077f28585b9e0df4fe347ecc5e379bf SHA512 510f0d88cf08a9a963c0ccf32e795e98f89e749f746ea244b29d7af770608287d8218b215ee46d73ec4f727d6dfbdb316048c6b42df55a8e154aa952abb50c1d WHIRLPOOL 38ed76955d51e9c4603a487e34340df7392e3011e5b2ed550bd945727733cc3f02691c6e0a58ecbe0dd56377a5b6a955a1516647c49cb85dfc809c852ede9e38 |
116 |
AUX qemu-bridge.patch 3808 SHA256 73155306c318b7a9304eb5b7798f1d2aaf009f45af4d4dcbbc3beeb7ced013b6 SHA512 be35481ea6f9e87a6b1b73bae4c10137379447d9fecf268073015ac10a3091b8f6b0088d494bff18fcb5df27e3417441a63c63bfa3b87dacd62e5a4d31f34cfd WHIRLPOOL e363cb8e666b83b1023e954fd40c4e6d980c6b391a9159cd60d1b4bf775f8376e198e53c3c59a25a820c2f0de9fa94b2245f31d7a77f224362754865a22fe2d2 |
117 |
AUX stubs-32.h 537 SHA256 4c903162da80cefd394404cb8cd9963a6ef6e3ad6c7adcbaa450a002d929bfc5 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 WHIRLPOOL 9c006e266bea6bb9d623e76011a4eac07c5fe4fdf76a041cc42a2289a7e9163988bad0fb2f458e300e45aabf9fb864ec764a496d7f89d58e57a506bac206a5f1 |
118 |
-AUX xen-4-CVE-2012-6075-XSA-41.patch 1393 SHA256 6aa21c02e94cb9b4f612c7a9d1a8f980967692b1f20346da9670abb1d7ec688c SHA512 547f63e7eaf0a6db1a9de267cc6f9aa0f28e2221f2c69ca463ada85edbc07ac84c276dcd3ee017ab8846d4e4129e182fb76be35b91ae9a0e0afecdc091e0c305 WHIRLPOOL 848359780edc15895a09bf76afeaa503f907ac98a856b52d64ef4dcb137e2319222a47cd7a2866e6f25731498f487cfca2a462fb6dfcda8404026d8acfff5bcc |
119 |
-AUX xen-4-CVE-XSA-86.patch 6112 SHA256 0f715b7cecf3c5d786cd9ac8ac8e7b864aa7b332a478f4d94f6296f6b7ae0689 SHA512 79c3b2d77c5e3ca26f5c1368450575854b08f0928226b4313549fd9b67db733fcce09b522f23741199a83b8f20d89e7762b967cff5e2ddbdffe5e8f41d04e7ea WHIRLPOOL 6ae630b50f83dbd11bc717dd3ea02119108987e93d4ce331ad34b850903a8deff975ac16b1f25941dd280254cdfd147f7e5e2a6fa3e4cd15b9a91546aa228d85 |
120 |
AUX xen-4-fix_dotconfig-gcc.patch 9551 SHA256 93c8726fc3e0bd3f54d4162a3fdace45e3c3ea24fecf5f54270c6dc55c3924ab SHA512 64bfc2dd60bf5a7db593250f9da62cdea4daa458aa8c474ec47b065f6e19509555f48d49ec8624c484d873fe947b6f9cab98cdcd2c24ca8795eb1b64b378a004 WHIRLPOOL 341506ced55ae2ad30af1696434df25ba77c665042aa82dda35d0722f0cccbe567c8cebf51c2e20e0df3084f74f7eb7a69808dea2801f911b2d3c46a293b6ba2 |
121 |
AUX xen-4-ulong.patch 463 SHA256 160af74e6149a7c8066fa3f0b59c7dc36d0185adc98a3897de0ea26868778c1e SHA512 5188b1712009168c994ad72f9d0b0e9cd708a79244d2fbdd675b2fedb5f62b5b2f6c9f1bdd2101e2b66f1c08ab94f55230f4f269907671d82b00f510d059f2f2 WHIRLPOOL 86c98b5d698535893cd05f05481486a8a96f8ee96ce2add4e14de1d6a18701810d6a2c5925fa6cb367e95ef605c8bf9ebecb7dff7cf01763da4235a9c79c5b3f |
122 |
AUX xen-4.2-configsxp.patch 1216 SHA256 2ac6642cc1db65bb087e8179bb81f3a88230c81042ca951f487faf294def1f39 SHA512 50af6a970be4cbeb7f7c2e721a6f5bea13e73dabe3141131844970838ffc5e04bb65e3c7a98f602a3bbb8326dfb8e3f058adfcffe4e267a07cf081786f5bbc50 WHIRLPOOL ddb0c8ad6ee0653d9b30c86561eee9d6c66675023c0fe2fa7911f9639d5c7b21a1c0fc400978cc23ad075f38c28d97bdd64b3ed4e2ce56740415f8d30d7607ab |
123 |
-AUX xen-4.2.0-anti-download.patch 1028 SHA256 95ff7390d25eddf56af1d98b1310d2ebf97eebcad5c298c8320eb6ce9afd596e SHA512 8d84c3386764e2dd38bd0e93163c016b38d9e634cc4c9078138e593a887f3a9d2cecf391008004ae934a49b24af2a18051aab22b2a83b48fdad60ea50fc6120d WHIRLPOOL d95955f7236c1a4d9e23e5e4be1a8f8e9148511fc16b4fe0bba3854c02e24789c808739654684140d9900f22172b635c9af5bb6910f594b115b1eca4a7c907bc |
124 |
AUX xen-4.2.0-jserver.patch 900 SHA256 a8f9c0517b7fa4d56f3125515d260e60c51ef2cfe3fc22223c54415a92ffa16e SHA512 7f9bb7189273ecc34b5c66aea8cc9567a15c3d7e0fbd44e0f49669b067d719c9d85d6758cc213145679cbb8c2224cb5704aabb3ed40925bb2529965a5238d411 WHIRLPOOL ed6bcf1135c7dcb58eb2219c02b002fb57b16f50bfb0161bc64319b78dd7f8b87bc6206952755af900245d13073408946e31a51f01e95517f7def072f4810e66 |
125 |
AUX xen-4.2.0-nostrip.patch 1554 SHA256 3bab6078b59a086e214fa0786cb827eeeb009d6f7f9901f6a8f1a23b857259f9 SHA512 7fe44ac34a317fc2d1298cea5d26fdd778f8356f3ac9b4fc412c07ca471ea0b21e7fac29f456306681396dee835e4c18c35ce4b7ba47c47153989eeecfb96310 WHIRLPOOL 7701c5b521245ba0b66e9ff53c41ada8e216d36f7a92b2af45aaddc0bd210bbaf21cb9401036b995f2f8d2598edb9324ad50a91f71d08e427caca21b26f101bd |
126 |
-AUX xen-4.3-anti-download.patch 1031 SHA256 c525684eba4c130193a4e31789e5b5ba6dab9ed6262ad913b0a1816b483679e5 SHA512 96ccf478b28f8286ef313bfba0c91d41e9ac13348cb85e277b39de5b998c80ba0a1df3efcfc026a487aba4474f1c90329a254834d07536916437636e383b9d17 WHIRLPOOL 755df637c5f8599b7ebbb9b0005aa6183d475a9b3049bb2721c5609b68140a7424c42a2682071de4a0c01405461b92f6e46e5929d6b018ae56899daf615463bc |
127 |
AUX xen-4.3-fix_dotconfig-gcc.patch 19143 SHA256 53464dbb766f4437826c084e74aa84ef0144964966335a8dfad12372d9e61378 SHA512 015c771ce8d9197c178ee02d756a120ae212c6bb036ad46158762b4728587c75ec96466fc71e3c34a2ffbb580c881feb3d0c367db718a463719ada6905f52fa8 WHIRLPOOL 49f146b8f978341e79d6a73ac38cb1be42ea5a403e1f07941e33ad200ace6bd82f86febe829cce878488562996dfa2610df016085e35610386ecb0fc91587fb7 |
128 |
AUX xen-4.3-jserver.patch 1487 SHA256 3bbf6d06ad1960e30dc84a3e3b179d5d23331ecf60d347871b7008c58456a6ed SHA512 f92bced9f3e7fec84b1bfce6ce3366f134cec2b892ffc3afcdd3fd3f73daf158c17c312260fae39bc9e04c1dab1045d17f0da706dd0dba0279e66dea454aed8d WHIRLPOOL 10828eb65effad714a61a18bcd6c33c2b7fb7fd0007b1a68aed7a653cd7e67acc04cc5eb9574d7d50c92fc7ca8223dff0c73f1cfde994e4ee1d787f536588b99 |
129 |
AUX xen-4.4-nostrip.patch 493 SHA256 5fde7414d3a4debc91229ce6fd91194590014ba0da875c0003950311d58f2d7f SHA512 fd473cc94375e9ea73003c9f904d8183a82521b7e35d0a90ce7561d532aacc0eb914b964ffafc9c6e29e4aa47d5da4715a0447da45b0906fc3884dcd50ae6dd6 WHIRLPOOL d8381a365d641ad7ca7702f570d9a48f520cae61c08b67970db42842c77509e7cf2bb133efa8acc95ad3d914f38da0c382871bcd35ce8e97e80b3f61bcc9bdbf |
130 |
AUX xen-4.4-qemu-bridge.patch 3557 SHA256 d6cdc6e947bfeeea98698952c9a85c0f0bb19239ebec7051873ed26e7ca5a2f5 SHA512 6f94f089a6a73f863b3e70f9a784cfdcc37a10901a596246aa5e324647484905a3c9c418f672d8895eca0fc36bd61c0df6bc3374baadcc4717c35dcb9a9a0a9d WHIRLPOOL ce78ac4bd098c87fb6794ab52e7a800f9d560e67628f6729ed2a15986e8b3bea72a22b0ce9ff3cfaeb07a39724498d8deba9fd26ae30b7dee6f1ab8c01a2734a |
131 |
AUX xen-consoles.logrotate 63 SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 WHIRLPOOL be108bf298202851de434af513ac8c03a533e7621623c2a7e8f26d498074b3eec81b85b2ae29ad2ec67f4fe9937c88bd78c5f5e260793e7e69ec964d4adb989e |
132 |
AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 SHA256 d00a1954447fc29500ab2f1a8c7900310e0dee81942be5c922ad66b6b42dfb74 SHA512 496c61ec237506c77577e832828de923283f55ab07ad141718af1a719b1b5bcdb8152a8cffddc679ff4a3e389582e7b8de8aaf1b4c8b1124bf1563467bdf674f WHIRLPOOL f80a557ed62cc26a51f85bc8682a738ab29d4573e3261c440f6e66f50cd81263fa2c6898b1aa1b1c227a2d3923cc9fd718ffad2e123ee69c6d7929def7906433 |
133 |
-AUX xen-tools-4-CVE-2014-1950-XSA-88.patch 851 SHA256 7a73ca9db19a9ffe6e8cd259fa71dc1299738f26fa024303f4ab38931db75f14 SHA512 16cb312d5f8f3e83850900ed4c557d9f47e03670ffa8b148a4ac3ca792e309d86706f05119244c9e29b37e366a11d7dbcd4b5f1b47936c9a7b65094fabb4965b WHIRLPOOL a3c21b03a00c3d61bb9d1c843a371f14bb9d3b13aa18bdbc59020bdcf542aadbd027f4357b0b3298f32a4e3e0928ad5b6ccbd4e7462238a91ea8708eaad28fe3 |
134 |
AUX xen-tools-4-docfix.patch 438 SHA256 016120c2333667aa84861ac9289c48a072c4842fb517936570882e1fc4060de6 SHA512 0a67d703749df823f5223b555c6dc896420e73ed7eeb5e77a8f8b950fc8bafaf9e20d66c35b29883b3cee6f8ca5054af3b55f804d20ae20d676feeeabf92b489 WHIRLPOOL fed73bd521b4cbea804ef4bc3b4b3a4007e7765cf0ab67e700e95afd328181ab5fce246b53a5e2a462baf6029664b25f82ffeabc1aaeb45fa99af344ecc957a5 |
135 |
+AUX xen-tools-4-qemu-fix-po-collision.patch 924 SHA256 d222f47362f60b284057709e6432a7e787c719b28e5378209a9e58e551183f0e SHA512 ac78d68cab8dc403b83c5ec30dd46efa283241c76febdb91ad1b706b2dd4a3f71d6d3edb33480014cd20140a99b12f15faaf35f1d84b9a74cc67bc652fd22a9d WHIRLPOOL c1667f14f4e35fafdcad91765f73675e3523a57e534ef82da67d7a4982b31314925990aabf7707c3646ccd537ef10ea019054c33e08d53140209053fa4826694 |
136 |
AUX xen-tools-4-qemu-xen-doc.patch 820 SHA256 691b2d84f7312388d528c83f3e9e90521e6b2c97abae8ca8a83325655264c98a SHA512 bc07420be7629796e49e128c1cfbde8fa7d4dc3b66174462448e9033f78c0c982dfdbd4dde9b1c54a9862fd2f9602c6bac0be1dfc0df8280aaaf8de60acb708f WHIRLPOOL 4fc2907a42bc3f824160f92586392f7dba07c2229382585f5f7bf4c0f3ab2574a814e8e8fd076b68abb2580497492e1fc0e6181ffb8f1acb5c70e60caff81505 |
137 |
AUX xen-tools-4-unbundle-ipxe.patch 1294 SHA256 8358f99924049bdd7e8f00a0f68250c33c46796d30457e885c6a36d8b23dd4ca SHA512 dfe1504bf5cbbf14060e16ef8f24c64c51d68420ede80c8fcd284ae302c50840cb305ff65f2279f3f8749cb62ad9c49fbbace6bdc3d71decca16398c40e4b2cc WHIRLPOOL 9801cf864928b8df55900164cab6d80c9b01a2e8e8685c003394ca2cc098ea969a0bf15fea6be7909a33011dd0fa45748446efe439d60900b1bd9daa3587bde8 |
138 |
AUX xen-tools-4-unbundle-seabios.patch 805 SHA256 45e5d640fa071fe5a2e1f4168bb01851fb6e1d273b245b717f20229cf99e8d36 SHA512 96828ff555aa99347e9beda2adecbfe7fd27e9f9f0fc1491b470e25917aeb885d92d6ff1bbdf6282f400a76fc117c41b62cf71fffabbb9a1a5ddca20173abd6f WHIRLPOOL 29090b75288c23d8fd2e39cf7404c89e4c3fc209f7b29c87a5f7fdfc037e3b99ce7643bb2517e76bcc457fc5e8db49a4991c3a13b941db4d9e4c1ea861aa35f6 |
139 |
@@ -26,6 +25,7 @@ AUX xen-tools-4.1.1-bridge.patch 449 SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db |
140 |
AUX xen-tools-4.2-xen_disk_leak.patch 2324 SHA256 b5d07dded35d48196afe4e52e7e48ef459b527c4b34f1aad13710dae94cba6c8 SHA512 bb8a36a30e69f6d09c9293cd76f071741ce04bf0d0129d9417b3fc41841f6dcb0160506a80222e67d58c78a289072913578868d6a055eb23266d15d5fa59ebe2 WHIRLPOOL c0c69406f564b335a3215a7cea8a447ad7d2b27590f3cf92c74c74356c46ed26557fee3ff5fac5a8ae54f7d8dc1772500d75d9de1630a57ee48d8193a6fdd1e9 |
141 |
AUX xen-tools-4.2.2-install.patch 994 SHA256 4e86e9aa4bb884fcdeec8824c1ec9c54d5e5106f9101b6ca6eb0f5fea6b953b9 SHA512 99b179082eda1326b093f04f9321b3133beef8f7689cc3b9ef626b8d08744629b7b5867a96cb31d3030a4db3f17d230d506828bdd87631989809139459e81937 WHIRLPOOL a5de9e0897552eab01741a8147c871909f48ec11238c9503f7902c94aad6df65baf0fe54b013145fade8091ec452c03906f624cbcd417e3cd2aac6f64b12ffd2 |
142 |
AUX xen-tools-4.2.2-rt-link.patch 1371 SHA256 8bbcbf69900a041c368a219aa6a3eca13d802e54a29ccfa50db4f86691ba977a SHA512 cbfac7a485c811afa54740c638ef161036f36d09d11ee3df6ae79fa9d6fbae174933946f83b4dcaa7aa78124346fbb9b9bd3e969fa73c121afc64d8eda1ecdec WHIRLPOOL da90e1b6983541d52d26dcd1dd168ed3d05e6ab69624914c544af7a6102ef66de3594fc2b07f8fe6bb7f5233781c7c35bbbb9aa8a52dda0dc78eb57f05765b83 |
143 |
+AUX xen-tools-4.2.4-udev-rules.patch 705 SHA256 89b5eb99b4859f2f34ba55841118a21811e54c8d410ce4d14af4f21d25efb458 SHA512 90eaf7bb8e504ac035cc83d2a953af76bfd990296b539f8bf33439674ce172258171aef68617209a6c83788998bb968a3acb4c727b7f8965bef0eb9a5cd0e0bd WHIRLPOOL bf385acd06d335822d096e136ffa3ef1311be5de84b78058d788093cf87399b48801a4e020fbd0766ed3c0e60e8b211dfd8b2af4ca28ee7dd33aa8027238bef5 |
144 |
AUX xen-tools-4.3-ar-cc.patch 4036 SHA256 1470887a8ced12d8df61ef74d6dfcb36f2822fa95da7031162ecb577f69ae49a SHA512 1171b5005a24fbbcd4ad9a68153c78ce816aa823f0452a707f3e26d5cee0a0faa05d917db3edcdc7f2924dcf9fd8aee5d7ac7a419723eebe3699be7a32765dd0 WHIRLPOOL e5c3a2adf7e55e7690c4123f442e8f43f66030015228473f9d4d69230eeeb82714c89f502942cd9a76e0637d70f6dc2ebed7eeb3202fbb6cca430c8af420b549 |
145 |
AUX xen-tools-4.4-api-fix.patch 1586 SHA256 d4e2a090f38333996f14328c9b0ded2a76cb336637660446003cdfb1bc03ed49 SHA512 883c06d3d30d3b61815e0bbc69de49c11196e2bf8af7c32b4ed4dbd034596906c209e1714a5f7d9bdcdcdd289972b7b7163351c4b9e324640429e8aa598ec695 WHIRLPOOL 9a3b402487e626e4cf02664231ac263550c4f2e862f2e0d729157823217b94e7d07299e1363e8f0dc0afa0199b455f7a1c08601a4ba4b0b00b60b479f93b83c7 |
146 |
AUX xencommons.confd 109 SHA256 e19b950b1bb4103f9006a0c2648a8d4bc890e2c67417de2700b82fb456802640 SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17 WHIRLPOOL a8b7df6f9a8515b9c3c845379a3aa4424490972d5f882e8779a30fd2d44b77cb66deaa5c1496125ea7bc82e06044a485e14e904ad5c9c79222c008fb6ccc4e74 |
147 |
@@ -41,25 +41,32 @@ AUX xenqemudev.confd 156 SHA256 61c5ff72464c5098d9cad50e5dc94a090dd107b4831bb60a |
148 |
AUX xenqemudev.initd 1847 SHA256 c1b002a54917f60adf6941fecf44453c0072a9048c9c3e318d2e695f7ea12c72 SHA512 3fb6a8c5d35b773e0fb7bc9b6c26aa18be48b97d95cbb21df8aefeebb814e3fd5819d579504a4015acb0e5fd6abe2f864f48ea83c095cedae2c69720b6e355ad WHIRLPOOL 2a286111d18eb1f8701f3d30e1fb0b006e2ab359db1ff32100e18fd0e4f46cf13407d765842542c38a31598f62cc71f246bb5c11d06410336850c0288c9e8d4a |
149 |
AUX xenstored.confd 42 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4 WHIRLPOOL df46f3fde8b13c3427f445bcf08eb4c660f6000164a01e461cff85cf93ce1195009fc3b4457181788da8eef8dec9125b41ace233ec6f169919be64337a57ebb8 |
150 |
AUX xenstored.initd 1056 SHA256 f16d6e4c319aebaa480e75cd32a754aee059223256bf786d7c983fb0c17e2a83 SHA512 a03312a736aed161ee78021493ab109182465053c6272a8281263f7ae32fd7ad3de83ab066441d827a78b24c5d65fcf95e55823a13f6e8767be1ced144fedbcb WHIRLPOOL aaf28f1cb86f8be5f7dd1922ec5918a74538b9fd81eb51be47b1e4a6235a399ea037e9e48a54b1d5929217c98b644ddd6a7dd4b6d796ec7eeb7bfd50450633d6 |
151 |
-DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc |
152 |
-DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942eea1490a9e7e01f478541577025f6eef76e0c76de SHA512 e9ebe3711e3f678d3632f8e8e645f8be4fb65608aff04aeeb0e1152521bf571bc4d879f136d23bb0aa8bd4c4ec20f294b472cf54dc70916e52d330328aadd357 WHIRLPOOL 6138271f72fd96fabe3cffc07a6efcb9c0e195ed96f4ad708d00e85e0a84a03900dc41389cd4f26d533a3aa42142a9e17708d7b87d722f1c9348f61a5db3e59d |
153 |
-DIST xen-4.2.3-upstream-patches-0.tar.xz 84436 SHA256 7c2477b9b29c9d84bb26ed60bfc2700f2a614ed8040b93906e801831f3498b41 SHA512 a4e8b53a0efb9d64d4dc65ee3107422c8007537e03f9c8e6f1b2c838cf62e6819d447c1ed44aacb5c4e9979f0dad7ed313d2db61df6e6ad2d7708a81964a7e12 WHIRLPOOL cc3c2224bba3b2e5f057ec95f9e85e58b17bc0dce338da429c7970877967cddf69228258ff491be9c1d022169a90fcde34ef1bcb0c198c9123ca219707a5a99f |
154 |
-DIST xen-4.2.3.tar.gz 15613235 SHA256 69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db SHA512 01521c8724354f92a2555683a8b103e5e16aedeb2c6166cc3ce40a0cc6cd9e07a601aa24930bb7391e00eb97f04003e6523dead09382cf86eb56f5b886509b9a WHIRLPOOL e7f7848ad632e5e77db95b2eb37c82f31a73021af4b6bb44091cc14103faa193bc2d6deb089e2a196daab5a08dbc08f135a8937a25a4ff5d31fe37c789bae1e9 |
155 |
-DIST xen-4.2.4-upstream-patches-0.tar.xz 15480 SHA256 c01c2edf3f7f0f3e1c9408f2eddb2ee3d211a3fe44833852335488bb585072b1 SHA512 3eb85f982478b9c09db94978fee4e042c556ddcd4b89aaff1c4a3adf07b118404eeacb29b83e58e2e8a1d389d0027903458d14b2b900b31f4806f7c428a387b9 WHIRLPOOL d4c9b0550b0f38f5227ea305c0b983deafb97bdac4fa498bc791dce6796d564303813959a1a90d488b69d5540ef9a65fab70598329420691d30b4f4c48de37e9 |
156 |
+DIST xen-4.2.4-upstream-patches-1.tar.xz 27932 SHA256 8f246eaf65a7cfe72cd9af596993ec1326dd1c4411efd1b76294a7bffafed119 SHA512 4d0eca51d91588214b06c3a082fff62ffb69fa518f0d1afb28e7489ffc1539751a586b334db6cefc7ef99ffaaff296af26c85a6dc114db7d78663de7748922f3 WHIRLPOOL 28e82065d033bd2ef0b140a2eaf2aea546e3e7ec5fa1e6f44a0d4dd7c26324981805dbc9f41b13fd3b12dc8440dfa74a1da79b117f7294e222b7407ad7371f74 |
157 |
DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2 |
158 |
-DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca |
159 |
-DIST xen-4.3.2-upstream-patches-0.tar.xz 13844 SHA256 c083f9b4490049cfcd83782574f52847df9b5738c8fe3220481526e73d01c380 SHA512 69c5b4fbfcf4ddc5964a7c0b60012eab244368d67c625cdb67d9c33f1e273c04234bed1e78de9e6a40ede1a30d279d5d588718bd5f210d37e016e53c03a4a0f9 WHIRLPOOL bb7b088fec542521fe6a0438607618c390f83da379f9a6de57472afdfb0f5d4a3aedcdaf43716df4353eb1cbf642a34e2da546da974bb8906a6780486d3844f6 |
160 |
+DIST xen-4.3.2-upstream-patches-1.tar.xz 28004 SHA256 451df6bc293102a8f5eff0bc5b2c9feba0d8c0df5bdfba5591fac405e4f0141f SHA512 c0fd9ed16773e62121290dfc85e082997b049756a5038b0e3d4d618566a86abcf8baf499d176a529d8c33e2b333bd2be11dc075d026ce21b0d42d20b141c9e4f WHIRLPOOL 9a01940b7247a448ee1795539682a79dd70b470a535f438f077d2da7633f06eeb01c26c62c504a0e7ad68d7156957f96d8e966762b9c782e1bce37416b40a648 |
161 |
DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3 |
162 |
-DIST xen-4.4.0-upstream-patches-0.tar.xz 13124 SHA256 78d3e7dfd8c2f6243954fa320406d332c318e598e0602b4a7df7949260fb4f16 SHA512 c8bf9687742c352f20df85eee9f72e7d27a4250612396be7d61ed0e2251f1508f0be4ebecf39e5fbf001f7dbc5642f46a9d388dfb6f75231998f0e7221c9a6a1 WHIRLPOOL 2fe18ea84cacb4b2baef8c701e3383c14b9d354b3dfab6ffc14e455a764815c520a00ad485d7faf6281e60f4b09010fd2f71e497313ed4af7fd4b44cc9eb3716 |
163 |
+DIST xen-4.4.0-upstream-patches-2.tar.xz 51840 SHA256 b1828719a42a429d66c4943bde714ac98dbd368d9f337795b3a9da4e7d755e22 SHA512 dabaa350dcc07f91df7bb4712b69f8fb5c5cf624b5e6ddfde75be891c4d7b7a81e0d8824b707fdc85a4de98929609c9f276ee871a54afa15ff21d80cebf31f80 WHIRLPOOL 6326d13e69090957d8f7f6b2cb088d597103d03b54728f37a49b89b7fac71446b4aa11c535996b206c1c7373eff8ac693e0f48b7fc3e69a566362df6eb6ecab6 |
164 |
DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406 |
165 |
-EBUILD xen-tools-4.2.3-r1.ebuild 11989 SHA256 a32aadc6a44ad5181288bf970147576a6a1e6229a577301eb8c127f91ee2c6a0 SHA512 e7f1e7f774a985acbb68cd5c9212d930d1ee8c6f64f115f15768c0af12b09590bfc32e796a9127dac0f7a7a879082a9cc3095e049beee897b095afa32e63ea8c WHIRLPOOL 15d09e5044937f542c29df861fc819751f0dbc0325cb195924bc057e86c9d6b0c7723315ca16e71794654a280cfef29609f7d48a037faa15bf18c33e73afa120 |
166 |
-EBUILD xen-tools-4.2.4-r1.ebuild 11988 SHA256 1b4a6d056d91e9097fb5d1729d4d890ffc7e191eb058b9107c206f68869f76eb SHA512 d1056bbe0e0c5ce1cbd8302a75e8fd78e0e0e4fdd0c6f495632d412ea5337f346b012e8f6b187e6ea54d6d270c59af89c62d16d9e23bbb5ddfe4788b660958af WHIRLPOOL 3fdec84498e9ce72289e32ff46de9b10f39eaa8df89e71ccd5a2bf14b6a53de5a843856ffd43a8e02aa9b075e7540405960d6a25ce636d63dbbc173e16c42f36 |
167 |
-EBUILD xen-tools-4.2.4.ebuild 11987 SHA256 ba8f8215a30ad9c8142afe162daa9ccf622a1ec6a1c886e2455c9d0711f30d7d SHA512 0529a8831529bab34a8c44b3e28f740a283fee758ff3fbf496c80cba47cf983a2bd5cac56502ad958a305f62680ecd31554d254b68e0e2b165f9372b45c91edb WHIRLPOOL 7ac8b6c68f851c8456b75a6d1780e33b632d330100c489e5a266fbd917f240590e57ba8bd92ed8dddb4710995032f313d92124e8ff4792e3a492633e83bddde0 |
168 |
-EBUILD xen-tools-4.3.1-r5.ebuild 13361 SHA256 a8ce8d82a364d052e4cff8e0488a3a4270195454f36c3147bad7eac85d1fd759 SHA512 5627f29c7ec9710db00c828d4cf3d919f75368f82ca21c8398c04d6ca98e92541b07b5a3491ee289f652b5d532249e98cd85820a4f56a7fcfa9c78b9eb42712e WHIRLPOOL 3850ebf7e61ff79b79eb0f00707b7d9da289188a4f09a69d45eff3b0b680a6d3474773fd7ff280ff6a70d54c8cf6d9ff38bb3b195d491bc068d2f5584515eb7a |
169 |
-EBUILD xen-tools-4.3.1-r6.ebuild 13005 SHA256 7e958545d22e0bba03adc8a00a8330f35f27dcb426bb6e0494a62a4dfe1510a3 SHA512 2aa89d5b14842c7acb77a0e81899b5a19cc40ca2a223936fd04f584c3ee147b56efceb59759162f1ff8197d482e36ee8434cbe8cb508e8d16ab38e725a8f6ff7 WHIRLPOOL 95969a9eda5f3a1b9e731baa23470bf39ecfca37788d7e88b109e4b9763435a5f875ab206e79de646a281db5833c492aee1e89ce39905d17ce2b6fb04a66e4dd |
170 |
-EBUILD xen-tools-4.3.2-r1.ebuild 13246 SHA256 946a64bee6fd8450161acc8fc94037926e4a7e94b8bd1848a990d60902a2b67d SHA512 e784457dc346cacc8ce853e4520eddc93a185d79babbd8af1efe6e9913d2dfae5935440d7f430d4da4108f2a8184e9c3eb772aaaf2df6606ca5f4ceee0932b90 WHIRLPOOL 31cf9992274c5dbfc02fabd932a1cc90ef672bc5e6386705d2f53958b937bb55a45029534d5319bff6c2db61d898e04f9030d6cb857e3ce4cfeebdb550c5d239 |
171 |
-EBUILD xen-tools-4.3.2.ebuild 13245 SHA256 34e4c318fe5d1a21020488f8f4c81c856451471d4ae86ca5d145c71e422ddff7 SHA512 fbe50cf92f137887c609dd201a3af0a0cb0b9e001b933bf54737e82962cdf971d6cf4964265d7ed3bd6d252b7e202a03e6596e00bfb393854b1ab0c15e1d1205 WHIRLPOOL 3d8d1facf4368adda3144277b07873eba9b79e0cf7eb11da1b990bb306a2bcdcb6ab4be038b59bdae1953dc1fd980e19fc0b389fab359f4fedce56fd25371394 |
172 |
-EBUILD xen-tools-4.4.0-r1.ebuild 12805 SHA256 8aaa670bd309b13b4f4cdb75f7ce23b2a9cca86719dada438d1f57a45ac6e261 SHA512 59ac932a5a3939a0bf284b6683e0f80c750708004b01ca9d3eabfe4d0668362ea32bade46b54773597384ef56fda4badd8bfabf50bdcf451f9796d34e7a318e8 WHIRLPOOL 3a9ec97da5da0dd7baf8f7bbb6d5eb7af1ff8507e4878df13eada0ad00a53aaed828c1827bdcfce035d856738f6645eedb89fb1ad1600f7499d1a2c840826c15 |
173 |
-EBUILD xen-tools-4.4.0.ebuild 12804 SHA256 1aa22d9901e644e939b64dea8ba7fe05b38ce310f2f5e5e0b452910779e17136 SHA512 d5008cca7db804ac2ef6f5acfa69884c5c95f1947f72d107c35d294bf2c529bdeb734b4ad3f6e7bc19a2b0ba93d5dbcdf1caa8faf65e7f461d8647e9ffa3d810 WHIRLPOOL 545ab44cc507c248338f95e4e97f3e367ed27f4c7f1285a85e904901ba3a4de0e09fea976e90812bd52532ae10ad90c5869c7457fe0f5e0a4effde7b3393584b |
174 |
-MISC ChangeLog 55291 SHA256 df2cbd17bc5270984835955c8295d5168c059ab0252b8ea1d1b9ea2274d81703 SHA512 0b08aec6273a9e12687b43f6e3c67e3f80164106ee4a0f8759f8ce4877c970e87769c063527f6c0932379ade6bd1011e973f10e86253185b9d51be44f527b0a1 WHIRLPOOL 80b1e9781044af4486b3b783a32c854c5f506949fa4d54fbcf588c1536eda9b83e0ea16d91d643f77f5c45452c308d5f4301ca636ef4de178f3cd54eaf19b5ab |
175 |
-MISC metadata.xml 810 SHA256 adf8036cf95a218b6ac09df641acc482e39557e3cfd16728e03af04810c92e36 SHA512 8fd59fc4b8110132df068d3658b8d48b9f10c36243b2ca340c5b178a58eea12bc7531c14b6a41478a0aa754a2b29ec1bf32827d5fca240ad1237c017e50f1de9 WHIRLPOOL 01e873b0cebe4a40f702e0977efc2b3f62984032e3ff81d3e45b3e291712e51c20510f41dd1402bd4d916a674204b02acc49fc6e6be53cbb0f4fc8430cbb53d8 |
176 |
+EBUILD xen-tools-4.2.4-r2.ebuild 11986 SHA256 ce01ef25bb3545e4a93ec97a371dbf657895bf21a7e947a6cf81e2586dc080ae SHA512 e7a248987b6516495c9189b27caaec174798d62c486d685ab10b05ffe5033bceec07182e265d5227c83fd00372a86111b50594558990ee018892f431714bee66 WHIRLPOOL 2b37bdcbe274a6848f12f7eaf5fc6b2aa983ac809a2c8d30900d10bf6894d43546eb0df63f9003c25953641a6f664faa69acd387d4bec34c7268f10165c7b931 |
177 |
+EBUILD xen-tools-4.2.4-r3.ebuild 12048 SHA256 9f3611f949a836ee5023fbaf3b516954f41e6e5ecec046bc07f818e0d73d45ec SHA512 5193f73cfe9387aa132c0d49c3ef176d1ab51645aa76f30f7b17260d272ca2280657a03be89674ce94bece9fab96b859709fda8997dc8a9f7f7eb4bc5a519ec5 WHIRLPOOL 561ab987e019f93d31ff0c14e08e121b64396e854b8f2666ce51deb6aef7591306b12a14f3dd94b08fde3aa3ec2c78f378c562e4011ceeca4b3db0046c792629 |
178 |
+EBUILD xen-tools-4.3.2-r2.ebuild 13245 SHA256 58f321dcf96d8d1b5998b9d44be9df8656aaaee2bd946f35a1b9a3c4dba6cabe SHA512 550e6a6332a1a486b88ce2b39fa52b524aefb1f095079ca1275cf776f46a2e740088b23270209127303d7bc536a311ace6bbc85c28114158e6ade1350f41768d WHIRLPOOL d74c89983b6622ab14f64e1fb37429d50d812180036932e046114c7bac367d52f61b33e8d4794299be56fed4c8e2c26741cdc2eb7e7d4960bceefeaeefcaafc7 |
179 |
+EBUILD xen-tools-4.4.0-r4.ebuild 13092 SHA256 45111f65638ba18dad929543c5c782c8711b215c351ce4aae7abea42a5d582b3 SHA512 5065511f1cb11472da837a5652b73c851fdceb3473b2ce82cf25c05f840e5a8aef53320c554437621d95ee8292692aee18a95fff312568e9fda5253657965bf7 WHIRLPOOL af442f2682dd8d4bfd99f78874e47a5e94ceae5673af29dd9ca13747bd3035ecc6a2caf6a9e928ce3f43f6fa039a5905c49fee88121a08fb973ddb5d4bc12171 |
180 |
+MISC ChangeLog 57563 SHA256 e09477e35cca7bc816673c8cb62b97333ca27b6a793d312ac1683f037807f28f SHA512 844e539d22a3b569ecdb2f1312c5345d51d572151abf4ff515c7e54c192142e1fa6f3fde53815dabb69e05f7422e75e8cd9f0fa9d84b6c738663686ad38316a8 WHIRLPOOL 9c7d9191f8b76668df8c700a07216a887610b3a1ab22fdf66e67ef4c413bf0aa596aae72feeae80e344453f00543b3864b1d77134cab676980a568b330662d50 |
181 |
+MISC metadata.xml 907 SHA256 3a4a48068d7123fc4942ebbf10b09f12add6e8dddb62adac4b6b76ddd591f8d4 SHA512 424f8bc1caaa5304df91b4c80af900e053c77f760b0d6c4b7c1ae05750f681457a862b7b9ac31017d4a8ab9fa25601090ba961a601a1b19e4eca19f442249a41 WHIRLPOOL a9b30ce1ce48a3acc64e4e49f4c1f516cd38bce19c2c25d513363c4e2cda90588e7c42498b026af0b103f6a6d2fc1d279bcdd6ac6077ffdf59bb28d15711fa69 |
182 |
+-----BEGIN PGP SIGNATURE----- |
183 |
+Version: GnuPG v2.0.22 (GNU/Linux) |
184 |
+ |
185 |
+iQIcBAEBCAAGBQJTfZOEAAoJEJIMDbyqvv1VGAoQAIehn1lrSDPZvITcgPG+ktUm |
186 |
+MpTOtZB46BGNng/n9Dwo6fJ13z9ObofqrUcrqVqBkklmtBq3ntNnINifIjYeeHqw |
187 |
+I1/TgYRdC3429uTnSdQapLud0A66WfVA3VnEfk/7cdEEciMODf7SE3h1fQZ4akqp |
188 |
+nGhJ0cTSGmfE747SM7L9Sg1N/cOUhCEmnHNM2w1kTB03/yR8My5T0XkFexbtLxKk |
189 |
+U8iFxtqmfFfO7oQuaiNIKyj0e99YLSnsysCTG4FEaLk/ezM5Vcfw2YpUeLCB0FkF |
190 |
+z1paGzJcdpbJF6VfbDOfqVtsl7orHdC0sjy8UXSjIOW3ievi06c65sc9xczX3FKb |
191 |
+0LkSOu7nleT5HJ5yE8IQukDoMYgk8f6nOPPEAe9ZZDhvX5eyrts+D2CaJeQxrN3s |
192 |
+i20YJiRX6hcELOFCDyfVSIH8+ejFWXWdm7c2lTzUdDNuwgEEhuVUaaulqGDwf6P9 |
193 |
+IgiNOwVA+Zv9K/5BG2dvvNFqhx8G1FaJ7mtVkd7fAonGxkyJCAUl5+48wAFrLW3X |
194 |
+4AcNm9hzIB5jOusx7HLyXVWFi+lX8w14KJOyOhiZ7DhiOPCaczF3BQC9Zb6vAS5J |
195 |
+7JssBMPavAB+NXkJKwZUzousGRdOiCDS7qrPc2np6CmgR/8JuGNz/gCr9WNkIvLq |
196 |
+vlsV+S3E+uEoe7hKVV1c |
197 |
+=8bjJ |
198 |
+-----END PGP SIGNATURE----- |
199 |
|
200 |
diff --git a/app-emulation/xen-tools/files/xen-4-CVE-2012-6075-XSA-41.patch b/app-emulation/xen-tools/files/xen-4-CVE-2012-6075-XSA-41.patch |
201 |
deleted file mode 100644 |
202 |
index 7513ac3..0000000 |
203 |
--- a/app-emulation/xen-tools/files/xen-4-CVE-2012-6075-XSA-41.patch |
204 |
+++ /dev/null |
205 |
@@ -1,39 +0,0 @@ |
206 |
-authorMichael Contreras <michael@×××××××.com> |
207 |
- Mon, 3 Dec 2012 04:11:22 +0000 (20:11 -0800) |
208 |
-committerAnthony Liguori <aliguori@××××××.com> |
209 |
- Mon, 3 Dec 2012 14:14:10 +0000 (08:14 -0600) |
210 |
- |
211 |
-The e1000_receive function for the e1000 needs to discard packets longer than |
212 |
-1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes |
213 |
-this behavior and allocates memory based on this assumption. |
214 |
- |
215 |
-Signed-off-by: Michael Contreras <michael@×××××××.com> |
216 |
-Signed-off-by: Anthony Liguori <aliguori@××××××.com> |
217 |
-hw/e1000.c |
218 |
- |
219 |
---- tools/qemu-xen/hw/e1000.c |
220 |
-+++ tools/qemu-xen/hw/e1000.c |
221 |
-@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); |
222 |
- #define PNPMMIO_SIZE 0x20000 |
223 |
- #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */ |
224 |
- |
225 |
-+/* this is the size past which hardware will drop packets when setting LPE=0 */ |
226 |
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522 |
227 |
-+ |
228 |
- /* |
229 |
- * HW models: |
230 |
- * E1000_DEV_ID_82540EM works with Windows and Linux |
231 |
-@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size) |
232 |
- size = sizeof(min_buf); |
233 |
- } |
234 |
- |
235 |
-+ /* Discard oversized packets if !LPE and !SBP. */ |
236 |
-+ if (size > MAXIMUM_ETHERNET_VLAN_SIZE |
237 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE) |
238 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { |
239 |
-+ return size; |
240 |
-+ } |
241 |
-+ |
242 |
- if (!receive_filter(s, buf, size)) |
243 |
- return size; |
244 |
- |
245 |
|
246 |
diff --git a/app-emulation/xen-tools/files/xen-4-CVE-XSA-86.patch b/app-emulation/xen-tools/files/xen-4-CVE-XSA-86.patch |
247 |
deleted file mode 100644 |
248 |
index ee56b9b..0000000 |
249 |
--- a/app-emulation/xen-tools/files/xen-4-CVE-XSA-86.patch |
250 |
+++ /dev/null |
251 |
@@ -1,171 +0,0 @@ |
252 |
-From: Xen.org security team <security () xen org> |
253 |
-Date: Thu, 06 Feb 2014 12:39:17 +0000 |
254 |
- |
255 |
-From b4c452646efd37b4cd0996256dd0ab7bf6ccb7f6 Mon Sep 17 00:00:00 2001 |
256 |
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= |
257 |
- <marmarek@××××××××××××××××××.com> |
258 |
-Date: Mon, 20 Jan 2014 15:51:56 +0000 |
259 |
-Subject: [PATCH] libvchan: Fix handling of invalid ring buffer indices |
260 |
-MIME-Version: 1.0 |
261 |
-Content-Type: text/plain; charset=UTF-8 |
262 |
-Content-Transfer-Encoding: 8bit |
263 |
- |
264 |
-The remote (hostile) process can set ring buffer indices to any value |
265 |
-at any time. If that happens, it is possible to get "buffer space" |
266 |
-(either for writing data, or ready for reading) negative or greater |
267 |
-than buffer size. This will end up with buffer overflow in the second |
268 |
-memcpy inside of do_send/do_recv. |
269 |
- |
270 |
-Fix this by introducing new available bytes accessor functions |
271 |
-raw_get_data_ready and raw_get_buffer_space which are robust against |
272 |
-mad ring states, and only return sanitised values. |
273 |
- |
274 |
-Proof sketch of correctness: |
275 |
- |
276 |
-Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes |
277 |
-functions, and in do_send and do_recv. |
278 |
- |
279 |
-The raw available bytes functions do unsigned arithmetic on the |
280 |
-returned values. If the result is "negative" or too big it will be |
281 |
->ring_size (since we used unsigned arithmetic). Otherwise the result |
282 |
-is a positive in-range value representing a reasonable ring state, in |
283 |
-which case we can safely convert it to int (as the rest of the code |
284 |
-expects). |
285 |
- |
286 |
-do_send and do_recv immediately mask the ring index value with the |
287 |
-ring size. The result is always going to be plausible. If the ring |
288 |
-state has become mad, the worst case is that our behaviour is |
289 |
-inconsistent with the peer's ring pointer. I.e. we read or write to |
290 |
-arguably-incorrect parts of the ring - but always parts of the ring. |
291 |
-And of course if a peer misoperates the ring they can achieve this |
292 |
-effect anyway. |
293 |
- |
294 |
-So the security problem is fixed. |
295 |
- |
296 |
-This is XSA-86. |
297 |
- |
298 |
-(The patch is essentially Ian Jackson's work, although parts of the |
299 |
-commit message are by Marek.) |
300 |
- |
301 |
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@××××××××××××××××××.com> |
302 |
-Signed-off-by: Ian Jackson <ian.jackson@×××××××××.com> |
303 |
-Cc: Marek Marczykowski-Górecki <marmarek@××××××××××××××××××.com> |
304 |
-Cc: Joanna Rutkowska <joanna@××××××××××××××××××.com> |
305 |
---- |
306 |
- tools/libvchan/io.c | 47 +++++++++++++++++++++++++++++++++++++++++------ |
307 |
- 1 file changed, 41 insertions(+), 6 deletions(-) |
308 |
- |
309 |
-diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c |
310 |
-index 2383364..804c63c 100644 |
311 |
---- a/tools/libvchan/io.c |
312 |
-+++ b/tools/libvchan/io.c |
313 |
-@@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) |
314 |
- return 0; |
315 |
- } |
316 |
- |
317 |
-+/* |
318 |
-+ * Get the amount of buffer space available, and do nothing about |
319 |
-+ * notifications. |
320 |
-+ */ |
321 |
-+static inline int raw_get_data_ready(struct libxenvchan *ctrl) |
322 |
-+{ |
323 |
-+ uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); |
324 |
-+ if (ready >= rd_ring_size(ctrl)) |
325 |
-+ /* We have no way to return errors. Locking up the ring is |
326 |
-+ * better than the alternatives. */ |
327 |
-+ return 0; |
328 |
-+ return ready; |
329 |
-+} |
330 |
-+ |
331 |
- /** |
332 |
- * Get the amount of buffer space available and enable notifications if needed. |
333 |
- */ |
334 |
- static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) |
335 |
- { |
336 |
-- int ready = rd_prod(ctrl) - rd_cons(ctrl); |
337 |
-+ int ready = raw_get_data_ready(ctrl); |
338 |
- if (ready >= request) |
339 |
- return ready; |
340 |
- /* We plan to consume all data; please tell us if you send more */ |
341 |
-@@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) |
342 |
- * will not get notified even though the actual amount of data ready is |
343 |
- * above request. Reread rd_prod to cover this case. |
344 |
- */ |
345 |
-- return rd_prod(ctrl) - rd_cons(ctrl); |
346 |
-+ return raw_get_data_ready(ctrl); |
347 |
- } |
348 |
- |
349 |
- int libxenvchan_data_ready(struct libxenvchan *ctrl) |
350 |
-@@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) |
351 |
- * when it changes |
352 |
- */ |
353 |
- request_notify(ctrl, VCHAN_NOTIFY_WRITE); |
354 |
-- return rd_prod(ctrl) - rd_cons(ctrl); |
355 |
-+ return raw_get_data_ready(ctrl); |
356 |
-+} |
357 |
-+ |
358 |
-+/** |
359 |
-+ * Get the amount of buffer space available, and do nothing |
360 |
-+ * about notifications |
361 |
-+ */ |
362 |
-+static inline int raw_get_buffer_space(struct libxenvchan *ctrl) |
363 |
-+{ |
364 |
-+ uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); |
365 |
-+ if (ready > wr_ring_size(ctrl)) |
366 |
-+ /* We have no way to return errors. Locking up the ring is |
367 |
-+ * better than the alternatives. */ |
368 |
-+ return 0; |
369 |
-+ return ready; |
370 |
- } |
371 |
- |
372 |
- /** |
373 |
-@@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) |
374 |
- */ |
375 |
- static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request) |
376 |
- { |
377 |
-- int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); |
378 |
-+ int ready = raw_get_buffer_space(ctrl); |
379 |
- if (ready >= request) |
380 |
- return ready; |
381 |
- /* We plan to fill the buffer; please tell us when you've read it */ |
382 |
-@@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request |
383 |
- * will not get notified even though the actual amount of buffer space |
384 |
- * is above request. Reread wr_cons to cover this case. |
385 |
- */ |
386 |
-- return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); |
387 |
-+ return raw_get_buffer_space(ctrl); |
388 |
- } |
389 |
- |
390 |
- int libxenvchan_buffer_space(struct libxenvchan *ctrl) |
391 |
-@@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl) |
392 |
- * when it changes |
393 |
- */ |
394 |
- request_notify(ctrl, VCHAN_NOTIFY_READ); |
395 |
-- return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); |
396 |
-+ return raw_get_buffer_space(ctrl); |
397 |
- } |
398 |
- |
399 |
- int libxenvchan_wait(struct libxenvchan *ctrl) |
400 |
-@@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl) |
401 |
- |
402 |
- /** |
403 |
- * returns -1 on error, or size on success |
404 |
-+ * |
405 |
-+ * caller must have checked that enough space is available |
406 |
- */ |
407 |
- static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) |
408 |
- { |
409 |
-@@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size) |
410 |
- } |
411 |
- } |
412 |
- |
413 |
-+/** |
414 |
-+ * returns -1 on error, or size on success |
415 |
-+ * |
416 |
-+ * caller must have checked that enough data is available |
417 |
-+ */ |
418 |
- static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) |
419 |
- { |
420 |
- int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1); |
421 |
--- |
422 |
-1.7.10.4 |
423 |
|
424 |
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 |
425 |
deleted file mode 100644 |
426 |
index 95a1ce6..0000000 |
427 |
--- a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch |
428 |
+++ /dev/null |
429 |
@@ -1,28 +0,0 @@ |
430 |
-diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile |
431 |
---- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800 |
432 |
-+++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800 |
433 |
-@@ -28,13 +28,6 @@ |
434 |
- $(MAKE) -C $D/src bin/$(*F).rom |
435 |
- |
436 |
- $T: |
437 |
-- if ! wget -O _$T $(IPXE_TARBALL_URL); then \ |
438 |
-- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ |
439 |
-- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ |
440 |
-- $(IPXE_GIT_TAG) | gzip >../_$T); \ |
441 |
-- rm -rf $D.git; \ |
442 |
-- fi |
443 |
-- mv _$T $T |
444 |
- |
445 |
- $D/src/arch/i386/Makefile: $T Config |
446 |
- rm -rf $D |
447 |
-diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile |
448 |
---- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800 |
449 |
-+++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800 |
450 |
-@@ -18,7 +18,6 @@ |
451 |
- cp ovmf-makefile ovmf/Makefile; |
452 |
- |
453 |
- seabios-dir: |
454 |
-- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir |
455 |
- cp seabios-config seabios-dir/.config; |
456 |
- |
457 |
- .PHONY: all |
458 |
|
459 |
diff --git a/app-emulation/xen-tools/files/xen-4.3-anti-download.patch b/app-emulation/xen-tools/files/xen-4.3-anti-download.patch |
460 |
deleted file mode 100644 |
461 |
index 04a87bb..0000000 |
462 |
--- a/app-emulation/xen-tools/files/xen-4.3-anti-download.patch |
463 |
+++ /dev/null |
464 |
@@ -1,28 +0,0 @@ |
465 |
-diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile |
466 |
---- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800 |
467 |
-+++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800 |
468 |
-@@ -28,13 +28,6 @@ |
469 |
- $(MAKE) -C $D/src bin/$(*F).rom |
470 |
- |
471 |
- $T: |
472 |
-- if ! $(FETCHER) _$T $(IPXE_TARBALL_URL); then \ |
473 |
-- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ |
474 |
-- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ |
475 |
-- $(IPXE_GIT_TAG) | gzip >../_$T); \ |
476 |
-- rm -rf $D.git; \ |
477 |
-- fi |
478 |
-- mv _$T $T |
479 |
- |
480 |
- $D/src/arch/i386/Makefile: $T Config |
481 |
- rm -rf $D |
482 |
-diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile |
483 |
---- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800 |
484 |
-+++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800 |
485 |
-@@ -18,7 +18,6 @@ |
486 |
- cp ovmf-makefile ovmf/Makefile; |
487 |
- |
488 |
- seabios-dir: |
489 |
-- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir |
490 |
- cp seabios-config seabios-dir/.config; |
491 |
- |
492 |
- .PHONY: all |
493 |
|
494 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4-CVE-2014-1950-XSA-88.patch b/app-emulation/xen-tools/files/xen-tools-4-CVE-2014-1950-XSA-88.patch |
495 |
deleted file mode 100644 |
496 |
index a9fc806..0000000 |
497 |
--- a/app-emulation/xen-tools/files/xen-tools-4-CVE-2014-1950-XSA-88.patch |
498 |
+++ /dev/null |
499 |
@@ -1,27 +0,0 @@ |
500 |
-From: Andrew Cooper <andrew.cooper3@××××××.com> |
501 |
-Date: Wed, 22 Jan 2014 17:47:21 +0000 |
502 |
-Subject: libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() |
503 |
- |
504 |
-Avoid freeing info then returning it to the caller. |
505 |
- |
506 |
-This is XSA-88. |
507 |
- |
508 |
-Coverity-ID: 1056192 |
509 |
-Signed-off-by: Andrew Cooper <andrew.cooper3@××××××.com> |
510 |
-Reviewed-by: Jan Beulich <jbeulich@××××.com> |
511 |
---- |
512 |
- tools/libxc/xc_cpupool.c | 1 + |
513 |
- 1 file changed, 1 insertion(+) |
514 |
- |
515 |
-diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c |
516 |
-index c8c2a33..6393cfb 100644 |
517 |
---- a/tools/libxc/xc_cpupool.c |
518 |
-+++ b/tools/libxc/xc_cpupool.c |
519 |
-@@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, |
520 |
- info->cpumap = xc_cpumap_alloc(xch); |
521 |
- if (!info->cpumap) { |
522 |
- free(info); |
523 |
-+ info = NULL; |
524 |
- goto out; |
525 |
- } |
526 |
- info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; |
527 |
|
528 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch b/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch |
529 |
new file mode 100644 |
530 |
index 0000000..9304768 |
531 |
--- /dev/null |
532 |
+++ b/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch |
533 |
@@ -0,0 +1,26 @@ |
534 |
+diff --git a/tools/qemu-xen/po/Makefile b/tools/qemu-xen/po/Makefile |
535 |
+index 705166e..2e7cdcb 100644 |
536 |
+--- a/tools/qemu-xen/po/Makefile |
537 |
++++ b/tools/qemu-xen/po/Makefile |
538 |
+@@ -30,7 +30,7 @@ install: $(OBJS) |
539 |
+ for obj in $(OBJS); do \ |
540 |
+ base=`basename $$obj .mo`; \ |
541 |
+ $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \ |
542 |
+- $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \ |
543 |
++ $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/xenqemu.mo; \ |
544 |
+ done |
545 |
+ |
546 |
+ %.mo: %.po |
547 |
+diff --git a/tools/qemu-xen/ui/gtk.c b/tools/qemu-xen/ui/gtk.c |
548 |
+index c38146f..d3c331b 100644 |
549 |
+--- a/tools/qemu-xen/ui/gtk.c |
550 |
++++ b/tools/qemu-xen/ui/gtk.c |
551 |
+@@ -31,7 +31,7 @@ |
552 |
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
553 |
+ */ |
554 |
+ |
555 |
+-#define GETTEXT_PACKAGE "qemu" |
556 |
++#define GETTEXT_PACKAGE "xenqemu" |
557 |
+ #define LOCALEDIR "po" |
558 |
+ |
559 |
+ #include "qemu-common.h" |
560 |
|
561 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch b/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch |
562 |
new file mode 100644 |
563 |
index 0000000..0e1d67a |
564 |
--- /dev/null |
565 |
+++ b/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch |
566 |
@@ -0,0 +1,13 @@ |
567 |
+--- xen-4.2.4.org/tools/hotplug/Linux/Makefile 2014-05-22 05:39:57.090009337 +0000 |
568 |
++++ xen-4.2.4/tools/hotplug/Linux/Makefile 2014-05-22 05:41:03.816009464 +0000 |
569 |
+@@ -31,8 +31,8 @@ |
570 |
+ XEN_HOTPLUG_SCRIPTS = xen-backend.agent |
571 |
+ |
572 |
+ UDEVVER = 0 |
573 |
+-ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1) |
574 |
+-UDEVVER = $(shell /sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' ) |
575 |
++ifeq ($(shell [ -x $(shell which udevadm) ] && echo 1),1) |
576 |
++UDEVVER = $(shell $(shell which udevadm) info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' ) |
577 |
+ endif |
578 |
+ ifeq ($(shell [ -x /usr/bin/udevinfo ] && echo 1),1) |
579 |
+ UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' ) |
580 |
|
581 |
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml |
582 |
index bd4d8c1..2ee3ebb 100644 |
583 |
--- a/app-emulation/xen-tools/metadata.xml |
584 |
+++ b/app-emulation/xen-tools/metadata.xml |
585 |
@@ -9,6 +9,7 @@ |
586 |
<flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag> |
587 |
<flag name='pygrub'>Install the pygrub boot loader</flag> |
588 |
<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag> |
589 |
+ <flag name='system-qemu'>Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag> |
590 |
<flag name='xend'>Enable support the xend and xm to manage xen</flag> |
591 |
<flag name='ocaml'>Enable support for the ocaml language</flag> |
592 |
<flag name='pam'>Enable pam support</flag> |
593 |
|
594 |
diff --git a/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r2.ebuild |
595 |
similarity index 99% |
596 |
rename from app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild |
597 |
rename to app-emulation/xen-tools/xen-tools-4.2.4-r2.ebuild |
598 |
index 9853f44..7b10d5f 100644 |
599 |
--- a/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild |
600 |
+++ b/app-emulation/xen-tools/xen-tools-4.2.4-r2.ebuild |
601 |
@@ -1,6 +1,6 @@ |
602 |
# Copyright 1999-2014 Gentoo Foundation |
603 |
# Distributed under the terms of the GNU General Public License v2 |
604 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild,v 1.6 2014/03/01 23:06:15 mgorny Exp $ |
605 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r2.ebuild,v 1.3 2014/05/17 13:34:06 ago Exp $ |
606 |
|
607 |
EAPI=5 |
608 |
|
609 |
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then |
610 |
live_eclass="mercurial" |
611 |
else |
612 |
KEYWORDS="amd64 x86" |
613 |
- UPSTREAM_VER=0 |
614 |
+ UPSTREAM_VER=1 |
615 |
GENTOO_VER= |
616 |
|
617 |
[[ -n ${UPSTREAM_VER} ]] && \ |
618 |
|
619 |
diff --git a/app-emulation/xen-tools/xen-tools-4.2.4-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild |
620 |
similarity index 98% |
621 |
rename from app-emulation/xen-tools/xen-tools-4.2.4-r1.ebuild |
622 |
rename to app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild |
623 |
index 90a44ae..c2e587a 100644 |
624 |
--- a/app-emulation/xen-tools/xen-tools-4.2.4-r1.ebuild |
625 |
+++ b/app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild |
626 |
@@ -1,6 +1,6 @@ |
627 |
# Copyright 1999-2014 Gentoo Foundation |
628 |
# Distributed under the terms of the GNU General Public License v2 |
629 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $ |
630 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild,v 1.1 2014/05/22 06:14:50 dlan Exp $ |
631 |
|
632 |
EAPI=5 |
633 |
|
634 |
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then |
635 |
live_eclass="mercurial" |
636 |
else |
637 |
KEYWORDS="~amd64 ~x86" |
638 |
- UPSTREAM_VER=0 |
639 |
+ UPSTREAM_VER=1 |
640 |
GENTOO_VER= |
641 |
|
642 |
[[ -n ${UPSTREAM_VER} ]] && \ |
643 |
@@ -226,6 +226,9 @@ src_prepare() { |
644 |
# Bug 379537 |
645 |
epatch "${FILESDIR}"/fix-gold-ld.patch |
646 |
|
647 |
+ # Bug 510976 |
648 |
+ epatch "${FILESDIR}"/${P}-udev-rules.patch |
649 |
+ |
650 |
# Bug 472438 |
651 |
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
652 |
-i Config.mk || die |
653 |
|
654 |
diff --git a/app-emulation/xen-tools/xen-tools-4.2.4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4.ebuild |
655 |
deleted file mode 100644 |
656 |
index b1715eb..0000000 |
657 |
--- a/app-emulation/xen-tools/xen-tools-4.2.4.ebuild |
658 |
+++ /dev/null |
659 |
@@ -1,399 +0,0 @@ |
660 |
-# Copyright 1999-2014 Gentoo Foundation |
661 |
-# Distributed under the terms of the GNU General Public License v2 |
662 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $ |
663 |
- |
664 |
-EAPI=5 |
665 |
- |
666 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
667 |
-PYTHON_REQ_USE='xml,threads' |
668 |
- |
669 |
-if [[ $PV == *9999 ]]; then |
670 |
- KEYWORDS="" |
671 |
- REPO="xen-unstable.hg" |
672 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
673 |
- S="${WORKDIR}/${REPO}" |
674 |
- live_eclass="mercurial" |
675 |
-else |
676 |
- KEYWORDS="~amd64 ~x86" |
677 |
- UPSTREAM_VER= |
678 |
- GENTOO_VER= |
679 |
- |
680 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
681 |
- UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
682 |
- [[ -n ${GENTOO_VER} ]] && \ |
683 |
- GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" |
684 |
- |
685 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
686 |
- ${UPSTREAM_PATCHSET_URI} |
687 |
- ${GENTOO_PATCHSET_URI}" |
688 |
- S="${WORKDIR}/xen-${PV}" |
689 |
-fi |
690 |
- |
691 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
692 |
- |
693 |
-DESCRIPTION="Xend daemon and tools" |
694 |
-HOMEPAGE="http://xen.org/" |
695 |
-DOCS=( README docs/README.xen-bugtool ) |
696 |
- |
697 |
-LICENSE="GPL-2" |
698 |
-SLOT="0" |
699 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend" |
700 |
- |
701 |
-REQUIRED_USE="hvm? ( qemu ) |
702 |
- ${PYTHON_REQUIRED_USE}" |
703 |
- |
704 |
-DEPEND="dev-libs/lzo:2 |
705 |
- dev-libs/glib:2 |
706 |
- dev-libs/yajl |
707 |
- dev-libs/libgcrypt:0 |
708 |
- dev-python/lxml[${PYTHON_USEDEP}] |
709 |
- dev-python/pypam[${PYTHON_USEDEP}] |
710 |
- sys-libs/zlib |
711 |
- sys-power/iasl |
712 |
- sys-firmware/seabios |
713 |
- sys-firmware/ipxe |
714 |
- dev-ml/findlib |
715 |
- hvm? ( media-libs/libsdl ) |
716 |
- ${PYTHON_DEPS} |
717 |
- api? ( dev-libs/libxml2 |
718 |
- net-misc/curl ) |
719 |
- ${PYTHON_DEPS} |
720 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
721 |
- sys-devel/bin86 |
722 |
- sys-devel/dev86 |
723 |
- dev-lang/perl |
724 |
- app-misc/pax-utils |
725 |
- doc? ( |
726 |
- app-doc/doxygen |
727 |
- dev-tex/latex2html[png,gif] |
728 |
- media-gfx/transfig |
729 |
- media-gfx/graphviz |
730 |
- dev-tex/xcolor |
731 |
- dev-texlive/texlive-latexextra |
732 |
- virtual/latex-base |
733 |
- dev-tex/latexmk |
734 |
- dev-texlive/texlive-latex |
735 |
- dev-texlive/texlive-pictures |
736 |
- dev-texlive/texlive-latexrecommended |
737 |
- ) |
738 |
- hvm? ( x11-proto/xproto |
739 |
- !net-libs/libiscsi )" |
740 |
-RDEPEND="sys-apps/iproute2 |
741 |
- net-misc/bridge-utils |
742 |
- ocaml? ( >=dev-lang/ocaml-4 ) |
743 |
- screen? ( |
744 |
- app-misc/screen |
745 |
- app-admin/logrotate |
746 |
- ) |
747 |
- virtual/udev" |
748 |
- |
749 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
750 |
-# Approved by QA team in bug #144032 |
751 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
752 |
- |
753 |
-RESTRICT="test" |
754 |
- |
755 |
-pkg_setup() { |
756 |
- python-single-r1_pkg_setup |
757 |
- export "CONFIG_LOMOUNT=y" |
758 |
- |
759 |
- if has_version dev-libs/libgcrypt:0; then |
760 |
- export "CONFIG_GCRYPT=y" |
761 |
- fi |
762 |
- |
763 |
- if use qemu; then |
764 |
- export "CONFIG_IOEMU=y" |
765 |
- else |
766 |
- export "CONFIG_IOEMU=n" |
767 |
- fi |
768 |
- |
769 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
770 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
771 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
772 |
- eerror "to build xen-tools on your current profile." |
773 |
- die "USE=hvm is unsupported on this system." |
774 |
- fi |
775 |
- |
776 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
777 |
- if use x86 && use amd64; then |
778 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
779 |
- elif use x86; then |
780 |
- export XEN_TARGET_ARCH="x86_32" |
781 |
- elif use amd64 ; then |
782 |
- export XEN_TARGET_ARCH="x86_64" |
783 |
- else |
784 |
- die "Unsupported architecture!" |
785 |
- fi |
786 |
- fi |
787 |
- |
788 |
- use api && export "LIBXENAPI_BINDINGS=y" |
789 |
- use flask && export "FLASK_ENABLE=y" |
790 |
-} |
791 |
- |
792 |
-src_prepare() { |
793 |
- # Upstream's patchset |
794 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
795 |
- EPATCH_SUFFIX="patch" \ |
796 |
- EPATCH_FORCE="yes" \ |
797 |
- epatch "${WORKDIR}"/patches-upstream |
798 |
- fi |
799 |
- |
800 |
- # Gentoo's patchset |
801 |
- if [[ -n ${GENTOO_VER} ]]; then |
802 |
- EPATCH_SUFFIX="patch" \ |
803 |
- EPATCH_FORCE="yes" \ |
804 |
- epatch "${WORKDIR}"/patches-gentoo |
805 |
- fi |
806 |
- |
807 |
- # Drop .config, fixes to gcc-4.6 |
808 |
- epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch |
809 |
- |
810 |
- # Xend |
811 |
- if ! use xend; then |
812 |
- sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ |
813 |
- -i tools/misc/Makefile || die "Disabling xend failed" |
814 |
- sed -e 's:^XEND_INITD:#XEND_INITD:' \ |
815 |
- -i tools/examples/Makefile || die "Disabling xend failed" |
816 |
- fi |
817 |
- |
818 |
- # if the user *really* wants to use their own custom-cflags, let them |
819 |
- if use custom-cflags; then |
820 |
- einfo "User wants their own CFLAGS - removing defaults" |
821 |
- |
822 |
- # try and remove all the default cflags |
823 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
824 |
- -exec sed \ |
825 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
826 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
827 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
828 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
829 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
830 |
- -i {} + || die "failed to re-set custom-cflags" |
831 |
- fi |
832 |
- |
833 |
- if ! use pygrub; then |
834 |
- sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die |
835 |
- fi |
836 |
- |
837 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
838 |
- if ! use hvm; then |
839 |
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die |
840 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
841 |
- fi |
842 |
- |
843 |
- # Don't bother with qemu, only needed for fully virtualised guests |
844 |
- if ! use qemu; then |
845 |
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die |
846 |
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die |
847 |
- fi |
848 |
- |
849 |
- # Fix texi2html build error with new texi2html, qemu.doc.html |
850 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch \ |
851 |
- "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch |
852 |
- |
853 |
- # Fix network broadcast on bridged networks |
854 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
855 |
- |
856 |
- # Bug 496708 |
857 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch |
858 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch |
859 |
- |
860 |
- # Fix bridge by idella4, bug #362575 |
861 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
862 |
- |
863 |
- # Don't build ipxe with pie on hardened, Bug #360805 |
864 |
- if gcc-specs-pie; then |
865 |
- epatch "${FILESDIR}"/ipxe-nopie.patch |
866 |
- fi |
867 |
- |
868 |
- # Prevent double stripping of files at install |
869 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch |
870 |
- |
871 |
- # fix jobserver in Makefile |
872 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch |
873 |
- |
874 |
- # add missing header, Bug #467200 |
875 |
- epatch "${FILESDIR}"/xen-4-ulong.patch \ |
876 |
- "${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch |
877 |
- |
878 |
- # Set dom0-min-mem to kb; Bug #472982 |
879 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch |
880 |
- |
881 |
- # Bug 463840 |
882 |
- epatch "${FILESDIR}"/${PN}-4.2.2-install.patch |
883 |
- epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch |
884 |
- |
885 |
- # Bug 379537 |
886 |
- epatch "${FILESDIR}"/fix-gold-ld.patch |
887 |
- |
888 |
- # Bug 472438 |
889 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
890 |
- -i Config.mk || die |
891 |
- |
892 |
- # Bug 445986 |
893 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die |
894 |
- |
895 |
- # fix QA warning, create /var/run/, /var/lock dynamically |
896 |
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ |
897 |
- tools/libxl/Makefile || die |
898 |
- |
899 |
- sed -i -e "/\/var\/run\//d" \ |
900 |
- tools/xenstore/Makefile \ |
901 |
- tools/pygrub/Makefile || die |
902 |
- |
903 |
- sed -i -e "/\/var\/lock\/subsys/d" \ |
904 |
- tools/Makefile || die |
905 |
- |
906 |
- # xencommons, Bug #492332, sed lighter weight than patching |
907 |
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ |
908 |
- -i tools/hotplug/Linux/init.d/xencommons || die |
909 |
- |
910 |
- epatch_user |
911 |
-} |
912 |
- |
913 |
-src_compile() { |
914 |
- export VARTEXFONTS="${T}/fonts" |
915 |
- local myopt |
916 |
- use debug && myopt="${myopt} debug=y" |
917 |
- |
918 |
- use custom-cflags || unset CFLAGS |
919 |
- if test-flag-CC -fno-strict-overflow; then |
920 |
- append-flags -fno-strict-overflow |
921 |
- fi |
922 |
- |
923 |
- unset LDFLAGS |
924 |
- unset CFLAGS |
925 |
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
926 |
- |
927 |
- use doc && emake -C docs txt html |
928 |
- emake -C docs man-pages |
929 |
-} |
930 |
- |
931 |
-src_install() { |
932 |
- # Override auto-detection in the build system, bug #382573 |
933 |
- export INITD_DIR=/tmp/init.d |
934 |
- export CONFIG_LEAF_DIR=../tmp/default |
935 |
- |
936 |
- # Let the build system compile installed Python modules. |
937 |
- local PYTHONDONTWRITEBYTECODE |
938 |
- export PYTHONDONTWRITEBYTECODE |
939 |
- |
940 |
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ |
941 |
- XEN_PYTHON_NATIVE_INSTALL=y install-tools |
942 |
- # Fix the remaining Python shebangs. |
943 |
- python_fix_shebang "${ED}" |
944 |
- |
945 |
- # Remove RedHat-specific stuff |
946 |
- rm -rf "${D}"tmp || die |
947 |
- |
948 |
- # uncomment lines in xl.conf |
949 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
950 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
951 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
952 |
- -i tools/examples/xl.conf || die |
953 |
- |
954 |
- # Reset bash completion dir; Bug 472438 |
955 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
956 |
- |
957 |
- if use doc; then |
958 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
959 |
- |
960 |
- dohtml -r docs/ |
961 |
- docinto pdf |
962 |
- dodoc ${DOCS[@]} |
963 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
964 |
- fi |
965 |
- |
966 |
- rm -rf "${D}"/usr/share/doc/xen/ |
967 |
- doman docs/man?/* |
968 |
- |
969 |
- if use xend; then |
970 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" |
971 |
- fi |
972 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
973 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
974 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
975 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
976 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
977 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
978 |
- newinitd "${FILESDIR}"/xencommons.initd xencommons |
979 |
- newconfd "${FILESDIR}"/xencommons.confd xencommons |
980 |
- |
981 |
- if use screen; then |
982 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die |
983 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die |
984 |
- keepdir /var/log/xen-consoles |
985 |
- fi |
986 |
- |
987 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
988 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
989 |
- mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die |
990 |
- fi |
991 |
- |
992 |
- # For -static-libs wrt Bug 384355 |
993 |
- if ! use static-libs; then |
994 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
995 |
- fi |
996 |
- |
997 |
- # xend expects these to exist |
998 |
- keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
999 |
- |
1000 |
- # for xendomains |
1001 |
- keepdir /etc/xen/auto |
1002 |
- |
1003 |
- # Temp QA workaround |
1004 |
- dodir "$(udev_get_udevdir)" |
1005 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
1006 |
- rm -rf "${D}"/etc/udev |
1007 |
- |
1008 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
1009 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
1010 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
1011 |
-} |
1012 |
- |
1013 |
-pkg_postinst() { |
1014 |
- elog "Official Xen Guide and the offical wiki page:" |
1015 |
- elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" |
1016 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
1017 |
- elog "" |
1018 |
- elog "Recommended to utilise the xencommons script to config sytem at boot." |
1019 |
- elog "Add by use of rc-update on completion of the install" |
1020 |
- |
1021 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
1022 |
- echo |
1023 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
1024 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
1025 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
1026 |
- fi |
1027 |
- |
1028 |
- # TODO: we need to have the current Python slot here. |
1029 |
- if ! has_version "dev-lang/python[ncurses]"; then |
1030 |
- echo |
1031 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
1032 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
1033 |
- fi |
1034 |
- |
1035 |
- if has_version "sys-apps/iproute2[minimal]"; then |
1036 |
- echo |
1037 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
1038 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
1039 |
- fi |
1040 |
- |
1041 |
- if ! use hvm; then |
1042 |
- echo |
1043 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
1044 |
- elog "support enable the hvm use flag." |
1045 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
1046 |
- fi |
1047 |
- |
1048 |
- if use xend; then |
1049 |
- echo |
1050 |
- elog "xend capability has been enabled and installed" |
1051 |
- fi |
1052 |
- |
1053 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
1054 |
- echo |
1055 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
1056 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
1057 |
- fi |
1058 |
-} |
1059 |
|
1060 |
diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild |
1061 |
deleted file mode 100644 |
1062 |
index 3641d09..0000000 |
1063 |
--- a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild |
1064 |
+++ /dev/null |
1065 |
@@ -1,435 +0,0 @@ |
1066 |
-# Copyright 1999-2014 Gentoo Foundation |
1067 |
-# Distributed under the terms of the GNU General Public License v2 |
1068 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.5 2014/03/01 23:06:15 mgorny Exp $ |
1069 |
- |
1070 |
-EAPI=5 |
1071 |
- |
1072 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
1073 |
-PYTHON_REQ_USE='xml,threads' |
1074 |
- |
1075 |
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" |
1076 |
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz" |
1077 |
- |
1078 |
-if [[ $PV == *9999 ]]; then |
1079 |
- KEYWORDS="" |
1080 |
- REPO="xen-unstable.hg" |
1081 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
1082 |
- S="${WORKDIR}/${REPO}" |
1083 |
- live_eclass="mercurial" |
1084 |
-else |
1085 |
- KEYWORDS="amd64 -x86" |
1086 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
1087 |
- $IPXE_TARBALL_URL |
1088 |
- $XEN_SEABIOS_URL" |
1089 |
- S="${WORKDIR}/xen-${PV}" |
1090 |
-fi |
1091 |
- |
1092 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
1093 |
- |
1094 |
-DESCRIPTION="Xend daemon and tools" |
1095 |
-HOMEPAGE="http://xen.org/" |
1096 |
-DOCS=( README docs/README.xen-bugtool ) |
1097 |
- |
1098 |
-LICENSE="GPL-2" |
1099 |
-SLOT="0" |
1100 |
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
1101 |
-# >=dev-lang/ocaml-4 stable |
1102 |
-# Masked in profiles/eapi-5-files instead |
1103 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend" |
1104 |
- |
1105 |
-REQUIRED_USE="hvm? ( qemu ) |
1106 |
- ${PYTHON_REQUIRED_USE} |
1107 |
- pygrub? ( python )" |
1108 |
- |
1109 |
-DEPEND="dev-libs/lzo:2 |
1110 |
- dev-libs/glib:2 |
1111 |
- dev-libs/yajl |
1112 |
- dev-libs/libgcrypt:0 |
1113 |
- dev-python/lxml[${PYTHON_USEDEP}] |
1114 |
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
1115 |
- sys-libs/zlib |
1116 |
- sys-power/iasl |
1117 |
- hvm? ( media-libs/libsdl ) |
1118 |
- ${PYTHON_DEPS} |
1119 |
- api? ( dev-libs/libxml2 |
1120 |
- net-misc/curl ) |
1121 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
1122 |
- sys-devel/bin86 |
1123 |
- sys-devel/dev86 |
1124 |
- dev-lang/perl |
1125 |
- app-misc/pax-utils |
1126 |
- dev-python/markdown |
1127 |
- doc? ( |
1128 |
- app-doc/doxygen |
1129 |
- dev-tex/latex2html[png,gif] |
1130 |
- media-gfx/graphviz |
1131 |
- dev-tex/xcolor |
1132 |
- media-gfx/transfig |
1133 |
- dev-texlive/texlive-latexextra |
1134 |
- virtual/latex-base |
1135 |
- dev-tex/latexmk |
1136 |
- dev-texlive/texlive-latex |
1137 |
- dev-texlive/texlive-pictures |
1138 |
- dev-texlive/texlive-latexrecommended |
1139 |
- ) |
1140 |
- hvm? ( x11-proto/xproto |
1141 |
- !net-libs/libiscsi ) |
1142 |
- qemu? ( x11-libs/pixman ) |
1143 |
- ocaml? ( dev-ml/findlib |
1144 |
- >=dev-lang/ocaml-4 )" |
1145 |
-RDEPEND="sys-apps/iproute2 |
1146 |
- net-misc/bridge-utils |
1147 |
- screen? ( |
1148 |
- app-misc/screen |
1149 |
- app-admin/logrotate |
1150 |
- ) |
1151 |
- virtual/udev" |
1152 |
- |
1153 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
1154 |
-# Approved by QA team in bug #144032 |
1155 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
1156 |
- |
1157 |
-RESTRICT="test" |
1158 |
- |
1159 |
-# Security patches |
1160 |
-XSA_PATCHES=( |
1161 |
- "${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch |
1162 |
- "${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch #bug #500530 |
1163 |
- "${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch #bug #501080 |
1164 |
-) |
1165 |
- |
1166 |
-pkg_setup() { |
1167 |
- python-single-r1_pkg_setup |
1168 |
- export "CONFIG_LOMOUNT=y" |
1169 |
- |
1170 |
- if has_version dev-libs/libgcrypt:0; then |
1171 |
- export "CONFIG_GCRYPT=y" |
1172 |
- fi |
1173 |
- |
1174 |
- if use qemu; then |
1175 |
- export "CONFIG_IOEMU=y" |
1176 |
- else |
1177 |
- export "CONFIG_IOEMU=n" |
1178 |
- fi |
1179 |
- |
1180 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
1181 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
1182 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
1183 |
- eerror "to build xen-tools on your current profile." |
1184 |
- die "USE=hvm is unsupported on this system." |
1185 |
- fi |
1186 |
- |
1187 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
1188 |
- if use x86 && use amd64; then |
1189 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
1190 |
- elif use x86; then |
1191 |
- export XEN_TARGET_ARCH="x86_32" |
1192 |
- elif use amd64 ; then |
1193 |
- export XEN_TARGET_ARCH="x86_64" |
1194 |
- else |
1195 |
- die "Unsupported architecture!" |
1196 |
- fi |
1197 |
- fi |
1198 |
-} |
1199 |
- |
1200 |
-src_prepare() { |
1201 |
- # Drop .config, fixes to gcc-4.6 |
1202 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch |
1203 |
- |
1204 |
- # Xend |
1205 |
- if ! use xend; then |
1206 |
- sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ |
1207 |
- -i tools/misc/Makefile || die "Disabling xend failed" |
1208 |
- sed -e 's:^XEND_INITD:#XEND_INITD:' \ |
1209 |
- -i tools/examples/Makefile || die "Disabling xend failed" |
1210 |
- fi |
1211 |
- |
1212 |
- # if the user *really* wants to use their own custom-cflags, let them |
1213 |
- if use custom-cflags; then |
1214 |
- einfo "User wants their own CFLAGS - removing defaults" |
1215 |
- |
1216 |
- # try and remove all the default cflags |
1217 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
1218 |
- -exec sed \ |
1219 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
1220 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
1221 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
1222 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
1223 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
1224 |
- -i {} + || die "failed to re-set custom-cflags" |
1225 |
- fi |
1226 |
- |
1227 |
- if ! use pygrub; then |
1228 |
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die |
1229 |
- fi |
1230 |
- |
1231 |
- if ! use python; then |
1232 |
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die |
1233 |
- fi |
1234 |
- |
1235 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
1236 |
- if ! use hvm; then |
1237 |
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die |
1238 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
1239 |
- fi |
1240 |
- |
1241 |
- # Don't bother with qemu, only needed for fully virtualised guests |
1242 |
- if ! use qemu; then |
1243 |
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die |
1244 |
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die |
1245 |
- fi |
1246 |
- |
1247 |
- # Fix texi2html build error with new texi2html, qemu.doc.html |
1248 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch \ |
1249 |
- "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch |
1250 |
- |
1251 |
- # Fix network broadcast on bridged networks |
1252 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
1253 |
- |
1254 |
- # Prevent the downloading of ipxe, seabios |
1255 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-anti-download.patch |
1256 |
- cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die |
1257 |
- mv ../seabios-dir-remote tools/firmware/ || die |
1258 |
- pushd tools/firmware/ > /dev/null |
1259 |
- ln -s seabios-dir-remote seabios-dir || die |
1260 |
- popd > /dev/null |
1261 |
- |
1262 |
- # Fix bridge by idella4, bug #362575 |
1263 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
1264 |
- |
1265 |
- # Don't build ipxe with pie on hardened, Bug #360805 |
1266 |
- if gcc-specs-pie; then |
1267 |
- epatch "${FILESDIR}"/ipxe-nopie.patch |
1268 |
- fi |
1269 |
- |
1270 |
- # Prevent double stripping of files at install |
1271 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch |
1272 |
- |
1273 |
- # fix jobserver in Makefile |
1274 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch |
1275 |
- |
1276 |
- # add missing header |
1277 |
- epatch "${FILESDIR}"/xen-4-ulong.patch |
1278 |
- |
1279 |
- # Set dom0-min-mem to kb; Bug #472982 |
1280 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch |
1281 |
- |
1282 |
- [[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}" |
1283 |
- |
1284 |
- # Bug 472438 |
1285 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
1286 |
- -i Config.mk || die |
1287 |
- |
1288 |
- # Bug 477676 |
1289 |
- epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch |
1290 |
- |
1291 |
- # Prevent file collision with qemu package Bug 478064 |
1292 |
- if use qemu; then |
1293 |
- epatch "${FILESDIR}"/qemu-bridge.patch |
1294 |
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
1295 |
- fi |
1296 |
- |
1297 |
- use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die |
1298 |
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
1299 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ |
1300 |
- -i tools/firmware/Makefile || die |
1301 |
- |
1302 |
- # Bug 379537 |
1303 |
- epatch "${FILESDIR}"/fix-gold-ld.patch |
1304 |
- |
1305 |
- # xencommons, Bug #492332, sed lighter weight than patching |
1306 |
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ |
1307 |
- -i tools/hotplug/Linux/init.d/xencommons || die |
1308 |
- |
1309 |
- # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844 |
1310 |
- sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \ |
1311 |
- -i tools/libxl/libxl_bootloader.c || die |
1312 |
- |
1313 |
- # fix QA warning, create /var/run/, /var/lock dynamically |
1314 |
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ |
1315 |
- tools/libxl/Makefile || die |
1316 |
- |
1317 |
- sed -i -e "/\/var\/run\//d" \ |
1318 |
- tools/xenstore/Makefile \ |
1319 |
- tools/pygrub/Makefile || die |
1320 |
- |
1321 |
- sed -i -e "/\/var\/lock\/subsys/d" \ |
1322 |
- tools/Makefile || die |
1323 |
- |
1324 |
- epatch_user |
1325 |
-} |
1326 |
- |
1327 |
-src_configure() { |
1328 |
- local myconf="--prefix=/usr --disable-werror" |
1329 |
- |
1330 |
- if use ocaml |
1331 |
- then |
1332 |
- myconf="${myconf} $(use_enable ocaml ocamltools)" |
1333 |
- else |
1334 |
- myconf="${myconf} --disable-ocamltools" |
1335 |
- fi |
1336 |
- |
1337 |
- if ! use pam |
1338 |
- then |
1339 |
- myconf="${myconf} --disable-pam" |
1340 |
- fi |
1341 |
- |
1342 |
- econf ${myconf} |
1343 |
-} |
1344 |
- |
1345 |
-src_compile() { |
1346 |
- export VARTEXFONTS="${T}/fonts" |
1347 |
- local myopt |
1348 |
- use debug && myopt="${myopt} debug=y" |
1349 |
- |
1350 |
- use custom-cflags || unset CFLAGS |
1351 |
- if test-flag-CC -fno-strict-overflow; then |
1352 |
- append-flags -fno-strict-overflow |
1353 |
- fi |
1354 |
- |
1355 |
- unset LDFLAGS |
1356 |
- unset CFLAGS |
1357 |
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
1358 |
- |
1359 |
- use doc && emake -C docs txt html |
1360 |
- emake -C docs man-pages |
1361 |
-} |
1362 |
- |
1363 |
-src_install() { |
1364 |
- # Override auto-detection in the build system, bug #382573 |
1365 |
- export INITD_DIR=/tmp/init.d |
1366 |
- export CONFIG_LEAF_DIR=../tmp/default |
1367 |
- |
1368 |
- # Let the build system compile installed Python modules. |
1369 |
- local PYTHONDONTWRITEBYTECODE |
1370 |
- export PYTHONDONTWRITEBYTECODE |
1371 |
- |
1372 |
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ |
1373 |
- XEN_PYTHON_NATIVE_INSTALL=y install-tools |
1374 |
- |
1375 |
- # Fix the remaining Python shebangs. |
1376 |
- python_fix_shebang "${D}" |
1377 |
- |
1378 |
- # Remove RedHat-specific stuff |
1379 |
- rm -rf "${D}"tmp || die |
1380 |
- |
1381 |
- # uncomment lines in xl.conf |
1382 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
1383 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
1384 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
1385 |
- -i tools/examples/xl.conf || die |
1386 |
- |
1387 |
- # Reset bash completion dir; Bug 472438 |
1388 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
1389 |
- |
1390 |
- if use doc; then |
1391 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
1392 |
- |
1393 |
- dohtml -r docs/ |
1394 |
- docinto pdf |
1395 |
- dodoc ${DOCS[@]} |
1396 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
1397 |
- fi |
1398 |
- |
1399 |
- rm -rf "${D}"/usr/share/doc/xen/ |
1400 |
- doman docs/man?/* |
1401 |
- |
1402 |
- if use xend; then |
1403 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" |
1404 |
- fi |
1405 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
1406 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
1407 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
1408 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
1409 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
1410 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
1411 |
- newinitd "${FILESDIR}"/xencommons.initd xencommons |
1412 |
- newconfd "${FILESDIR}"/xencommons.confd xencommons |
1413 |
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev |
1414 |
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev |
1415 |
- |
1416 |
- if use screen; then |
1417 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
1418 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die |
1419 |
- keepdir /var/log/xen-consoles |
1420 |
- fi |
1421 |
- |
1422 |
- # Move files built with use qemu, Bug #477884 |
1423 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
1424 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
1425 |
- mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die |
1426 |
- fi |
1427 |
- |
1428 |
- # For -static-libs wrt Bug 384355 |
1429 |
- if ! use static-libs; then |
1430 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
1431 |
- fi |
1432 |
- |
1433 |
- # xend expects these to exist |
1434 |
- keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
1435 |
- |
1436 |
- # for xendomains |
1437 |
- keepdir /etc/xen/auto |
1438 |
- |
1439 |
- # Temp QA workaround |
1440 |
- dodir "$(udev_get_udevdir)" |
1441 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
1442 |
- rm -rf "${D}"/etc/udev |
1443 |
- |
1444 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
1445 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
1446 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
1447 |
-} |
1448 |
- |
1449 |
-pkg_postinst() { |
1450 |
- elog "Official Xen Guide and the offical wiki page:" |
1451 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
1452 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
1453 |
- elog "" |
1454 |
- elog "Recommended to utilise the xencommons script to config sytem At boot" |
1455 |
- elog "Add by use of rc-update on completion of the install" |
1456 |
- |
1457 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
1458 |
- echo |
1459 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
1460 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
1461 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
1462 |
- fi |
1463 |
- |
1464 |
- # TODO: we need to have the current Python slot here. |
1465 |
- if ! has_version "dev-lang/python[ncurses]"; then |
1466 |
- echo |
1467 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
1468 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
1469 |
- fi |
1470 |
- |
1471 |
- if has_version "sys-apps/iproute2[minimal]"; then |
1472 |
- echo |
1473 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
1474 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
1475 |
- fi |
1476 |
- |
1477 |
- if ! use hvm; then |
1478 |
- echo |
1479 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
1480 |
- elog "support enable the hvm use flag." |
1481 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
1482 |
- fi |
1483 |
- |
1484 |
- if use xend; then |
1485 |
- elog"";elog "xend capability has been enabled and installed" |
1486 |
- fi |
1487 |
- |
1488 |
- if use qemu; then |
1489 |
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" |
1490 |
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" |
1491 |
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
1492 |
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
1493 |
- fi |
1494 |
- |
1495 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
1496 |
- echo |
1497 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
1498 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
1499 |
- fi |
1500 |
-} |
1501 |
|
1502 |
diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild |
1503 |
deleted file mode 100644 |
1504 |
index 10f1466..0000000 |
1505 |
--- a/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild |
1506 |
+++ /dev/null |
1507 |
@@ -1,428 +0,0 @@ |
1508 |
-# Copyright 1999-2014 Gentoo Foundation |
1509 |
-# Distributed under the terms of the GNU General Public License v2 |
1510 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild,v 1.2 2014/03/01 23:06:15 mgorny Exp $ |
1511 |
- |
1512 |
-EAPI=5 |
1513 |
- |
1514 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
1515 |
-PYTHON_REQ_USE='xml,threads' |
1516 |
- |
1517 |
-if [[ $PV == *9999 ]]; then |
1518 |
- KEYWORDS="" |
1519 |
- REPO="xen-unstable.hg" |
1520 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
1521 |
- S="${WORKDIR}/${REPO}" |
1522 |
- live_eclass="mercurial" |
1523 |
-else |
1524 |
- KEYWORDS="~amd64 -x86" |
1525 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" |
1526 |
- S="${WORKDIR}/xen-${PV}" |
1527 |
-fi |
1528 |
- |
1529 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
1530 |
- |
1531 |
-DESCRIPTION="Xend daemon and tools" |
1532 |
-HOMEPAGE="http://xen.org/" |
1533 |
-DOCS=( README docs/README.xen-bugtool ) |
1534 |
- |
1535 |
-LICENSE="GPL-2" |
1536 |
-SLOT="0" |
1537 |
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
1538 |
-# >=dev-lang/ocaml-4 stable |
1539 |
-# Masked in profiles/eapi-5-files instead |
1540 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend" |
1541 |
- |
1542 |
-REQUIRED_USE="hvm? ( qemu ) |
1543 |
- ${PYTHON_REQUIRED_USE} |
1544 |
- pygrub? ( python )" |
1545 |
- |
1546 |
-DEPEND="dev-libs/lzo:2 |
1547 |
- dev-libs/glib:2 |
1548 |
- dev-libs/yajl |
1549 |
- dev-libs/libgcrypt:0 |
1550 |
- dev-python/lxml[${PYTHON_USEDEP}] |
1551 |
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
1552 |
- sys-libs/zlib |
1553 |
- sys-power/iasl |
1554 |
- sys-firmware/seabios |
1555 |
- sys-firmware/ipxe |
1556 |
- hvm? ( media-libs/libsdl ) |
1557 |
- ${PYTHON_DEPS} |
1558 |
- api? ( dev-libs/libxml2 |
1559 |
- net-misc/curl ) |
1560 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
1561 |
- sys-devel/bin86 |
1562 |
- sys-devel/dev86 |
1563 |
- dev-lang/perl |
1564 |
- app-misc/pax-utils |
1565 |
- dev-python/markdown |
1566 |
- doc? ( |
1567 |
- app-doc/doxygen |
1568 |
- dev-tex/latex2html[png,gif] |
1569 |
- media-gfx/graphviz |
1570 |
- dev-tex/xcolor |
1571 |
- media-gfx/transfig |
1572 |
- dev-texlive/texlive-latexextra |
1573 |
- virtual/latex-base |
1574 |
- dev-tex/latexmk |
1575 |
- dev-texlive/texlive-latex |
1576 |
- dev-texlive/texlive-pictures |
1577 |
- dev-texlive/texlive-latexrecommended |
1578 |
- ) |
1579 |
- hvm? ( x11-proto/xproto |
1580 |
- !net-libs/libiscsi ) |
1581 |
- qemu? ( x11-libs/pixman ) |
1582 |
- ocaml? ( dev-ml/findlib |
1583 |
- >=dev-lang/ocaml-4 )" |
1584 |
-RDEPEND="sys-apps/iproute2 |
1585 |
- net-misc/bridge-utils |
1586 |
- screen? ( |
1587 |
- app-misc/screen |
1588 |
- app-admin/logrotate |
1589 |
- ) |
1590 |
- virtual/udev" |
1591 |
- |
1592 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
1593 |
-# Approved by QA team in bug #144032 |
1594 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
1595 |
- |
1596 |
-RESTRICT="test" |
1597 |
- |
1598 |
-# Security patches |
1599 |
-XSA_PATCHES=( |
1600 |
- "${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch |
1601 |
- "${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch #bug #500530 |
1602 |
- "${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch #bug #501080 |
1603 |
-) |
1604 |
- |
1605 |
-pkg_setup() { |
1606 |
- python-single-r1_pkg_setup |
1607 |
- export "CONFIG_LOMOUNT=y" |
1608 |
- |
1609 |
- if has_version dev-libs/libgcrypt:0; then |
1610 |
- export "CONFIG_GCRYPT=y" |
1611 |
- fi |
1612 |
- |
1613 |
- if use qemu; then |
1614 |
- export "CONFIG_IOEMU=y" |
1615 |
- else |
1616 |
- export "CONFIG_IOEMU=n" |
1617 |
- fi |
1618 |
- |
1619 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
1620 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
1621 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
1622 |
- eerror "to build xen-tools on your current profile." |
1623 |
- die "USE=hvm is unsupported on this system." |
1624 |
- fi |
1625 |
- |
1626 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
1627 |
- if use x86 && use amd64; then |
1628 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
1629 |
- elif use x86; then |
1630 |
- export XEN_TARGET_ARCH="x86_32" |
1631 |
- elif use amd64 ; then |
1632 |
- export XEN_TARGET_ARCH="x86_64" |
1633 |
- else |
1634 |
- die "Unsupported architecture!" |
1635 |
- fi |
1636 |
- fi |
1637 |
-} |
1638 |
- |
1639 |
-src_prepare() { |
1640 |
- # Drop .config, fixes to gcc-4.6 |
1641 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch |
1642 |
- |
1643 |
- # Xend |
1644 |
- if ! use xend; then |
1645 |
- sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ |
1646 |
- -i tools/misc/Makefile || die "Disabling xend failed" |
1647 |
- sed -e 's:^XEND_INITD:#XEND_INITD:' \ |
1648 |
- -i tools/examples/Makefile || die "Disabling xend failed" |
1649 |
- fi |
1650 |
- |
1651 |
- # if the user *really* wants to use their own custom-cflags, let them |
1652 |
- if use custom-cflags; then |
1653 |
- einfo "User wants their own CFLAGS - removing defaults" |
1654 |
- |
1655 |
- # try and remove all the default cflags |
1656 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
1657 |
- -exec sed \ |
1658 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
1659 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
1660 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
1661 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
1662 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
1663 |
- -i {} + || die "failed to re-set custom-cflags" |
1664 |
- fi |
1665 |
- |
1666 |
- if ! use pygrub; then |
1667 |
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die |
1668 |
- fi |
1669 |
- |
1670 |
- if ! use python; then |
1671 |
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die |
1672 |
- fi |
1673 |
- |
1674 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
1675 |
- if ! use hvm; then |
1676 |
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die |
1677 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
1678 |
- fi |
1679 |
- |
1680 |
- # Don't bother with qemu, only needed for fully virtualised guests |
1681 |
- if ! use qemu; then |
1682 |
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die |
1683 |
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die |
1684 |
- fi |
1685 |
- |
1686 |
- # Fix texi2html build error with new texi2html, qemu.doc.html |
1687 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch \ |
1688 |
- "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch |
1689 |
- |
1690 |
- # Fix network broadcast on bridged networks |
1691 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
1692 |
- |
1693 |
- # Bug 496708 |
1694 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch |
1695 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch |
1696 |
- |
1697 |
- # Fix bridge by idella4, bug #362575 |
1698 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
1699 |
- |
1700 |
- # Don't build ipxe with pie on hardened, Bug #360805 |
1701 |
- if gcc-specs-pie; then |
1702 |
- epatch "${FILESDIR}"/ipxe-nopie.patch |
1703 |
- fi |
1704 |
- |
1705 |
- # Prevent double stripping of files at install |
1706 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch |
1707 |
- |
1708 |
- # fix jobserver in Makefile |
1709 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch |
1710 |
- |
1711 |
- # add missing header |
1712 |
- epatch "${FILESDIR}"/xen-4-ulong.patch |
1713 |
- |
1714 |
- # Set dom0-min-mem to kb; Bug #472982 |
1715 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch |
1716 |
- |
1717 |
- [[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}" |
1718 |
- |
1719 |
- # Bug 472438 |
1720 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
1721 |
- -i Config.mk || die |
1722 |
- |
1723 |
- # Bug 477676 |
1724 |
- epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch |
1725 |
- |
1726 |
- # Prevent file collision with qemu package Bug 478064 |
1727 |
- if use qemu; then |
1728 |
- epatch "${FILESDIR}"/qemu-bridge.patch |
1729 |
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
1730 |
- fi |
1731 |
- |
1732 |
- use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die |
1733 |
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
1734 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ |
1735 |
- -i tools/firmware/Makefile || die |
1736 |
- |
1737 |
- # Bug 379537 |
1738 |
- epatch "${FILESDIR}"/fix-gold-ld.patch |
1739 |
- |
1740 |
- # xencommons, Bug #492332, sed lighter weight than patching |
1741 |
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ |
1742 |
- -i tools/hotplug/Linux/init.d/xencommons || die |
1743 |
- |
1744 |
- # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844 |
1745 |
- sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \ |
1746 |
- -i tools/libxl/libxl_bootloader.c || die |
1747 |
- |
1748 |
- # fix QA warning, create /var/run/, /var/lock dynamically |
1749 |
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ |
1750 |
- tools/libxl/Makefile || die |
1751 |
- |
1752 |
- sed -i -e "/\/var\/run\//d" \ |
1753 |
- tools/xenstore/Makefile \ |
1754 |
- tools/pygrub/Makefile || die |
1755 |
- |
1756 |
- sed -i -e "/\/var\/lock\/subsys/d" \ |
1757 |
- tools/Makefile || die |
1758 |
- |
1759 |
- epatch_user |
1760 |
-} |
1761 |
- |
1762 |
-src_configure() { |
1763 |
- local myconf="--prefix=/usr --disable-werror" |
1764 |
- |
1765 |
- if use ocaml |
1766 |
- then |
1767 |
- myconf="${myconf} $(use_enable ocaml ocamltools)" |
1768 |
- else |
1769 |
- myconf="${myconf} --disable-ocamltools" |
1770 |
- fi |
1771 |
- |
1772 |
- if ! use pam |
1773 |
- then |
1774 |
- myconf="${myconf} --disable-pam" |
1775 |
- fi |
1776 |
- |
1777 |
- econf ${myconf} |
1778 |
-} |
1779 |
- |
1780 |
-src_compile() { |
1781 |
- export VARTEXFONTS="${T}/fonts" |
1782 |
- local myopt |
1783 |
- use debug && myopt="${myopt} debug=y" |
1784 |
- |
1785 |
- use custom-cflags || unset CFLAGS |
1786 |
- if test-flag-CC -fno-strict-overflow; then |
1787 |
- append-flags -fno-strict-overflow |
1788 |
- fi |
1789 |
- |
1790 |
- unset LDFLAGS |
1791 |
- unset CFLAGS |
1792 |
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
1793 |
- |
1794 |
- use doc && emake -C docs txt html |
1795 |
- emake -C docs man-pages |
1796 |
-} |
1797 |
- |
1798 |
-src_install() { |
1799 |
- # Override auto-detection in the build system, bug #382573 |
1800 |
- export INITD_DIR=/tmp/init.d |
1801 |
- export CONFIG_LEAF_DIR=../tmp/default |
1802 |
- |
1803 |
- # Let the build system compile installed Python modules. |
1804 |
- local PYTHONDONTWRITEBYTECODE |
1805 |
- export PYTHONDONTWRITEBYTECODE |
1806 |
- |
1807 |
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ |
1808 |
- XEN_PYTHON_NATIVE_INSTALL=y install-tools |
1809 |
- |
1810 |
- # Fix the remaining Python shebangs. |
1811 |
- python_fix_shebang "${D}" |
1812 |
- |
1813 |
- # Remove RedHat-specific stuff |
1814 |
- rm -rf "${D}"tmp || die |
1815 |
- |
1816 |
- # uncomment lines in xl.conf |
1817 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
1818 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
1819 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
1820 |
- -i tools/examples/xl.conf || die |
1821 |
- |
1822 |
- # Reset bash completion dir; Bug 472438 |
1823 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
1824 |
- |
1825 |
- if use doc; then |
1826 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
1827 |
- |
1828 |
- dohtml -r docs/ |
1829 |
- docinto pdf |
1830 |
- dodoc ${DOCS[@]} |
1831 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
1832 |
- fi |
1833 |
- |
1834 |
- rm -rf "${D}"/usr/share/doc/xen/ |
1835 |
- doman docs/man?/* |
1836 |
- |
1837 |
- if use xend; then |
1838 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" |
1839 |
- fi |
1840 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
1841 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
1842 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
1843 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
1844 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
1845 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
1846 |
- newinitd "${FILESDIR}"/xencommons.initd xencommons |
1847 |
- newconfd "${FILESDIR}"/xencommons.confd xencommons |
1848 |
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev |
1849 |
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev |
1850 |
- |
1851 |
- if use screen; then |
1852 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
1853 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die |
1854 |
- keepdir /var/log/xen-consoles |
1855 |
- fi |
1856 |
- |
1857 |
- # Move files built with use qemu, Bug #477884 |
1858 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
1859 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
1860 |
- mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die |
1861 |
- fi |
1862 |
- |
1863 |
- # For -static-libs wrt Bug 384355 |
1864 |
- if ! use static-libs; then |
1865 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
1866 |
- fi |
1867 |
- |
1868 |
- # xend expects these to exist |
1869 |
- keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
1870 |
- |
1871 |
- # for xendomains |
1872 |
- keepdir /etc/xen/auto |
1873 |
- |
1874 |
- # Temp QA workaround |
1875 |
- dodir "$(udev_get_udevdir)" |
1876 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
1877 |
- rm -rf "${D}"/etc/udev |
1878 |
- |
1879 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
1880 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
1881 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
1882 |
-} |
1883 |
- |
1884 |
-pkg_postinst() { |
1885 |
- elog "Official Xen Guide and the offical wiki page:" |
1886 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
1887 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
1888 |
- elog "" |
1889 |
- elog "Recommended to utilise the xencommons script to config sytem At boot" |
1890 |
- elog "Add by use of rc-update on completion of the install" |
1891 |
- |
1892 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
1893 |
- echo |
1894 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
1895 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
1896 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
1897 |
- fi |
1898 |
- |
1899 |
- # TODO: we need to have the current Python slot here. |
1900 |
- if ! has_version "dev-lang/python[ncurses]"; then |
1901 |
- echo |
1902 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
1903 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
1904 |
- fi |
1905 |
- |
1906 |
- if has_version "sys-apps/iproute2[minimal]"; then |
1907 |
- echo |
1908 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
1909 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
1910 |
- fi |
1911 |
- |
1912 |
- if ! use hvm; then |
1913 |
- echo |
1914 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
1915 |
- elog "support enable the hvm use flag." |
1916 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
1917 |
- fi |
1918 |
- |
1919 |
- if use xend; then |
1920 |
- elog"";elog "xend capability has been enabled and installed" |
1921 |
- fi |
1922 |
- |
1923 |
- if use qemu; then |
1924 |
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" |
1925 |
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" |
1926 |
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
1927 |
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
1928 |
- fi |
1929 |
- |
1930 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
1931 |
- echo |
1932 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
1933 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
1934 |
- fi |
1935 |
-} |
1936 |
|
1937 |
diff --git a/app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild |
1938 |
deleted file mode 100644 |
1939 |
index 1d27a9a..0000000 |
1940 |
--- a/app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild |
1941 |
+++ /dev/null |
1942 |
@@ -1,436 +0,0 @@ |
1943 |
-# Copyright 1999-2014 Gentoo Foundation |
1944 |
-# Distributed under the terms of the GNU General Public License v2 |
1945 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $ |
1946 |
- |
1947 |
-EAPI=5 |
1948 |
- |
1949 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
1950 |
-PYTHON_REQ_USE='xml,threads' |
1951 |
- |
1952 |
-if [[ $PV == *9999 ]]; then |
1953 |
- KEYWORDS="" |
1954 |
- REPO="xen-unstable.hg" |
1955 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
1956 |
- S="${WORKDIR}/${REPO}" |
1957 |
- live_eclass="mercurial" |
1958 |
-else |
1959 |
- KEYWORDS="~amd64 -x86" |
1960 |
- UPSTREAM_VER=0 |
1961 |
- GENTOO_VER= |
1962 |
- |
1963 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
1964 |
- UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
1965 |
- [[ -n ${GENTOO_VER} ]] && \ |
1966 |
- GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" |
1967 |
- |
1968 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
1969 |
- ${UPSTREAM_PATCHSET_URI} |
1970 |
- ${GENTOO_PATCHSET_URI}" |
1971 |
- S="${WORKDIR}/xen-${PV}" |
1972 |
-fi |
1973 |
- |
1974 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
1975 |
- |
1976 |
-DESCRIPTION="Xend daemon and tools" |
1977 |
-HOMEPAGE="http://xen.org/" |
1978 |
-DOCS=( README docs/README.xen-bugtool ) |
1979 |
- |
1980 |
-LICENSE="GPL-2" |
1981 |
-SLOT="0" |
1982 |
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
1983 |
-# >=dev-lang/ocaml-4 stable |
1984 |
-# Masked in profiles/eapi-5-files instead |
1985 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend" |
1986 |
- |
1987 |
-REQUIRED_USE="hvm? ( qemu ) |
1988 |
- ${PYTHON_REQUIRED_USE} |
1989 |
- pygrub? ( python )" |
1990 |
- |
1991 |
-DEPEND="dev-libs/lzo:2 |
1992 |
- dev-libs/glib:2 |
1993 |
- dev-libs/yajl |
1994 |
- dev-libs/libgcrypt:0 |
1995 |
- dev-python/lxml[${PYTHON_USEDEP}] |
1996 |
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
1997 |
- sys-libs/zlib |
1998 |
- sys-power/iasl |
1999 |
- sys-firmware/seabios |
2000 |
- sys-firmware/ipxe |
2001 |
- hvm? ( media-libs/libsdl ) |
2002 |
- ${PYTHON_DEPS} |
2003 |
- api? ( dev-libs/libxml2 |
2004 |
- net-misc/curl ) |
2005 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
2006 |
- sys-devel/bin86 |
2007 |
- sys-devel/dev86 |
2008 |
- dev-lang/perl |
2009 |
- app-misc/pax-utils |
2010 |
- dev-python/markdown |
2011 |
- doc? ( |
2012 |
- app-doc/doxygen |
2013 |
- dev-tex/latex2html[png,gif] |
2014 |
- media-gfx/graphviz |
2015 |
- dev-tex/xcolor |
2016 |
- media-gfx/transfig |
2017 |
- dev-texlive/texlive-latexextra |
2018 |
- virtual/latex-base |
2019 |
- dev-tex/latexmk |
2020 |
- dev-texlive/texlive-latex |
2021 |
- dev-texlive/texlive-pictures |
2022 |
- dev-texlive/texlive-latexrecommended |
2023 |
- ) |
2024 |
- hvm? ( x11-proto/xproto |
2025 |
- !net-libs/libiscsi ) |
2026 |
- qemu? ( x11-libs/pixman ) |
2027 |
- ocaml? ( dev-ml/findlib |
2028 |
- >=dev-lang/ocaml-4 )" |
2029 |
-RDEPEND="sys-apps/iproute2 |
2030 |
- net-misc/bridge-utils |
2031 |
- screen? ( |
2032 |
- app-misc/screen |
2033 |
- app-admin/logrotate |
2034 |
- ) |
2035 |
- virtual/udev" |
2036 |
- |
2037 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
2038 |
-# Approved by QA team in bug #144032 |
2039 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
2040 |
- |
2041 |
-RESTRICT="test" |
2042 |
- |
2043 |
-pkg_setup() { |
2044 |
- python-single-r1_pkg_setup |
2045 |
- export "CONFIG_LOMOUNT=y" |
2046 |
- |
2047 |
- if has_version dev-libs/libgcrypt:0; then |
2048 |
- export "CONFIG_GCRYPT=y" |
2049 |
- fi |
2050 |
- |
2051 |
- if use qemu; then |
2052 |
- export "CONFIG_IOEMU=y" |
2053 |
- else |
2054 |
- export "CONFIG_IOEMU=n" |
2055 |
- fi |
2056 |
- |
2057 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
2058 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
2059 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
2060 |
- eerror "to build xen-tools on your current profile." |
2061 |
- die "USE=hvm is unsupported on this system." |
2062 |
- fi |
2063 |
- |
2064 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
2065 |
- if use x86 && use amd64; then |
2066 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
2067 |
- elif use x86; then |
2068 |
- export XEN_TARGET_ARCH="x86_32" |
2069 |
- elif use amd64 ; then |
2070 |
- export XEN_TARGET_ARCH="x86_64" |
2071 |
- else |
2072 |
- die "Unsupported architecture!" |
2073 |
- fi |
2074 |
- fi |
2075 |
-} |
2076 |
- |
2077 |
-src_prepare() { |
2078 |
- # Upstream's patchset |
2079 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
2080 |
- EPATCH_SUFFIX="patch" \ |
2081 |
- EPATCH_FORCE="yes" \ |
2082 |
- epatch "${WORKDIR}"/patches-upstream |
2083 |
- fi |
2084 |
- |
2085 |
- # Gentoo's patchset |
2086 |
- if [[ -n ${GENTOO_VER} ]]; then |
2087 |
- EPATCH_SUFFIX="patch" \ |
2088 |
- EPATCH_FORCE="yes" \ |
2089 |
- epatch "${WORKDIR}"/patches-gentoo |
2090 |
- fi |
2091 |
- |
2092 |
- # Drop .config, fixes to gcc-4.6 |
2093 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch |
2094 |
- |
2095 |
- # Fix texi2html build error with new texi2html, qemu.doc.html |
2096 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch \ |
2097 |
- "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch |
2098 |
- |
2099 |
- # Fix network broadcast on bridged networks |
2100 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
2101 |
- |
2102 |
- # Bug 496708 |
2103 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch |
2104 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch |
2105 |
- |
2106 |
- # Fix bridge by idella4, bug #362575 |
2107 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
2108 |
- |
2109 |
- # Prevent double stripping of files at install |
2110 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch |
2111 |
- |
2112 |
- # fix jobserver in Makefile |
2113 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch |
2114 |
- |
2115 |
- # add missing header |
2116 |
- epatch "${FILESDIR}"/xen-4-ulong.patch |
2117 |
- |
2118 |
- # Set dom0-min-mem to kb; Bug #472982 |
2119 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch |
2120 |
- |
2121 |
- # Bug 477676 |
2122 |
- epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch |
2123 |
- |
2124 |
- # Bug 379537 |
2125 |
- epatch "${FILESDIR}"/fix-gold-ld.patch |
2126 |
- |
2127 |
- # Prevent file collision with qemu package Bug 478064 |
2128 |
- epatch "${FILESDIR}"/qemu-bridge.patch |
2129 |
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
2130 |
- |
2131 |
- # Xend |
2132 |
- if ! use xend; then |
2133 |
- sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ |
2134 |
- -i tools/misc/Makefile || die "Disabling xend failed" |
2135 |
- sed -e 's:^XEND_INITD:#XEND_INITD:' \ |
2136 |
- -i tools/examples/Makefile || die "Disabling xend failed" |
2137 |
- fi |
2138 |
- |
2139 |
- # if the user *really* wants to use their own custom-cflags, let them |
2140 |
- if use custom-cflags; then |
2141 |
- einfo "User wants their own CFLAGS - removing defaults" |
2142 |
- |
2143 |
- # try and remove all the default cflags |
2144 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
2145 |
- -exec sed \ |
2146 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
2147 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
2148 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
2149 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
2150 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
2151 |
- -i {} + || die "failed to re-set custom-cflags" |
2152 |
- fi |
2153 |
- |
2154 |
- if ! use pygrub; then |
2155 |
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die |
2156 |
- fi |
2157 |
- |
2158 |
- if ! use python; then |
2159 |
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die |
2160 |
- fi |
2161 |
- |
2162 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
2163 |
- if ! use hvm; then |
2164 |
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die |
2165 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
2166 |
- fi |
2167 |
- |
2168 |
- # Don't bother with qemu, only needed for fully virtualised guests |
2169 |
- if ! use qemu; then |
2170 |
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die |
2171 |
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die |
2172 |
- fi |
2173 |
- |
2174 |
- # Bug 472438 |
2175 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
2176 |
- -i Config.mk || die |
2177 |
- |
2178 |
- use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die |
2179 |
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
2180 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ |
2181 |
- -i tools/firmware/Makefile || die |
2182 |
- |
2183 |
- # xencommons, Bug #492332, sed lighter weight than patching |
2184 |
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ |
2185 |
- -i tools/hotplug/Linux/init.d/xencommons || die |
2186 |
- |
2187 |
- # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844 |
2188 |
- sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \ |
2189 |
- -i tools/libxl/libxl_bootloader.c || die |
2190 |
- |
2191 |
- # fix QA warning, create /var/run/, /var/lock dynamically |
2192 |
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ |
2193 |
- tools/libxl/Makefile || die |
2194 |
- |
2195 |
- sed -i -e "/\/var\/run\//d" \ |
2196 |
- tools/xenstore/Makefile \ |
2197 |
- tools/pygrub/Makefile || die |
2198 |
- |
2199 |
- sed -i -e "/\/var\/lock\/subsys/d" \ |
2200 |
- tools/Makefile || die |
2201 |
- |
2202 |
- epatch_user |
2203 |
-} |
2204 |
- |
2205 |
-src_configure() { |
2206 |
- local myconf="--prefix=/usr --disable-werror" |
2207 |
- |
2208 |
- if use ocaml |
2209 |
- then |
2210 |
- myconf="${myconf} $(use_enable ocaml ocamltools)" |
2211 |
- else |
2212 |
- myconf="${myconf} --disable-ocamltools" |
2213 |
- fi |
2214 |
- |
2215 |
- if ! use pam |
2216 |
- then |
2217 |
- myconf="${myconf} --disable-pam" |
2218 |
- fi |
2219 |
- |
2220 |
- econf ${myconf} |
2221 |
-} |
2222 |
- |
2223 |
-src_compile() { |
2224 |
- export VARTEXFONTS="${T}/fonts" |
2225 |
- local myopt |
2226 |
- use debug && myopt="${myopt} debug=y" |
2227 |
- |
2228 |
- use custom-cflags || unset CFLAGS |
2229 |
- if test-flag-CC -fno-strict-overflow; then |
2230 |
- append-flags -fno-strict-overflow |
2231 |
- fi |
2232 |
- |
2233 |
- unset LDFLAGS |
2234 |
- unset CFLAGS |
2235 |
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
2236 |
- |
2237 |
- use doc && emake -C docs txt html |
2238 |
- emake -C docs man-pages |
2239 |
-} |
2240 |
- |
2241 |
-src_install() { |
2242 |
- # Override auto-detection in the build system, bug #382573 |
2243 |
- export INITD_DIR=/tmp/init.d |
2244 |
- export CONFIG_LEAF_DIR=../tmp/default |
2245 |
- |
2246 |
- # Let the build system compile installed Python modules. |
2247 |
- local PYTHONDONTWRITEBYTECODE |
2248 |
- export PYTHONDONTWRITEBYTECODE |
2249 |
- |
2250 |
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ |
2251 |
- XEN_PYTHON_NATIVE_INSTALL=y install-tools |
2252 |
- |
2253 |
- # Fix the remaining Python shebangs. |
2254 |
- python_fix_shebang "${D}" |
2255 |
- |
2256 |
- # Remove RedHat-specific stuff |
2257 |
- rm -rf "${D}"tmp || die |
2258 |
- |
2259 |
- # uncomment lines in xl.conf |
2260 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
2261 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
2262 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
2263 |
- -i tools/examples/xl.conf || die |
2264 |
- |
2265 |
- # Reset bash completion dir; Bug 472438 |
2266 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
2267 |
- |
2268 |
- if use doc; then |
2269 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
2270 |
- |
2271 |
- dohtml -r docs/ |
2272 |
- docinto pdf |
2273 |
- dodoc ${DOCS[@]} |
2274 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
2275 |
- fi |
2276 |
- |
2277 |
- rm -rf "${D}"/usr/share/doc/xen/ |
2278 |
- doman docs/man?/* |
2279 |
- |
2280 |
- if use xend; then |
2281 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" |
2282 |
- fi |
2283 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
2284 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
2285 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
2286 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
2287 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
2288 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
2289 |
- newinitd "${FILESDIR}"/xencommons.initd xencommons |
2290 |
- newconfd "${FILESDIR}"/xencommons.confd xencommons |
2291 |
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev |
2292 |
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev |
2293 |
- |
2294 |
- if use screen; then |
2295 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
2296 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die |
2297 |
- keepdir /var/log/xen-consoles |
2298 |
- fi |
2299 |
- |
2300 |
- # Move files built with use qemu, Bug #477884 |
2301 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
2302 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
2303 |
- mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die |
2304 |
- fi |
2305 |
- |
2306 |
- # For -static-libs wrt Bug 384355 |
2307 |
- if ! use static-libs; then |
2308 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
2309 |
- fi |
2310 |
- |
2311 |
- # xend expects these to exist |
2312 |
- keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
2313 |
- |
2314 |
- # for xendomains |
2315 |
- keepdir /etc/xen/auto |
2316 |
- |
2317 |
- # Temp QA workaround |
2318 |
- dodir "$(udev_get_udevdir)" |
2319 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
2320 |
- rm -rf "${D}"/etc/udev |
2321 |
- |
2322 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
2323 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
2324 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
2325 |
-} |
2326 |
- |
2327 |
-pkg_postinst() { |
2328 |
- elog "Official Xen Guide and the offical wiki page:" |
2329 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
2330 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
2331 |
- elog "" |
2332 |
- elog "Recommended to utilise the xencommons script to config sytem At boot" |
2333 |
- elog "Add by use of rc-update on completion of the install" |
2334 |
- |
2335 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
2336 |
- echo |
2337 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
2338 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
2339 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
2340 |
- fi |
2341 |
- |
2342 |
- # TODO: we need to have the current Python slot here. |
2343 |
- if ! has_version "dev-lang/python[ncurses]"; then |
2344 |
- echo |
2345 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
2346 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
2347 |
- fi |
2348 |
- |
2349 |
- if has_version "sys-apps/iproute2[minimal]"; then |
2350 |
- echo |
2351 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
2352 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
2353 |
- fi |
2354 |
- |
2355 |
- if ! use hvm; then |
2356 |
- echo |
2357 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
2358 |
- elog "support enable the hvm use flag." |
2359 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
2360 |
- fi |
2361 |
- |
2362 |
- if use xend; then |
2363 |
- elog"";elog "xend capability has been enabled and installed" |
2364 |
- fi |
2365 |
- |
2366 |
- if use qemu; then |
2367 |
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" |
2368 |
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" |
2369 |
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
2370 |
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
2371 |
- fi |
2372 |
- |
2373 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
2374 |
- echo |
2375 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
2376 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
2377 |
- fi |
2378 |
-} |
2379 |
|
2380 |
diff --git a/app-emulation/xen-tools/xen-tools-4.3.2.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r2.ebuild |
2381 |
similarity index 99% |
2382 |
rename from app-emulation/xen-tools/xen-tools-4.3.2.ebuild |
2383 |
rename to app-emulation/xen-tools/xen-tools-4.3.2-r2.ebuild |
2384 |
index e58d594..8a8fee2 100644 |
2385 |
--- a/app-emulation/xen-tools/xen-tools-4.3.2.ebuild |
2386 |
+++ b/app-emulation/xen-tools/xen-tools-4.3.2-r2.ebuild |
2387 |
@@ -1,6 +1,6 @@ |
2388 |
# Copyright 1999-2014 Gentoo Foundation |
2389 |
# Distributed under the terms of the GNU General Public License v2 |
2390 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $ |
2391 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r2.ebuild,v 1.2 2014/05/17 13:32:34 ago Exp $ |
2392 |
|
2393 |
EAPI=5 |
2394 |
|
2395 |
@@ -14,8 +14,8 @@ if [[ $PV == *9999 ]]; then |
2396 |
S="${WORKDIR}/${REPO}" |
2397 |
live_eclass="mercurial" |
2398 |
else |
2399 |
- KEYWORDS="~amd64 -x86" |
2400 |
- UPSTREAM_VER= |
2401 |
+ KEYWORDS="amd64 -x86" |
2402 |
+ UPSTREAM_VER=1 |
2403 |
GENTOO_VER= |
2404 |
|
2405 |
[[ -n ${UPSTREAM_VER} ]] && \ |
2406 |
|
2407 |
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild |
2408 |
deleted file mode 100644 |
2409 |
index 9c4ea84..0000000 |
2410 |
--- a/app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild |
2411 |
+++ /dev/null |
2412 |
@@ -1,427 +0,0 @@ |
2413 |
-# Copyright 1999-2014 Gentoo Foundation |
2414 |
-# Distributed under the terms of the GNU General Public License v2 |
2415 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0.ebuild,v 1.3 2014/04/04 01:06:31 idella4 Exp $ |
2416 |
- |
2417 |
-EAPI=5 |
2418 |
- |
2419 |
-MY_PV=${PV/_/-} |
2420 |
- |
2421 |
-PYTHON_COMPAT=( python2_7 ) |
2422 |
-PYTHON_REQ_USE='xml,threads' |
2423 |
- |
2424 |
-if [[ $PV == *9999 ]]; then |
2425 |
- KEYWORDS="" |
2426 |
- REPO="xen-unstable.hg" |
2427 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
2428 |
- S="${WORKDIR}/${REPO}" |
2429 |
- live_eclass="mercurial" |
2430 |
-else |
2431 |
- KEYWORDS="~amd64 ~arm -x86" |
2432 |
- UPSTREAM_VER=0 |
2433 |
- GENTOO_VER= |
2434 |
- |
2435 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
2436 |
- UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
2437 |
- [[ -n ${GENTOO_VER} ]] && \ |
2438 |
- GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" |
2439 |
- |
2440 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz |
2441 |
- ${UPSTRAM_PATCHSET_URI} |
2442 |
- ${GENTOO_PATCHSET_URI}" |
2443 |
- S="${WORKDIR}/xen-${MY_PV}" |
2444 |
-fi |
2445 |
- |
2446 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
2447 |
- |
2448 |
-DESCRIPTION="Xend daemon and tools" |
2449 |
-HOMEPAGE="http://xen.org/" |
2450 |
-DOCS=( README docs/README.xen-bugtool ) |
2451 |
- |
2452 |
-LICENSE="GPL-2" |
2453 |
-SLOT="0" |
2454 |
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
2455 |
-# >=dev-lang/ocaml-4 stable |
2456 |
-# Masked in profiles/eapi-5-files instead |
2457 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs" |
2458 |
- |
2459 |
-REQUIRED_USE="hvm? ( qemu ) |
2460 |
- ${PYTHON_REQUIRED_USE} |
2461 |
- pygrub? ( python )" |
2462 |
- |
2463 |
-COMMON_DEPEND=" |
2464 |
- dev-libs/lzo:2 |
2465 |
- dev-libs/glib:2 |
2466 |
- dev-libs/yajl |
2467 |
- dev-libs/libaio |
2468 |
- dev-libs/libgcrypt:0 |
2469 |
- sys-libs/zlib |
2470 |
-" |
2471 |
- |
2472 |
-DEPEND="${COMMON_DEPEND} |
2473 |
- dev-python/lxml[${PYTHON_USEDEP}] |
2474 |
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
2475 |
- hvm? ( media-libs/libsdl ) |
2476 |
- ${PYTHON_DEPS} |
2477 |
- api? ( dev-libs/libxml2 |
2478 |
- net-misc/curl ) |
2479 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
2480 |
- arm? ( >=sys-apps/dtc-1.4.0 ) |
2481 |
- !arm? ( sys-devel/bin86 |
2482 |
- sys-firmware/ipxe |
2483 |
- sys-firmware/seabios |
2484 |
- sys-devel/dev86 |
2485 |
- sys-power/iasl ) |
2486 |
- dev-lang/perl |
2487 |
- app-misc/pax-utils |
2488 |
- dev-python/markdown |
2489 |
- doc? ( |
2490 |
- app-doc/doxygen |
2491 |
- dev-tex/latex2html[png,gif] |
2492 |
- media-gfx/graphviz |
2493 |
- dev-tex/xcolor |
2494 |
- media-gfx/transfig |
2495 |
- dev-texlive/texlive-latexextra |
2496 |
- virtual/latex-base |
2497 |
- dev-tex/latexmk |
2498 |
- dev-texlive/texlive-latex |
2499 |
- dev-texlive/texlive-pictures |
2500 |
- dev-texlive/texlive-latexrecommended |
2501 |
- ) |
2502 |
- hvm? ( x11-proto/xproto |
2503 |
- !net-libs/libiscsi ) |
2504 |
- qemu? ( x11-libs/pixman ) |
2505 |
- ocaml? ( dev-ml/findlib |
2506 |
- >=dev-lang/ocaml-4 )" |
2507 |
- |
2508 |
-RDEPEND="${COMMON_DEPEND} |
2509 |
- sys-apps/iproute2 |
2510 |
- net-misc/bridge-utils |
2511 |
- screen? ( |
2512 |
- app-misc/screen |
2513 |
- app-admin/logrotate |
2514 |
- ) |
2515 |
- virtual/udev" |
2516 |
- |
2517 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
2518 |
-# Approved by QA team in bug #144032 |
2519 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
2520 |
- |
2521 |
-RESTRICT="test" |
2522 |
- |
2523 |
-pkg_setup() { |
2524 |
- python-single-r1_pkg_setup |
2525 |
- export "CONFIG_LOMOUNT=y" |
2526 |
- |
2527 |
- if has_version dev-libs/libgcrypt:0; then |
2528 |
- export "CONFIG_GCRYPT=y" |
2529 |
- fi |
2530 |
- |
2531 |
- if use qemu; then |
2532 |
- export "CONFIG_IOEMU=y" |
2533 |
- else |
2534 |
- export "CONFIG_IOEMU=n" |
2535 |
- fi |
2536 |
- |
2537 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
2538 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
2539 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
2540 |
- eerror "to build xen-tools on your current profile." |
2541 |
- die "USE=hvm is unsupported on this system." |
2542 |
- fi |
2543 |
- |
2544 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
2545 |
- if use x86 && use amd64; then |
2546 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
2547 |
- elif use x86; then |
2548 |
- export XEN_TARGET_ARCH="x86_32" |
2549 |
- elif use amd64 ; then |
2550 |
- export XEN_TARGET_ARCH="x86_64" |
2551 |
- elif use arm; then |
2552 |
- export XEN_TARGET_ARCH="arm32" |
2553 |
- else |
2554 |
- die "Unsupported architecture!" |
2555 |
- fi |
2556 |
- fi |
2557 |
- #bug 472438 |
2558 |
- export BASH_COMPLETION_DIR=/usr/share/bash-completion |
2559 |
-} |
2560 |
- |
2561 |
-src_prepare() { |
2562 |
- # Upstream's patchset |
2563 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
2564 |
- EPATCH_SUFFIX="patch" \ |
2565 |
- EPATCH_FORCE="yes" \ |
2566 |
- epatch "${WORKDIR}"/patches-upstream |
2567 |
- fi |
2568 |
- |
2569 |
- # Gentoo's patchset |
2570 |
- if [[ -n ${GENTOO_VER} ]]; then |
2571 |
- EPATCH_SUFFIX="patch" \ |
2572 |
- EPATCH_FORCE="yes" \ |
2573 |
- epatch "${WORKDIR}"/patches-gentoo |
2574 |
- fi |
2575 |
- |
2576 |
- # Fix texi2html build error with new texi2html, qemu.doc.html |
2577 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch |
2578 |
- |
2579 |
- # Fix network broadcast on bridged networks |
2580 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
2581 |
- |
2582 |
- # Bug 496708 |
2583 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch |
2584 |
- |
2585 |
- # Fix bridge by idella4, bug #362575 |
2586 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
2587 |
- |
2588 |
- # Prevent double stripping of files at install |
2589 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.4-nostrip.patch |
2590 |
- |
2591 |
- # fix jobserver in Makefile |
2592 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch |
2593 |
- |
2594 |
- # Set dom0-min-mem to kb; Bug #472982 |
2595 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch |
2596 |
- |
2597 |
- # Bug 477676 |
2598 |
- epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch |
2599 |
- |
2600 |
- # Bug 379537 |
2601 |
- epatch "${FILESDIR}"/fix-gold-ld.patch |
2602 |
- |
2603 |
- # Prevent file collision with qemu package Bug 478064 |
2604 |
- epatch "${FILESDIR}"/xen-4.4-qemu-bridge.patch |
2605 |
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
2606 |
- |
2607 |
- epatch "${FILESDIR}"/${PN}-4.4-api-fix.patch |
2608 |
- |
2609 |
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
2610 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ |
2611 |
- -i tools/firmware/Makefile || die |
2612 |
- |
2613 |
- # Drop .config, fixes to gcc-4.6 |
2614 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
2615 |
- |
2616 |
- # if the user *really* wants to use their own custom-cflags, let them |
2617 |
- if use custom-cflags; then |
2618 |
- einfo "User wants their own CFLAGS - removing defaults" |
2619 |
- |
2620 |
- # try and remove all the default cflags |
2621 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
2622 |
- -exec sed \ |
2623 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
2624 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
2625 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
2626 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
2627 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
2628 |
- -i {} + || die "failed to re-set custom-cflags" |
2629 |
- fi |
2630 |
- |
2631 |
- if ! use pygrub; then |
2632 |
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die |
2633 |
- fi |
2634 |
- |
2635 |
- if ! use python; then |
2636 |
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die |
2637 |
- fi |
2638 |
- |
2639 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
2640 |
- if ! use hvm; then |
2641 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
2642 |
- fi |
2643 |
- |
2644 |
- # Don't bother with qemu, only needed for fully virtualised guests |
2645 |
- if ! use qemu; then |
2646 |
- sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die |
2647 |
- fi |
2648 |
- |
2649 |
- # Bug 472438 |
2650 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
2651 |
- -i Config.mk || die |
2652 |
- |
2653 |
- # xencommons, Bug #492332, sed lighter weight than patching |
2654 |
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ |
2655 |
- -i tools/hotplug/Linux/init.d/xencommons || die |
2656 |
- |
2657 |
- # respect multilib, usr/lib/libcacard.so.0.0.0 |
2658 |
- sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ |
2659 |
- -i tools/qemu-xen/configure || die |
2660 |
- |
2661 |
- # fix QA warning, create /var/run/, /var/lock dynamically |
2662 |
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ |
2663 |
- tools/libxl/Makefile || die |
2664 |
- |
2665 |
- sed -i -e "/\/var\/run\//d" \ |
2666 |
- tools/xenstore/Makefile \ |
2667 |
- tools/pygrub/Makefile || die |
2668 |
- |
2669 |
- sed -i -e "/\/var\/lock\/subsys/d" \ |
2670 |
- tools/Makefile || die |
2671 |
- |
2672 |
- epatch_user |
2673 |
-} |
2674 |
- |
2675 |
-src_configure() { |
2676 |
- local myconf="--prefix=/usr \ |
2677 |
- --libdir=/usr/$(get_libdir) \ |
2678 |
- --disable-werror \ |
2679 |
- --with-system-seabios=/usr/share/seabios/bios.bin \ |
2680 |
- --disable-xen \ |
2681 |
- --enable-tools \ |
2682 |
- --enable-docs \ |
2683 |
- --with-system-qemu \ |
2684 |
- $(use_enable pam) \ |
2685 |
- $(use_enable api xenapi) \ |
2686 |
- $(use_enable ocaml ocamltools) \ |
2687 |
- " |
2688 |
- econf ${myconf} |
2689 |
-} |
2690 |
- |
2691 |
-src_compile() { |
2692 |
- export VARTEXFONTS="${T}/fonts" |
2693 |
- local myopt |
2694 |
- use debug && myopt="${myopt} debug=y" |
2695 |
- |
2696 |
- use custom-cflags || unset CFLAGS |
2697 |
- if test-flag-CC -fno-strict-overflow; then |
2698 |
- append-flags -fno-strict-overflow |
2699 |
- fi |
2700 |
- |
2701 |
- unset LDFLAGS |
2702 |
- unset CFLAGS |
2703 |
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
2704 |
- |
2705 |
- use doc && emake -C docs txt html |
2706 |
- emake -C docs man-pages |
2707 |
-} |
2708 |
- |
2709 |
-src_install() { |
2710 |
- # Override auto-detection in the build system, bug #382573 |
2711 |
- export INITD_DIR=/tmp/init.d |
2712 |
- export CONFIG_LEAF_DIR=../tmp/default |
2713 |
- |
2714 |
- # Let the build system compile installed Python modules. |
2715 |
- local PYTHONDONTWRITEBYTECODE |
2716 |
- export PYTHONDONTWRITEBYTECODE |
2717 |
- |
2718 |
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ |
2719 |
- XEN_PYTHON_NATIVE_INSTALL=y install-tools |
2720 |
- |
2721 |
- # Fix the remaining Python shebangs. |
2722 |
- python_fix_shebang "${D}" |
2723 |
- |
2724 |
- # Remove RedHat-specific stuff |
2725 |
- rm -rf "${D}"tmp || die |
2726 |
- |
2727 |
- # uncomment lines in xl.conf |
2728 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
2729 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
2730 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
2731 |
- -i tools/examples/xl.conf || die |
2732 |
- |
2733 |
- # Reset bash completion dir; Bug 472438 |
2734 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
2735 |
- |
2736 |
- if use doc; then |
2737 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
2738 |
- |
2739 |
- dohtml -r docs/ |
2740 |
- docinto pdf |
2741 |
- dodoc ${DOCS[@]} |
2742 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
2743 |
- fi |
2744 |
- |
2745 |
- rm -rf "${D}"/usr/share/doc/xen/ |
2746 |
- doman docs/man?/* |
2747 |
- |
2748 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
2749 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
2750 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
2751 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
2752 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
2753 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
2754 |
- newinitd "${FILESDIR}"/xencommons.initd xencommons |
2755 |
- newconfd "${FILESDIR}"/xencommons.confd xencommons |
2756 |
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev |
2757 |
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev |
2758 |
- |
2759 |
- if use screen; then |
2760 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
2761 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die |
2762 |
- keepdir /var/log/xen-consoles |
2763 |
- fi |
2764 |
- |
2765 |
- # Move files built with use qemu, Bug #477884 |
2766 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
2767 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
2768 |
- mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die |
2769 |
- fi |
2770 |
- |
2771 |
- # For -static-libs wrt Bug 384355 |
2772 |
- if ! use static-libs; then |
2773 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
2774 |
- fi |
2775 |
- |
2776 |
- # xend expects these to exist |
2777 |
- keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
2778 |
- |
2779 |
- # for xendomains |
2780 |
- keepdir /etc/xen/auto |
2781 |
- |
2782 |
- # Temp QA workaround |
2783 |
- dodir "$(udev_get_udevdir)" |
2784 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
2785 |
- rm -rf "${D}"/etc/udev |
2786 |
- |
2787 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
2788 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
2789 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
2790 |
-} |
2791 |
- |
2792 |
-pkg_postinst() { |
2793 |
- elog "Official Xen Guide and the offical wiki page:" |
2794 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
2795 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
2796 |
- elog "" |
2797 |
- elog "Recommended to utilise the xencommons script to config sytem At boot" |
2798 |
- elog "Add by use of rc-update on completion of the install" |
2799 |
- |
2800 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
2801 |
- echo |
2802 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
2803 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
2804 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
2805 |
- fi |
2806 |
- |
2807 |
- # TODO: we need to have the current Python slot here. |
2808 |
- if ! has_version "dev-lang/python[ncurses]"; then |
2809 |
- echo |
2810 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
2811 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
2812 |
- fi |
2813 |
- |
2814 |
- if has_version "sys-apps/iproute2[minimal]"; then |
2815 |
- echo |
2816 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
2817 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
2818 |
- fi |
2819 |
- |
2820 |
- if ! use hvm; then |
2821 |
- echo |
2822 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
2823 |
- elog "support enable the hvm use flag." |
2824 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
2825 |
- fi |
2826 |
- |
2827 |
- if use qemu; then |
2828 |
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" |
2829 |
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" |
2830 |
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
2831 |
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
2832 |
- fi |
2833 |
- |
2834 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
2835 |
- echo |
2836 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
2837 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
2838 |
- fi |
2839 |
-} |
2840 |
|
2841 |
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild |
2842 |
similarity index 95% |
2843 |
rename from app-emulation/xen-tools/xen-tools-4.4.0.ebuild |
2844 |
rename to app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild |
2845 |
index ca370a2..82cbce1 100644 |
2846 |
--- a/app-emulation/xen-tools/xen-tools-4.4.0.ebuild |
2847 |
+++ b/app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild |
2848 |
@@ -1,6 +1,6 @@ |
2849 |
# Copyright 1999-2014 Gentoo Foundation |
2850 |
# Distributed under the terms of the GNU General Public License v2 |
2851 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0.ebuild,v 1.3 2014/04/04 01:06:31 idella4 Exp $ |
2852 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild,v 1.1 2014/05/16 21:39:26 dlan Exp $ |
2853 |
|
2854 |
EAPI=5 |
2855 |
|
2856 |
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then |
2857 |
live_eclass="mercurial" |
2858 |
else |
2859 |
KEYWORDS="~amd64 ~arm -x86" |
2860 |
- UPSTREAM_VER= |
2861 |
+ UPSTREAM_VER=2 |
2862 |
GENTOO_VER= |
2863 |
|
2864 |
[[ -n ${UPSTREAM_VER} ]] && \ |
2865 |
@@ -42,11 +42,12 @@ SLOT="0" |
2866 |
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
2867 |
# >=dev-lang/ocaml-4 stable |
2868 |
# Masked in profiles/eapi-5-files instead |
2869 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs" |
2870 |
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-qemu" |
2871 |
|
2872 |
-REQUIRED_USE="hvm? ( qemu ) |
2873 |
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) ) |
2874 |
${PYTHON_REQUIRED_USE} |
2875 |
- pygrub? ( python )" |
2876 |
+ pygrub? ( python ) |
2877 |
+ qemu? ( !system-qemu )" |
2878 |
|
2879 |
COMMON_DEPEND=" |
2880 |
dev-libs/lzo:2 |
2881 |
@@ -68,7 +69,7 @@ DEPEND="${COMMON_DEPEND} |
2882 |
arm? ( >=sys-apps/dtc-1.4.0 ) |
2883 |
!arm? ( sys-devel/bin86 |
2884 |
sys-firmware/ipxe |
2885 |
- sys-firmware/seabios |
2886 |
+ >=sys-firmware/seabios-1.7.4 |
2887 |
sys-devel/dev86 |
2888 |
sys-power/iasl ) |
2889 |
dev-lang/perl |
2890 |
@@ -90,6 +91,7 @@ DEPEND="${COMMON_DEPEND} |
2891 |
hvm? ( x11-proto/xproto |
2892 |
!net-libs/libiscsi ) |
2893 |
qemu? ( x11-libs/pixman ) |
2894 |
+ system-qemu? ( app-emulation/qemu[xen] ) |
2895 |
ocaml? ( dev-ml/findlib |
2896 |
>=dev-lang/ocaml-4 )" |
2897 |
|
2898 |
@@ -104,7 +106,8 @@ RDEPEND="${COMMON_DEPEND} |
2899 |
|
2900 |
# hvmloader is used to bootstrap a fully virtualized kernel |
2901 |
# Approved by QA team in bug #144032 |
2902 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
2903 |
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader |
2904 |
+ usr/share/qemu-xen/qemu/s390-ccw.img" |
2905 |
|
2906 |
RESTRICT="test" |
2907 |
|
2908 |
@@ -116,12 +119,6 @@ pkg_setup() { |
2909 |
export "CONFIG_GCRYPT=y" |
2910 |
fi |
2911 |
|
2912 |
- if use qemu; then |
2913 |
- export "CONFIG_IOEMU=y" |
2914 |
- else |
2915 |
- export "CONFIG_IOEMU=n" |
2916 |
- fi |
2917 |
- |
2918 |
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
2919 |
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
2920 |
eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
2921 |
@@ -194,6 +191,9 @@ src_prepare() { |
2922 |
|
2923 |
epatch "${FILESDIR}"/${PN}-4.4-api-fix.patch |
2924 |
|
2925 |
+ # Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302 |
2926 |
+ epatch "${FILESDIR}"/${PN}-4-qemu-fix-po-collision.patch |
2927 |
+ |
2928 |
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
2929 |
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ |
2930 |
-i tools/firmware/Makefile || die |
2931 |
@@ -268,11 +268,13 @@ src_configure() { |
2932 |
--disable-xen \ |
2933 |
--enable-tools \ |
2934 |
--enable-docs \ |
2935 |
- --with-system-qemu \ |
2936 |
+ --disable-qemu-traditional \ |
2937 |
+ $(use_with system-qemu) \ |
2938 |
$(use_enable pam) \ |
2939 |
$(use_enable api xenapi) \ |
2940 |
$(use_enable ocaml ocamltools) \ |
2941 |
" |
2942 |
+ use qemu || myconf+=" --with-system-qemu" |
2943 |
econf ${myconf} |
2944 |
} |