1 |
commit: c803150580cc1faf88243e44ed711717aa7847f7 |
2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
3 |
AuthorDate: Sat Sep 9 00:06:20 2017 +0000 |
4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
5 |
CommitDate: Sat Sep 9 00:06:20 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/virtualization.git/commit/?id=c8031505 |
7 |
|
8 |
xen cleanup |
9 |
|
10 |
app-emulation/xen-pvgrub/Manifest | 6 - |
11 |
.../xen-pvgrub/files/newlib-implicits.patch | 149 ------- |
12 |
.../files/xen-4-CVE-2012-6075-XSA-41.patch | 39 -- |
13 |
.../xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch | 245 ------------ |
14 |
.../xen-pvgrub/files/xen-4.2.0-jserver.patch | 32 -- |
15 |
.../xen-pvgrub/files/xen-4.2.0-newlib.patch | 12 - |
16 |
app-emulation/xen-pvgrub/files/xen-4.2.2-CC.patch | 12 - |
17 |
.../xen-pvgrub/files/xen-4.2.2-externals.patch | 74 ---- |
18 |
app-emulation/xen-pvgrub/metadata.xml | 5 - |
19 |
app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild | 120 ------ |
20 |
app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild | 110 ----- |
21 |
app-emulation/xen-stubdom/Manifest | 6 - |
22 |
.../xen-stubdom/files/newlib-implicits.patch | 149 ------- |
23 |
.../files/xen-4-CVE-2012-6075-XSA-41.patch | 39 -- |
24 |
.../files/xen-4-fix_dotconfig-gcc.patch | 245 ------------ |
25 |
.../xen-stubdom/files/xen-4.2.0-jserver.patch | 32 -- |
26 |
app-emulation/xen-stubdom/files/xen-4.2.2-CC.patch | 12 - |
27 |
.../xen-stubdom/files/xen-4.2.2-externals.patch | 74 ---- |
28 |
app-emulation/xen-stubdom/metadata.xml | 16 - |
29 |
app-emulation/xen-stubdom/xen-stubdom-4.2.2.ebuild | 114 ------ |
30 |
app-emulation/xen-tools/Manifest | 6 - |
31 |
app-emulation/xen-tools/files/fix-gold-ld.patch | 14 - |
32 |
app-emulation/xen-tools/files/gentoo-patches.conf | 126 ++++++ |
33 |
app-emulation/xen-tools/files/ipxe-nopie.patch | 29 -- |
34 |
.../files/xen-4-CVE-2012-6075-XSA-41.patch | 39 -- |
35 |
.../xen-tools/files/xen-4-fix_dotconfig-gcc.patch | 245 ------------ |
36 |
.../xen-tools/files/xen-4.2-configsxp.patch | 24 -- |
37 |
.../xen-tools/files/xen-4.2.0-anti-download.patch | 28 -- |
38 |
.../xen-tools/files/xen-4.2.0-jserver.patch | 20 - |
39 |
.../xen-tools/files/xen-4.2.0-nostrip.patch | 37 -- |
40 |
.../xen-tools/files/xen-4.3-jserver.patch | 32 -- |
41 |
.../xen-tools/files/xen-4.4-nostrip.patch | 13 - |
42 |
.../xen-tools/files/xen-4.4-qemu-bridge.patch | 79 ---- |
43 |
.../xen-tools-3.4.0-network-bridge-broadcast.patch | 11 - |
44 |
.../xen-tools/files/xen-tools-4-docfix.patch | 12 - |
45 |
.../files/xen-tools-4-unbundle-ipxe.patch | 33 -- |
46 |
.../xen-tools/files/xen-tools-4.1.1-bridge.patch | 12 - |
47 |
.../xen-tools/files/xen-tools-4.3-ar-cc.patch | 84 ---- |
48 |
.../xen-tools/files/xen-tools-4.4-api-fix.patch | 48 --- |
49 |
.../xen-tools/files/xen-tools-9999-qemu.patch | 56 --- |
50 |
app-emulation/xen-tools/files/xencommons.initd | 3 +- |
51 |
app-emulation/xen-tools/files/xenconsoled.initd | 3 +- |
52 |
app-emulation/xen-tools/files/xend.initd-r2 | 52 --- |
53 |
app-emulation/xen-tools/files/xendomains.initd-r2 | 7 +- |
54 |
app-emulation/xen-tools/files/xenqemudev.initd | 9 +- |
55 |
app-emulation/xen-tools/files/xenstored.initd | 4 +- |
56 |
app-emulation/xen-tools/metadata.xml | 26 +- |
57 |
app-emulation/xen-tools/xen-tools-4.2.2.ebuild | 347 ---------------- |
58 |
app-emulation/xen-tools/xen-tools-4.3.0.ebuild | 381 ------------------ |
59 |
app-emulation/xen-tools/xen-tools-4.4.0.ebuild | 444 --------------------- |
60 |
app-emulation/xen-tools/xen-tools-9999.ebuild | 444 ++++++++++++--------- |
61 |
app-emulation/xen/Manifest | 3 - |
62 |
.../xen/files/xen-4-fix_dotconfig-gcc.patch | 37 -- |
63 |
app-emulation/xen/files/xen-4.2-efi.patch | 33 -- |
64 |
app-emulation/xen/files/xen-4.4-efi.patch | 23 -- |
65 |
app-emulation/xen/files/xen-4.6-efi.patch | 36 ++ |
66 |
app-emulation/xen/metadata.xml | 13 +- |
67 |
app-emulation/xen/xen-4.2.2.ebuild | 128 ------ |
68 |
app-emulation/xen/xen-4.3.0.ebuild | 130 ------ |
69 |
app-emulation/xen/xen-4.4.0.ebuild | 161 -------- |
70 |
app-emulation/xen/xen-9999.ebuild | 139 +++++-- |
71 |
61 files changed, 563 insertions(+), 4299 deletions(-) |
72 |
|
73 |
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest |
74 |
deleted file mode 100644 |
75 |
index 609c2d6..0000000 |
76 |
--- a/app-emulation/xen-pvgrub/Manifest |
77 |
+++ /dev/null |
78 |
@@ -1,6 +0,0 @@ |
79 |
-DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5 |
80 |
-DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d WHIRLPOOL 63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc |
81 |
-DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db |
82 |
-DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e |
83 |
-DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea |
84 |
-DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 |
85 |
|
86 |
diff --git a/app-emulation/xen-pvgrub/files/newlib-implicits.patch b/app-emulation/xen-pvgrub/files/newlib-implicits.patch |
87 |
deleted file mode 100644 |
88 |
index 73c0493..0000000 |
89 |
--- a/app-emulation/xen-pvgrub/files/newlib-implicits.patch |
90 |
+++ /dev/null |
91 |
@@ -1,149 +0,0 @@ |
92 |
-diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c |
93 |
---- newlib/libc/stdlib/wcstoull.c 2007-07-07 04:03:28.000000000 +0800 |
94 |
-+++ newlib/libc/stdlib/wcstoull.c 2012-12-02 14:19:40.905136553 +0800 |
95 |
-@@ -124,7 +124,7 @@ |
96 |
- #include <errno.h> |
97 |
- #include <stdlib.h> |
98 |
- #include <reent.h> |
99 |
-- |
100 |
-+#include <wchar.h> |
101 |
- #ifndef _REENT_ONLY |
102 |
- |
103 |
- unsigned long long |
104 |
-diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c |
105 |
-newlib-1.16.0/newlib/doc/makedoc.c |
106 |
---- newlib/doc/makedoc.c 2007-01-03 01:59:59.000000000 +0900 |
107 |
-+++ newlib/doc/makedoc.c 2012-12-02 16:53:42.700289294 +0800 |
108 |
-@@ -39,7 +39,7 @@ |
109 |
- #include <stdio.h> |
110 |
- #include <stdlib.h> |
111 |
- #include <ctype.h> |
112 |
-- |
113 |
-+#include <string.h> |
114 |
- #define DEF_SIZE 5000 |
115 |
- #define STACK 50 |
116 |
- |
117 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c |
118 |
---- newlib/libc/reent/lseek64r.c 2003-06-04 03:48:07.000000000 +0800 |
119 |
-+++ newlib/libc/reent/lseek64r.c 2012-12-02 18:29:45.435760985 +0800 |
120 |
-@@ -1,8 +1,8 @@ |
121 |
- /* Reentrant versions of lseek system call. */ |
122 |
- |
123 |
--#include <reent.h> |
124 |
-+#include "../include/reent.h" |
125 |
- #include <unistd.h> |
126 |
--#include <_syslist.h> |
127 |
-+#include "../include/_syslist.h" |
128 |
- |
129 |
- /* Some targets provides their own versions of this functions. Those |
130 |
- targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ |
131 |
-diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c |
132 |
---- newlib/libc/stdio64/fseeko64.c 2007-07-14 04:37:53.000000000 +0800 |
133 |
-+++ newlib/libc/stdio64/fseeko64.c 2012-12-02 18:26:29.955778906 +0800 |
134 |
-@@ -119,7 +119,7 @@ |
135 |
- ptr->_errno = EOVERFLOW; |
136 |
- return EOF; |
137 |
- } |
138 |
-- return (_off64_t) _fseeko_r (ptr, fp, offset, whence); |
139 |
-+ return (_off64_t) _fseeko64_r (ptr, fp, offset, whence); |
140 |
- } |
141 |
- |
142 |
- /* Make sure stdio is set up. */ |
143 |
- |
144 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c |
145 |
---- newlib/libc/reent/fstat64r.c 2012-12-03 13:17:26.569703981 +0800 |
146 |
-+++ newlib/libc/reent/fstat64r.c 2003-06-04 03:48:07.000000000 +0800 |
147 |
-@@ -1,10 +1,10 @@ |
148 |
- /* Reentrant versions of fstat system call. This implementation just |
149 |
- calls the fstat system call. */ |
150 |
- |
151 |
--#include <reent.h> |
152 |
-+#include "../include/reent.h"> |
153 |
- #include <unistd.h> |
154 |
- #include <sys/stat.h> |
155 |
--#include <_syslist.h> |
156 |
-+#include "../include/_syslist.h" |
157 |
- |
158 |
- #ifdef __LARGE64_FILES |
159 |
- |
160 |
-diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c |
161 |
---- libgloss/i386/cygmon-gmon.c 2002-10-26 03:18:46.000000000 +0800 |
162 |
-+++ libgloss/i386/cygmon-gmon.c 2012-12-03 14:38:41.454257066 +0800 |
163 |
-@@ -68,6 +68,9 @@ |
164 |
- |
165 |
- #include "cygmon-gmon.h" |
166 |
- |
167 |
-+#include <unistd.h> |
168 |
-+#include <stdlib.h> |
169 |
-+#include <strings.h> |
170 |
- /* |
171 |
- * froms is actually a bunch of unsigned shorts indexing tos |
172 |
- */ |
173 |
-@@ -78,6 +78,8 @@ |
174 |
- static char *s_lowpc = 0; |
175 |
- static char *s_highpc = 0; |
176 |
- static unsigned long s_textsize = 0; |
177 |
-+extern void profil_write(int, char*, int); |
178 |
-+extern int moncontrol (int); |
179 |
- |
180 |
- static int ssiz; |
181 |
- static char *sbuf; |
182 |
-diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h |
183 |
-newlib-1.16.0/newlib/libc/include/_syslist.h |
184 |
---- newlib/libc/include/_syslist.h 2005-08-23 05:13:35.000000000 +0800 |
185 |
-+++ newlib/libc/include/_syslist.h 2012-12-03 17:20:03.092369483 +0800 |
186 |
-@@ -2,6 +2,7 @@ |
187 |
- and only provide C names, so that we end up in violation of ANSI */ |
188 |
- #ifndef __SYSLIST_H |
189 |
- #define __SYSLIST_H |
190 |
-+#include <sys/types.h> |
191 |
- |
192 |
- #ifdef MISSING_SYSCALL_NAMES |
193 |
- #define _close close |
194 |
- |
195 |
-#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in |
196 |
-#--- newlib/libc/Makefile.in 2007-05-25 01:33:30.000000000 +0800 |
197 |
-#+++ newlib/libc/Makefile.in 2012-12-03 21:52:05.621873084 +0800 |
198 |
-diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c |
199 |
---- newlib/libc/stdio64/ftello64.c 2007-07-14 04:37:53.000000000 +0800 |
200 |
-+++ newlib/libc/stdio64/ftello64.c 2012-12-04 18:34:46.491509484 +0800 |
201 |
-@@ -93,7 +93,7 @@ |
202 |
- |
203 |
- /* Only do 64-bit tell on large file. */ |
204 |
- if (!(fp->_flags & __SL64)) |
205 |
-- return (_off64_t) _ftello_r (ptr, fp); |
206 |
-+ return (_off64_t) _ftello64_r (ptr, fp); |
207 |
- |
208 |
- /* Ensure stdio is set up. */ |
209 |
- |
210 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c |
211 |
---- newlib/libc/reent/open64r.c 2002-08-27 02:56:06.000000000 +0800 |
212 |
-+++ newlib/libc/reent/open64r.c 2012-12-04 20:06:10.044006769 +0800 |
213 |
-@@ -1,8 +1,8 @@ |
214 |
- /* Reentrant versions of open system call. */ |
215 |
- |
216 |
--#include <reent.h> |
217 |
-+#include "../include/reent.h"> |
218 |
- #include <unistd.h> |
219 |
--#include <fcntl.h> |
220 |
-+#include <sys/_default_fcntl.h> |
221 |
- #include <_syslist.h> |
222 |
- |
223 |
- #ifdef __LARGE64_FILES |
224 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c |
225 |
---- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800 |
226 |
-+++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800 |
227 |
-@@ -1,10 +1,10 @@ |
228 |
- /* Reentrant versions of syscalls need to support signal/raise. |
229 |
- These implementations just call the usual system calls. */ |
230 |
- |
231 |
--#include <reent.h> |
232 |
-+#include "../include/reent.h" |
233 |
- #include <signal.h> |
234 |
- #include <unistd.h> |
235 |
--#include <_syslist.h> |
236 |
-+#include "../include/_syslist.h" |
237 |
- |
238 |
- /* Some targets provides their own versions of these functions. Those |
239 |
- targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ |
240 |
- |
241 |
|
242 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4-CVE-2012-6075-XSA-41.patch b/app-emulation/xen-pvgrub/files/xen-4-CVE-2012-6075-XSA-41.patch |
243 |
deleted file mode 100644 |
244 |
index 7513ac3..0000000 |
245 |
--- a/app-emulation/xen-pvgrub/files/xen-4-CVE-2012-6075-XSA-41.patch |
246 |
+++ /dev/null |
247 |
@@ -1,39 +0,0 @@ |
248 |
-authorMichael Contreras <michael@×××××××.com> |
249 |
- Mon, 3 Dec 2012 04:11:22 +0000 (20:11 -0800) |
250 |
-committerAnthony Liguori <aliguori@××××××.com> |
251 |
- Mon, 3 Dec 2012 14:14:10 +0000 (08:14 -0600) |
252 |
- |
253 |
-The e1000_receive function for the e1000 needs to discard packets longer than |
254 |
-1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes |
255 |
-this behavior and allocates memory based on this assumption. |
256 |
- |
257 |
-Signed-off-by: Michael Contreras <michael@×××××××.com> |
258 |
-Signed-off-by: Anthony Liguori <aliguori@××××××.com> |
259 |
-hw/e1000.c |
260 |
- |
261 |
---- tools/qemu-xen/hw/e1000.c |
262 |
-+++ tools/qemu-xen/hw/e1000.c |
263 |
-@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); |
264 |
- #define PNPMMIO_SIZE 0x20000 |
265 |
- #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */ |
266 |
- |
267 |
-+/* this is the size past which hardware will drop packets when setting LPE=0 */ |
268 |
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522 |
269 |
-+ |
270 |
- /* |
271 |
- * HW models: |
272 |
- * E1000_DEV_ID_82540EM works with Windows and Linux |
273 |
-@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size) |
274 |
- size = sizeof(min_buf); |
275 |
- } |
276 |
- |
277 |
-+ /* Discard oversized packets if !LPE and !SBP. */ |
278 |
-+ if (size > MAXIMUM_ETHERNET_VLAN_SIZE |
279 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE) |
280 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { |
281 |
-+ return size; |
282 |
-+ } |
283 |
-+ |
284 |
- if (!receive_filter(s, buf, size)) |
285 |
- return size; |
286 |
- |
287 |
|
288 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch |
289 |
deleted file mode 100644 |
290 |
index 4e08a30..0000000 |
291 |
--- a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch |
292 |
+++ /dev/null |
293 |
@@ -1,245 +0,0 @@ |
294 |
-# Fix gcc-4.6 |
295 |
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk |
296 |
---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 |
297 |
-+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 |
298 |
-@@ -6,7 +6,7 @@ |
299 |
- |
300 |
- # Define some default flags. |
301 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
302 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
303 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
304 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
305 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
306 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
307 |
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile |
308 |
---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 |
309 |
-+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 |
310 |
-@@ -73,7 +73,7 @@ |
311 |
- |
312 |
- -include $(XEN_TARGET_ARCH)/Makefile |
313 |
- |
314 |
--CFLAGS += -Werror -Wmissing-prototypes |
315 |
-+CFLAGS += -Wmissing-prototypes |
316 |
- CFLAGS += -I. $(CFLAGS_xeninclude) |
317 |
- |
318 |
- # Needed for posix_fadvise64() in xc_linux.c |
319 |
-# Drop .config |
320 |
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk |
321 |
---- Config.mk 2012-09-17 18:23:12.000000000 +0800 |
322 |
-+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 |
323 |
-@@ -7,7 +7,6 @@ Drop .config |
324 |
- # fallback for older make |
325 |
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) |
326 |
- |
327 |
---include $(XEN_ROOT)/.config |
328 |
- |
329 |
- # A debug build of Xen and tools? |
330 |
- debug ?= n |
331 |
-@@ -24,7 +24,7 @@ |
332 |
- |
333 |
- # Tools to run on system hosting the build |
334 |
- HOSTCC = gcc |
335 |
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer |
336 |
-+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer |
337 |
- HOSTCFLAGS += -fno-strict-aliasing |
338 |
- |
339 |
- DISTDIR ?= $(XEN_ROOT)/dist |
340 |
-@@ -156,7 +156,7 @@ |
341 |
- |
342 |
- CFLAGS += -std=gnu99 |
343 |
- |
344 |
--CFLAGS += -Wall -Wstrict-prototypes |
345 |
-+CFLAGS += -Wstrict-prototypes |
346 |
- |
347 |
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' |
348 |
- # and is over-zealous with the printf format lint |
349 |
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile |
350 |
---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800 |
351 |
-+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800 |
352 |
-@@ -9,7 +9,7 @@ |
353 |
- LOCK_UTIL = lock-util |
354 |
- INST_DIR = $(SBINDIR) |
355 |
- |
356 |
--CFLAGS += -Werror -g |
357 |
-+CFLAGS += -g |
358 |
- CFLAGS += -Wno-unused |
359 |
- CFLAGS += -fno-strict-aliasing |
360 |
- CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers |
361 |
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk |
362 |
---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800 |
363 |
-+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800 |
364 |
-@@ -1,4 +1,4 @@ |
365 |
- include $(XEN_ROOT)/tools/Rules.mk |
366 |
- |
367 |
--CFLAGS += -Werror -Wmissing-prototypes |
368 |
-+CFLAGS += -Wmissing-prototypes |
369 |
- # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion |
370 |
-diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile |
371 |
---- tools/debugger/xenitp/Makefile 2012-12-17 23:00:22.000000000 +0800 |
372 |
-+++ tools/debugger/xenitp/Makefile 2013-01-30 12:31:43.516941098 +0800 |
373 |
-@@ -1,7 +1,7 @@ |
374 |
- XEN_ROOT=$(CURDIR)/../../.. |
375 |
- include $(XEN_ROOT)/tools/Rules.mk |
376 |
- |
377 |
--#CFLAGS += -Werror -g -O0 |
378 |
-+#CFLAGS += -g -O0 |
379 |
- |
380 |
- CFLAGS += $(CFLAGS_libxenctrl) |
381 |
- |
382 |
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile |
383 |
---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800 |
384 |
-+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800 |
385 |
-@@ -4,7 +4,7 @@ |
386 |
- HARNESS_SRCS:=main.c |
387 |
- # io_queue.c |
388 |
- |
389 |
--CFLAGS=-Wall -Werror -g -O -laio |
390 |
-+CFLAGS=-Wall -g -O -laio |
391 |
- #-lpthread -lrt |
392 |
- |
393 |
- all: $(PROGS) |
394 |
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk |
395 |
---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800 |
396 |
-+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
397 |
-@@ -1,7 +1,7 @@ |
398 |
- include $(XEN_ROOT)/tools/Rules.mk |
399 |
- |
400 |
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" |
401 |
--CFLAGS += -Werror -D_GNU_SOURCE |
402 |
-+CFLAGS += -D_GNU_SOURCE |
403 |
- LDFLAGS += -L../common/ |
404 |
- |
405 |
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) |
406 |
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile |
407 |
---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800 |
408 |
-+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800 |
409 |
-@@ -11,7 +11,7 @@ |
410 |
- XLUMAJOR = 1.0 |
411 |
- XLUMINOR = 1 |
412 |
- |
413 |
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ |
414 |
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ |
415 |
- -Wno-declaration-after-statement -Wformat-nonliteral |
416 |
- CFLAGS += -I. -fPIC |
417 |
- |
418 |
-diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile |
419 |
---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800 |
420 |
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800 |
421 |
-@@ -9,7 +9,7 @@ |
422 |
- |
423 |
- .PHONY : all clean build-all |
424 |
- |
425 |
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin |
426 |
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin |
427 |
- CFLAGS += -I$(SRC_PATH) |
428 |
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) |
429 |
- QEMU_CFLAGS = $(CFLAGS) |
430 |
-diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk |
431 |
---- tools/vtpm/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
432 |
-+++ tools/vtpm/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
433 |
-@@ -6,7 +6,7 @@ |
434 |
- # |
435 |
- |
436 |
- # General compiler flags |
437 |
--CFLAGS = -Werror -g3 |
438 |
-+CFLAGS = -g3 |
439 |
- |
440 |
- # Generic project files |
441 |
- HDRS = $(wildcard *.h) |
442 |
-diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk |
443 |
---- tools/vtpm_manager/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
444 |
-+++ tools/vtpm_manager/Rules.mk 2013-01-30 12:31:43.511941097 +0800 |
445 |
-@@ -6,7 +6,7 @@ |
446 |
- # |
447 |
- |
448 |
- # General compiler flags |
449 |
--CFLAGS = -Werror -g3 |
450 |
-+CFLAGS = -g3 |
451 |
- |
452 |
- # Generic project files |
453 |
- HDRS = $(wildcard *.h) |
454 |
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile |
455 |
---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800 |
456 |
-+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800 |
457 |
-@@ -18,7 +18,7 @@ |
458 |
- all install xentop: |
459 |
- else |
460 |
- |
461 |
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) |
462 |
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) |
463 |
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) |
464 |
- CFLAGS += -DHOST_$(XEN_OS) |
465 |
- |
466 |
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk |
467 |
---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
468 |
-+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800 |
469 |
-@@ -9,7 +9,7 @@ |
470 |
- HAS_DEVICE_TREE := y |
471 |
- |
472 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
473 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
474 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
475 |
- CFLAGS += -I$(BASEDIR)/include |
476 |
- |
477 |
- # Prevent floating-point variables from creeping into Xen. |
478 |
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk |
479 |
---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
480 |
-+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800 |
481 |
-@@ -24,7 +24,7 @@ |
482 |
- endif |
483 |
- |
484 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
485 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
486 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
487 |
- CFLAGS += -I$(BASEDIR)/include |
488 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic |
489 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default |
490 |
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile |
491 |
---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800 |
492 |
-+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800 |
493 |
-@@ -78,7 +78,7 @@ |
494 |
- all: headers.chk |
495 |
- |
496 |
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile |
497 |
-- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new |
498 |
-+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new |
499 |
- mv $@.new $@ |
500 |
- |
501 |
- endif |
502 |
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile |
503 |
---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800 |
504 |
-+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800 |
505 |
-@@ -1,7 +1,7 @@ |
506 |
- XEN_ROOT=$(CURDIR)/../../../.. |
507 |
- include $(XEN_ROOT)/tools/Rules.mk |
508 |
- |
509 |
--CFLAGS += -Werror |
510 |
-+CFLAGS += |
511 |
- CFLAGS += $(CFLAGS_libxenctrl) |
512 |
- CFLAGS += $(CFLAGS_libxenguest) |
513 |
- CFLAGS += $(CFLAGS_libxenstore) |
514 |
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile |
515 |
---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800 |
516 |
-+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800 |
517 |
-@@ -1,7 +1,7 @@ |
518 |
- XEN_ROOT=$(CURDIR)/../../.. |
519 |
- include $(XEN_ROOT)/tools/Rules.mk |
520 |
- |
521 |
--CFLAGS += -Werror |
522 |
-+CFLAGS += |
523 |
- |
524 |
- CFLAGS += $(CFLAGS_libxenctrl) |
525 |
- CFLAGS += $(CFLAGS_xeninclude) |
526 |
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile |
527 |
---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800 |
528 |
-+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800 |
529 |
-@@ -1,7 +1,7 @@ |
530 |
- XEN_ROOT=$(CURDIR)/../../.. |
531 |
- include $(XEN_ROOT)/tools/Rules.mk |
532 |
- |
533 |
--CFLAGS += -Werror |
534 |
-+CFLAGS += |
535 |
- |
536 |
- CFLAGS += $(CFLAGS_libxenctrl) |
537 |
- CFLAGS += $(CFLAGS_libxenguest) |
538 |
- |
539 |
|
540 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-jserver.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-jserver.patch |
541 |
deleted file mode 100644 |
542 |
index 514fd05..0000000 |
543 |
--- a/app-emulation/xen-pvgrub/files/xen-4.2.0-jserver.patch |
544 |
+++ /dev/null |
545 |
@@ -1,32 +0,0 @@ |
546 |
-diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile |
547 |
---- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 |
548 |
-+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 |
549 |
-@@ -14,13 +14,13 @@ |
550 |
- .PHONY: blowfish.h |
551 |
- blowfish.h: |
552 |
- rm -f blowfish.bin |
553 |
-- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all |
554 |
-+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all |
555 |
- (echo "static unsigned int blowfish32_code[] = {"; \ |
556 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
557 |
- echo "};") >$@ |
558 |
- rm -f blowfish.bin |
559 |
- ifeq ($(XEN_COMPILE_ARCH),x86_64) |
560 |
-- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all |
561 |
-+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all |
562 |
- (echo "static unsigned int blowfish64_code[] = {"; \ |
563 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
564 |
- echo "};") >>$@ |
565 |
- |
566 |
-diff -ur xen-4.2.0.orig/tools/firmware/vgabios/Makefile xen-4.2.0/tools/firmware/vgabios/Makefile |
567 |
---- tools/firmware/vgabios/Makefile 2013-02-04 13:56:50.973533544 +0800 |
568 |
-+++ tools/firmware/vgabios/Makefile 2013-02-04 13:57:21.380535958 +0800 |
569 |
-@@ -27,7 +27,7 @@ |
570 |
- |
571 |
- .PHONY: release |
572 |
- release: |
573 |
-- VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios |
574 |
-+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios |
575 |
- /bin/rm -f *.o *.s *.ld86 \ |
576 |
- temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#* |
577 |
- cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin |
578 |
|
579 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch |
580 |
deleted file mode 100644 |
581 |
index 6b184db..0000000 |
582 |
--- a/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch |
583 |
+++ /dev/null |
584 |
@@ -1,12 +0,0 @@ |
585 |
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile |
586 |
---- stubdom/Makefile 2012-12-05 08:01:01.480241322 +0800 |
587 |
-+++ stubdom/Makefile 2012-12-05 08:01:37.432238026 +0800 |
588 |
-@@ -101,6 +101,7 @@ |
589 |
- tar xzf $< |
590 |
- patch -d $@ -p0 < newlib.patch |
591 |
- patch -d $@ -p0 < newlib-chk.patch |
592 |
-+ patch -d $@ -p0 < newlib-implicits.patch |
593 |
- patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch |
594 |
- find $@ -type f | xargs perl -i.bak \ |
595 |
- -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' |
596 |
- |
597 |
|
598 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.2-CC.patch b/app-emulation/xen-pvgrub/files/xen-4.2.2-CC.patch |
599 |
deleted file mode 100644 |
600 |
index 9280e38..0000000 |
601 |
--- a/app-emulation/xen-pvgrub/files/xen-4.2.2-CC.patch |
602 |
+++ /dev/null |
603 |
@@ -1,12 +0,0 @@ |
604 |
-diff -ur xen-4.2.1.orig/stubdom/Makefile xen-4.2.1/stubdom/Makefile |
605 |
---- stubdom/Makefile 2012-12-17 23:00:06.000000000 +0800 |
606 |
-+++ stubdom/Makefile 2013-02-10 16:01:01.883644638 +0800 |
607 |
-@@ -130,7 +130,7 @@ |
608 |
- cross-zlib: $(ZLIB_STAMPFILE) |
609 |
- $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) |
610 |
- ( cd $< && \ |
611 |
-- CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ |
612 |
-+ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ |
613 |
- $(MAKE) DESTDIR= libz.a && \ |
614 |
- $(MAKE) DESTDIR= install ) |
615 |
- |
616 |
|
617 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.2-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.2-externals.patch |
618 |
deleted file mode 100644 |
619 |
index 2c3b1b7..0000000 |
620 |
--- a/app-emulation/xen-pvgrub/files/xen-4.2.2-externals.patch |
621 |
+++ /dev/null |
622 |
@@ -1,74 +0,0 @@ |
623 |
-# Patch Makefile to patch insource newlib, |
624 |
-# Prevent internal downloading of external packages |
625 |
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile |
626 |
---- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800 |
627 |
-+++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800 |
628 |
-@@ -95,12 +95,13 @@ |
629 |
- ############## |
630 |
- |
631 |
- newlib-$(NEWLIB_VERSION).tar.gz: |
632 |
-- $(WGET) $(NEWLIB_URL)/$@ |
633 |
-+# $(WGET) $(NEWLIB_URL)/$@ |
634 |
- |
635 |
- newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz |
636 |
- tar xzf $< |
637 |
- patch -d $@ -p0 < newlib.patch |
638 |
- patch -d $@ -p0 < newlib-chk.patch |
639 |
-+ patch -d $@ -p0 < newlib-implicits.patch |
640 |
- patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch |
641 |
- find $@ -type f | xargs perl -i.bak \ |
642 |
- -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' |
643 |
-@@ -110,7 +110,7 @@ |
644 |
- $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION) |
645 |
- mkdir -p newlib-$(XEN_TARGET_ARCH) |
646 |
- ( cd newlib-$(XEN_TARGET_ARCH) && \ |
647 |
-- CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ |
648 |
-+ CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ |
649 |
- $(MAKE) DESTDIR= && \ |
650 |
- $(MAKE) DESTDIR= install ) |
651 |
- |
652 |
-@@ -121,7 +122,7 @@ |
653 |
- ############ |
654 |
- |
655 |
- zlib-$(ZLIB_VERSION).tar.gz: |
656 |
-- $(WGET) $(ZLIB_URL)/$@ |
657 |
-+# $(WGET) $(ZLIB_URL)/$@ |
658 |
- |
659 |
- zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz |
660 |
- tar xzf $< |
661 |
-@@ -141,7 +142,7 @@ |
662 |
- ############## |
663 |
- |
664 |
- pciutils-$(LIBPCI_VERSION).tar.bz2: |
665 |
-- $(WGET) $(LIBPCI_URL)/$@ |
666 |
-+# $(WGET) $(LIBPCI_URL)/$@ |
667 |
- |
668 |
- pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2 |
669 |
- tar xjf $< |
670 |
-@@ -169,7 +170,7 @@ |
671 |
- ###### |
672 |
- |
673 |
- lwip-$(LWIP_VERSION).tar.gz: |
674 |
-- $(WGET) $(LWIP_URL)/$@ |
675 |
-+# $(WGET) $(LWIP_URL)/$@ |
676 |
- |
677 |
- lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz |
678 |
- tar xzf $< |
679 |
-@@ -325,7 +326,7 @@ |
680 |
- ###### |
681 |
- |
682 |
- grub-$(GRUB_VERSION).tar.gz: |
683 |
-- $(WGET) $(GRUB_URL)/$@ |
684 |
-+#$(WGET) $(GRUB_URL)/$@ |
685 |
- |
686 |
- grub-upstream: grub-$(GRUB_VERSION).tar.gz |
687 |
- tar xzf $< |
688 |
-@@ -392,7 +393,7 @@ |
689 |
- $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
690 |
- $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" |
691 |
- |
692 |
--install-grub: pv-grub |
693 |
-+install-grub: |
694 |
- $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
695 |
- $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" |
696 |
- |
697 |
|
698 |
diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml |
699 |
deleted file mode 100644 |
700 |
index cc9d568..0000000 |
701 |
--- a/app-emulation/xen-pvgrub/metadata.xml |
702 |
+++ /dev/null |
703 |
@@ -1,5 +0,0 @@ |
704 |
-<?xml version="1.0" encoding="UTF-8"?> |
705 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
706 |
-<pkgmetadata> |
707 |
-<herd>xen</herd> |
708 |
-</pkgmetadata> |
709 |
|
710 |
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild |
711 |
deleted file mode 100644 |
712 |
index 5fbd6de..0000000 |
713 |
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild |
714 |
+++ /dev/null |
715 |
@@ -1,120 +0,0 @@ |
716 |
-# Copyright 1999-2013 Gentoo Foundation |
717 |
-# Distributed under the terms of the GNU General Public License v2 |
718 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.3 2013/02/10 08:20:23 idella4 Exp $ |
719 |
- |
720 |
-EAPI=5 |
721 |
-PYTHON_DEPEND="2:2.6" |
722 |
- |
723 |
-inherit flag-o-matic eutils multilib python toolchain-funcs |
724 |
- |
725 |
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
726 |
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
727 |
-GRUB_URL=mirror://gnu-alpha/grub |
728 |
-# Todo: bump? change urls to real upstreams? |
729 |
-SRC_URI=" |
730 |
- http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
731 |
- $GRUB_URL/grub-0.97.tar.gz |
732 |
- $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz |
733 |
- $LIBPCI_URL/pciutils-2.2.9.tar.bz2 |
734 |
- $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz |
735 |
- $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz" |
736 |
- |
737 |
-S="${WORKDIR}/xen-${PV}" |
738 |
- |
739 |
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" |
740 |
-HOMEPAGE="http://xen.org/" |
741 |
-LICENSE="GPL-2" |
742 |
-SLOT="0" |
743 |
-KEYWORDS="~amd64 ~x86" |
744 |
-IUSE="custom-cflags" |
745 |
- |
746 |
-DEPEND="sys-devel/gettext" |
747 |
- |
748 |
-RDEPEND="~app-emulation/xen-${PV}" |
749 |
- |
750 |
-pkg_setup() { |
751 |
- python_set_active_version 2 |
752 |
- python_pkg_setup |
753 |
-} |
754 |
- |
755 |
-src_prepare() { |
756 |
- |
757 |
- # if the user *really* wants to use their own custom-cflags, let them |
758 |
- if use custom-cflags; then |
759 |
- einfo "User wants their own CFLAGS - removing defaults" |
760 |
- # try and remove all the default custom-cflags |
761 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
762 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
763 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
764 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
765 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
766 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
767 |
- -i {} \; |
768 |
- fi |
769 |
- |
770 |
- #Substitute for internal downloading |
771 |
- cp $DISTDIR/zlib-1.2.3.tar.gz \ |
772 |
- $DISTDIR/pciutils-2.2.9.tar.bz2 \ |
773 |
- $DISTDIR/lwip-1.3.0.tar.gz \ |
774 |
- $DISTDIR/newlib-1.16.0.tar.gz \ |
775 |
- $DISTDIR/grub-0.97.tar.gz \ |
776 |
- ./stubdom/ || die "files not coped to stubdom" |
777 |
- einfo "files copied to stubdom" |
778 |
- |
779 |
- # Patch the unmergeable newlib, fix most of the leftover gcc QA issues |
780 |
- cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
781 |
- |
782 |
- # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
783 |
- epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch |
784 |
- |
785 |
- # Drop .config and Fix gcc-4.6 |
786 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch |
787 |
- |
788 |
- # fix jobserver in Makefile |
789 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.0-jserver.patch |
790 |
- |
791 |
- #Sec patch |
792 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch |
793 |
- |
794 |
- # wrt Bug #455196 |
795 |
- epatch "${FILESDIR}"/${P/-pvgrub/}-CC.patch |
796 |
-} |
797 |
- |
798 |
-src_compile() { |
799 |
- use custom-cflags || unset CFLAGS |
800 |
- if test-flag-CC -fno-strict-overflow; then |
801 |
- append-flags -fno-strict-overflow |
802 |
- fi |
803 |
- |
804 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include |
805 |
- |
806 |
- if use x86; then |
807 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
808 |
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
809 |
- elif use amd64; then |
810 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" \ |
811 |
- XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub |
812 |
- if use multilib; then |
813 |
- multilib_toolchain_setup x86 |
814 |
- emake CC="$(tc-getCC)" XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
815 |
- fi |
816 |
- fi |
817 |
-} |
818 |
- |
819 |
-src_install() { |
820 |
- if use x86; then |
821 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
822 |
- fi |
823 |
- if use amd64; then |
824 |
- emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub |
825 |
- if use multilib; then |
826 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
827 |
- fi |
828 |
- fi |
829 |
-} |
830 |
- |
831 |
-pkg_postinst() { |
832 |
- elog "Official Xen Guide and the unoffical wiki page:" |
833 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
834 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
835 |
-} |
836 |
|
837 |
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild |
838 |
deleted file mode 100644 |
839 |
index c5d346b..0000000 |
840 |
--- a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild |
841 |
+++ /dev/null |
842 |
@@ -1,110 +0,0 @@ |
843 |
-# Copyright 1999-2013 Gentoo Foundation |
844 |
-# Distributed under the terms of the GNU General Public License v2 |
845 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild,v 1.4 2011/09/21 07:55:04 mgorny Exp $ |
846 |
- |
847 |
-EAPI="4" |
848 |
- |
849 |
-inherit flag-o-matic eutils multilib mercurial git-2 |
850 |
- |
851 |
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" |
852 |
-HOMEPAGE="http://xen.org/" |
853 |
-SRC_URI=" |
854 |
- http://downloads.sourceforge.net/project/libpng/zlib/1.2.3/zlib-1.2.3.tar.gz |
855 |
- http://download.savannah.gnu.org/releases/lwip/lwip-1.3.0.tar.gz |
856 |
- ftp://sources.redhat.com/pub/newlib/newlib-1.16.0.tar.gz |
857 |
- " |
858 |
-#'mirror://gnu-alpha/grub/grub-0.97.tar.gz' |
859 |
-#http://www.kernel.org/pub/software/utils/pciutils/pciutils-2.2.9.tar.bz2 |
860 |
- |
861 |
-MERC_REPO="xen-unstable.hg" |
862 |
-GIT_REPO="qemu-xen-unstable.git" |
863 |
- |
864 |
-EHG_REPO_URI="http://xenbits.xensource.com/${MERC_REPO}" |
865 |
-EGIT_REPO_URI="git://xenbits.xensource.com/${GIT_REPO}" |
866 |
- |
867 |
-S="${WORKDIR}/${MERC_REPO}" |
868 |
- |
869 |
-LICENSE="GPL-2" |
870 |
-SLOT="0" |
871 |
-KEYWORDS="" |
872 |
-IUSE="custom-cflags multilib" |
873 |
- |
874 |
-DEPEND="sys-devel/gettext |
875 |
- sys-devel/gcc" |
876 |
- |
877 |
-RDEPEND=">=app-emulation/xen-${PV}" |
878 |
- |
879 |
-pkg_setup() { |
880 |
- # use emerge to fetch qemu/ioemu |
881 |
- export "CONFIG_QEMU=${WORKDIR}/${GIT_REPO}" |
882 |
-} |
883 |
- |
884 |
-src_prepare() { |
885 |
- default_src_unpack |
886 |
- # unpack xen |
887 |
- mercurial_src_unpack |
888 |
- |
889 |
- local EGIT_COMMIT=$(sed -n -e "s/QEMU_TAG := \(.*\)/\1/p" "${S}"/Config.mk) |
890 |
- # unpack ioemu repos |
891 |
- local S=${WORKDIR}/${GIT_REPO} |
892 |
- local EGIT_NOUNPACK=1 |
893 |
- git-2_src_unpack |
894 |
- |
895 |
- # if the user *really* wants to use their own custom-cflags, let them |
896 |
- if use custom-cflags; then |
897 |
- einfo "User wants their own CFLAGS - removing defaults" |
898 |
- # try and remove all the default custom-cflags |
899 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
900 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
901 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
902 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
903 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
904 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
905 |
- -i {} \; || die |
906 |
- fi |
907 |
- |
908 |
- sed -i \ |
909 |
- -e 's/WGET=.*/WGET=cp -t . /' \ |
910 |
- -e "s;\$(XEN_EXTFILES_URL);${DISTDIR};" \ |
911 |
- -e 's/$(LD)/$(LD) LDFLAGS=/' \ |
912 |
- -e 's;install-grub: pv-grub;install-grub:;' \ |
913 |
- "${S}"/stubdom/Makefile || die |
914 |
-} |
915 |
- |
916 |
-src_compile() { |
917 |
- use custom-cflags || unset CFLAGS |
918 |
- if test-flag-CC -fno-strict-overflow; then |
919 |
- append-flags -fno-strict-overflow |
920 |
- fi |
921 |
- |
922 |
- emake -C tools/include |
923 |
- |
924 |
- if use x86; then |
925 |
- emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
926 |
- fi |
927 |
- if use amd64; then |
928 |
- emake XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub |
929 |
- if use multilib; then |
930 |
- multilib_toolchain_setup x86 |
931 |
- emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
932 |
- fi |
933 |
- fi |
934 |
-} |
935 |
- |
936 |
-src_install() { |
937 |
- if use x86; then |
938 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
939 |
- fi |
940 |
- if use amd64; then |
941 |
- emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub |
942 |
- if use multilib; then |
943 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
944 |
- fi |
945 |
- fi |
946 |
-} |
947 |
- |
948 |
-pkg_postinst() { |
949 |
- elog "Official Xen Guide and the unoffical wiki page:" |
950 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
951 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
952 |
-} |
953 |
|
954 |
diff --git a/app-emulation/xen-stubdom/Manifest b/app-emulation/xen-stubdom/Manifest |
955 |
deleted file mode 100644 |
956 |
index 609c2d6..0000000 |
957 |
--- a/app-emulation/xen-stubdom/Manifest |
958 |
+++ /dev/null |
959 |
@@ -1,6 +0,0 @@ |
960 |
-DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5 |
961 |
-DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d WHIRLPOOL 63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc |
962 |
-DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db |
963 |
-DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e |
964 |
-DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea |
965 |
-DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 |
966 |
|
967 |
diff --git a/app-emulation/xen-stubdom/files/newlib-implicits.patch b/app-emulation/xen-stubdom/files/newlib-implicits.patch |
968 |
deleted file mode 100644 |
969 |
index 73c0493..0000000 |
970 |
--- a/app-emulation/xen-stubdom/files/newlib-implicits.patch |
971 |
+++ /dev/null |
972 |
@@ -1,149 +0,0 @@ |
973 |
-diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c |
974 |
---- newlib/libc/stdlib/wcstoull.c 2007-07-07 04:03:28.000000000 +0800 |
975 |
-+++ newlib/libc/stdlib/wcstoull.c 2012-12-02 14:19:40.905136553 +0800 |
976 |
-@@ -124,7 +124,7 @@ |
977 |
- #include <errno.h> |
978 |
- #include <stdlib.h> |
979 |
- #include <reent.h> |
980 |
-- |
981 |
-+#include <wchar.h> |
982 |
- #ifndef _REENT_ONLY |
983 |
- |
984 |
- unsigned long long |
985 |
-diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c |
986 |
-newlib-1.16.0/newlib/doc/makedoc.c |
987 |
---- newlib/doc/makedoc.c 2007-01-03 01:59:59.000000000 +0900 |
988 |
-+++ newlib/doc/makedoc.c 2012-12-02 16:53:42.700289294 +0800 |
989 |
-@@ -39,7 +39,7 @@ |
990 |
- #include <stdio.h> |
991 |
- #include <stdlib.h> |
992 |
- #include <ctype.h> |
993 |
-- |
994 |
-+#include <string.h> |
995 |
- #define DEF_SIZE 5000 |
996 |
- #define STACK 50 |
997 |
- |
998 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c |
999 |
---- newlib/libc/reent/lseek64r.c 2003-06-04 03:48:07.000000000 +0800 |
1000 |
-+++ newlib/libc/reent/lseek64r.c 2012-12-02 18:29:45.435760985 +0800 |
1001 |
-@@ -1,8 +1,8 @@ |
1002 |
- /* Reentrant versions of lseek system call. */ |
1003 |
- |
1004 |
--#include <reent.h> |
1005 |
-+#include "../include/reent.h" |
1006 |
- #include <unistd.h> |
1007 |
--#include <_syslist.h> |
1008 |
-+#include "../include/_syslist.h" |
1009 |
- |
1010 |
- /* Some targets provides their own versions of this functions. Those |
1011 |
- targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ |
1012 |
-diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c |
1013 |
---- newlib/libc/stdio64/fseeko64.c 2007-07-14 04:37:53.000000000 +0800 |
1014 |
-+++ newlib/libc/stdio64/fseeko64.c 2012-12-02 18:26:29.955778906 +0800 |
1015 |
-@@ -119,7 +119,7 @@ |
1016 |
- ptr->_errno = EOVERFLOW; |
1017 |
- return EOF; |
1018 |
- } |
1019 |
-- return (_off64_t) _fseeko_r (ptr, fp, offset, whence); |
1020 |
-+ return (_off64_t) _fseeko64_r (ptr, fp, offset, whence); |
1021 |
- } |
1022 |
- |
1023 |
- /* Make sure stdio is set up. */ |
1024 |
- |
1025 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c |
1026 |
---- newlib/libc/reent/fstat64r.c 2012-12-03 13:17:26.569703981 +0800 |
1027 |
-+++ newlib/libc/reent/fstat64r.c 2003-06-04 03:48:07.000000000 +0800 |
1028 |
-@@ -1,10 +1,10 @@ |
1029 |
- /* Reentrant versions of fstat system call. This implementation just |
1030 |
- calls the fstat system call. */ |
1031 |
- |
1032 |
--#include <reent.h> |
1033 |
-+#include "../include/reent.h"> |
1034 |
- #include <unistd.h> |
1035 |
- #include <sys/stat.h> |
1036 |
--#include <_syslist.h> |
1037 |
-+#include "../include/_syslist.h" |
1038 |
- |
1039 |
- #ifdef __LARGE64_FILES |
1040 |
- |
1041 |
-diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c |
1042 |
---- libgloss/i386/cygmon-gmon.c 2002-10-26 03:18:46.000000000 +0800 |
1043 |
-+++ libgloss/i386/cygmon-gmon.c 2012-12-03 14:38:41.454257066 +0800 |
1044 |
-@@ -68,6 +68,9 @@ |
1045 |
- |
1046 |
- #include "cygmon-gmon.h" |
1047 |
- |
1048 |
-+#include <unistd.h> |
1049 |
-+#include <stdlib.h> |
1050 |
-+#include <strings.h> |
1051 |
- /* |
1052 |
- * froms is actually a bunch of unsigned shorts indexing tos |
1053 |
- */ |
1054 |
-@@ -78,6 +78,8 @@ |
1055 |
- static char *s_lowpc = 0; |
1056 |
- static char *s_highpc = 0; |
1057 |
- static unsigned long s_textsize = 0; |
1058 |
-+extern void profil_write(int, char*, int); |
1059 |
-+extern int moncontrol (int); |
1060 |
- |
1061 |
- static int ssiz; |
1062 |
- static char *sbuf; |
1063 |
-diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h |
1064 |
-newlib-1.16.0/newlib/libc/include/_syslist.h |
1065 |
---- newlib/libc/include/_syslist.h 2005-08-23 05:13:35.000000000 +0800 |
1066 |
-+++ newlib/libc/include/_syslist.h 2012-12-03 17:20:03.092369483 +0800 |
1067 |
-@@ -2,6 +2,7 @@ |
1068 |
- and only provide C names, so that we end up in violation of ANSI */ |
1069 |
- #ifndef __SYSLIST_H |
1070 |
- #define __SYSLIST_H |
1071 |
-+#include <sys/types.h> |
1072 |
- |
1073 |
- #ifdef MISSING_SYSCALL_NAMES |
1074 |
- #define _close close |
1075 |
- |
1076 |
-#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in |
1077 |
-#--- newlib/libc/Makefile.in 2007-05-25 01:33:30.000000000 +0800 |
1078 |
-#+++ newlib/libc/Makefile.in 2012-12-03 21:52:05.621873084 +0800 |
1079 |
-diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c |
1080 |
---- newlib/libc/stdio64/ftello64.c 2007-07-14 04:37:53.000000000 +0800 |
1081 |
-+++ newlib/libc/stdio64/ftello64.c 2012-12-04 18:34:46.491509484 +0800 |
1082 |
-@@ -93,7 +93,7 @@ |
1083 |
- |
1084 |
- /* Only do 64-bit tell on large file. */ |
1085 |
- if (!(fp->_flags & __SL64)) |
1086 |
-- return (_off64_t) _ftello_r (ptr, fp); |
1087 |
-+ return (_off64_t) _ftello64_r (ptr, fp); |
1088 |
- |
1089 |
- /* Ensure stdio is set up. */ |
1090 |
- |
1091 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c |
1092 |
---- newlib/libc/reent/open64r.c 2002-08-27 02:56:06.000000000 +0800 |
1093 |
-+++ newlib/libc/reent/open64r.c 2012-12-04 20:06:10.044006769 +0800 |
1094 |
-@@ -1,8 +1,8 @@ |
1095 |
- /* Reentrant versions of open system call. */ |
1096 |
- |
1097 |
--#include <reent.h> |
1098 |
-+#include "../include/reent.h"> |
1099 |
- #include <unistd.h> |
1100 |
--#include <fcntl.h> |
1101 |
-+#include <sys/_default_fcntl.h> |
1102 |
- #include <_syslist.h> |
1103 |
- |
1104 |
- #ifdef __LARGE64_FILES |
1105 |
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c |
1106 |
---- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800 |
1107 |
-+++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800 |
1108 |
-@@ -1,10 +1,10 @@ |
1109 |
- /* Reentrant versions of syscalls need to support signal/raise. |
1110 |
- These implementations just call the usual system calls. */ |
1111 |
- |
1112 |
--#include <reent.h> |
1113 |
-+#include "../include/reent.h" |
1114 |
- #include <signal.h> |
1115 |
- #include <unistd.h> |
1116 |
--#include <_syslist.h> |
1117 |
-+#include "../include/_syslist.h" |
1118 |
- |
1119 |
- /* Some targets provides their own versions of these functions. Those |
1120 |
- targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ |
1121 |
- |
1122 |
|
1123 |
diff --git a/app-emulation/xen-stubdom/files/xen-4-CVE-2012-6075-XSA-41.patch b/app-emulation/xen-stubdom/files/xen-4-CVE-2012-6075-XSA-41.patch |
1124 |
deleted file mode 100644 |
1125 |
index 7513ac3..0000000 |
1126 |
--- a/app-emulation/xen-stubdom/files/xen-4-CVE-2012-6075-XSA-41.patch |
1127 |
+++ /dev/null |
1128 |
@@ -1,39 +0,0 @@ |
1129 |
-authorMichael Contreras <michael@×××××××.com> |
1130 |
- Mon, 3 Dec 2012 04:11:22 +0000 (20:11 -0800) |
1131 |
-committerAnthony Liguori <aliguori@××××××.com> |
1132 |
- Mon, 3 Dec 2012 14:14:10 +0000 (08:14 -0600) |
1133 |
- |
1134 |
-The e1000_receive function for the e1000 needs to discard packets longer than |
1135 |
-1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes |
1136 |
-this behavior and allocates memory based on this assumption. |
1137 |
- |
1138 |
-Signed-off-by: Michael Contreras <michael@×××××××.com> |
1139 |
-Signed-off-by: Anthony Liguori <aliguori@××××××.com> |
1140 |
-hw/e1000.c |
1141 |
- |
1142 |
---- tools/qemu-xen/hw/e1000.c |
1143 |
-+++ tools/qemu-xen/hw/e1000.c |
1144 |
-@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); |
1145 |
- #define PNPMMIO_SIZE 0x20000 |
1146 |
- #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */ |
1147 |
- |
1148 |
-+/* this is the size past which hardware will drop packets when setting LPE=0 */ |
1149 |
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522 |
1150 |
-+ |
1151 |
- /* |
1152 |
- * HW models: |
1153 |
- * E1000_DEV_ID_82540EM works with Windows and Linux |
1154 |
-@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size) |
1155 |
- size = sizeof(min_buf); |
1156 |
- } |
1157 |
- |
1158 |
-+ /* Discard oversized packets if !LPE and !SBP. */ |
1159 |
-+ if (size > MAXIMUM_ETHERNET_VLAN_SIZE |
1160 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE) |
1161 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { |
1162 |
-+ return size; |
1163 |
-+ } |
1164 |
-+ |
1165 |
- if (!receive_filter(s, buf, size)) |
1166 |
- return size; |
1167 |
- |
1168 |
|
1169 |
diff --git a/app-emulation/xen-stubdom/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-stubdom/files/xen-4-fix_dotconfig-gcc.patch |
1170 |
deleted file mode 100644 |
1171 |
index 4e08a30..0000000 |
1172 |
--- a/app-emulation/xen-stubdom/files/xen-4-fix_dotconfig-gcc.patch |
1173 |
+++ /dev/null |
1174 |
@@ -1,245 +0,0 @@ |
1175 |
-# Fix gcc-4.6 |
1176 |
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk |
1177 |
---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 |
1178 |
-+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 |
1179 |
-@@ -6,7 +6,7 @@ |
1180 |
- |
1181 |
- # Define some default flags. |
1182 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
1183 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
1184 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
1185 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
1186 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
1187 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
1188 |
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile |
1189 |
---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 |
1190 |
-+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 |
1191 |
-@@ -73,7 +73,7 @@ |
1192 |
- |
1193 |
- -include $(XEN_TARGET_ARCH)/Makefile |
1194 |
- |
1195 |
--CFLAGS += -Werror -Wmissing-prototypes |
1196 |
-+CFLAGS += -Wmissing-prototypes |
1197 |
- CFLAGS += -I. $(CFLAGS_xeninclude) |
1198 |
- |
1199 |
- # Needed for posix_fadvise64() in xc_linux.c |
1200 |
-# Drop .config |
1201 |
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk |
1202 |
---- Config.mk 2012-09-17 18:23:12.000000000 +0800 |
1203 |
-+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 |
1204 |
-@@ -7,7 +7,6 @@ Drop .config |
1205 |
- # fallback for older make |
1206 |
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) |
1207 |
- |
1208 |
---include $(XEN_ROOT)/.config |
1209 |
- |
1210 |
- # A debug build of Xen and tools? |
1211 |
- debug ?= n |
1212 |
-@@ -24,7 +24,7 @@ |
1213 |
- |
1214 |
- # Tools to run on system hosting the build |
1215 |
- HOSTCC = gcc |
1216 |
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer |
1217 |
-+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer |
1218 |
- HOSTCFLAGS += -fno-strict-aliasing |
1219 |
- |
1220 |
- DISTDIR ?= $(XEN_ROOT)/dist |
1221 |
-@@ -156,7 +156,7 @@ |
1222 |
- |
1223 |
- CFLAGS += -std=gnu99 |
1224 |
- |
1225 |
--CFLAGS += -Wall -Wstrict-prototypes |
1226 |
-+CFLAGS += -Wstrict-prototypes |
1227 |
- |
1228 |
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' |
1229 |
- # and is over-zealous with the printf format lint |
1230 |
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile |
1231 |
---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800 |
1232 |
-+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800 |
1233 |
-@@ -9,7 +9,7 @@ |
1234 |
- LOCK_UTIL = lock-util |
1235 |
- INST_DIR = $(SBINDIR) |
1236 |
- |
1237 |
--CFLAGS += -Werror -g |
1238 |
-+CFLAGS += -g |
1239 |
- CFLAGS += -Wno-unused |
1240 |
- CFLAGS += -fno-strict-aliasing |
1241 |
- CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers |
1242 |
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk |
1243 |
---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800 |
1244 |
-+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800 |
1245 |
-@@ -1,4 +1,4 @@ |
1246 |
- include $(XEN_ROOT)/tools/Rules.mk |
1247 |
- |
1248 |
--CFLAGS += -Werror -Wmissing-prototypes |
1249 |
-+CFLAGS += -Wmissing-prototypes |
1250 |
- # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion |
1251 |
-diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile |
1252 |
---- tools/debugger/xenitp/Makefile 2012-12-17 23:00:22.000000000 +0800 |
1253 |
-+++ tools/debugger/xenitp/Makefile 2013-01-30 12:31:43.516941098 +0800 |
1254 |
-@@ -1,7 +1,7 @@ |
1255 |
- XEN_ROOT=$(CURDIR)/../../.. |
1256 |
- include $(XEN_ROOT)/tools/Rules.mk |
1257 |
- |
1258 |
--#CFLAGS += -Werror -g -O0 |
1259 |
-+#CFLAGS += -g -O0 |
1260 |
- |
1261 |
- CFLAGS += $(CFLAGS_libxenctrl) |
1262 |
- |
1263 |
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile |
1264 |
---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800 |
1265 |
-+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800 |
1266 |
-@@ -4,7 +4,7 @@ |
1267 |
- HARNESS_SRCS:=main.c |
1268 |
- # io_queue.c |
1269 |
- |
1270 |
--CFLAGS=-Wall -Werror -g -O -laio |
1271 |
-+CFLAGS=-Wall -g -O -laio |
1272 |
- #-lpthread -lrt |
1273 |
- |
1274 |
- all: $(PROGS) |
1275 |
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk |
1276 |
---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800 |
1277 |
-+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
1278 |
-@@ -1,7 +1,7 @@ |
1279 |
- include $(XEN_ROOT)/tools/Rules.mk |
1280 |
- |
1281 |
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" |
1282 |
--CFLAGS += -Werror -D_GNU_SOURCE |
1283 |
-+CFLAGS += -D_GNU_SOURCE |
1284 |
- LDFLAGS += -L../common/ |
1285 |
- |
1286 |
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) |
1287 |
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile |
1288 |
---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800 |
1289 |
-+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800 |
1290 |
-@@ -11,7 +11,7 @@ |
1291 |
- XLUMAJOR = 1.0 |
1292 |
- XLUMINOR = 1 |
1293 |
- |
1294 |
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ |
1295 |
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ |
1296 |
- -Wno-declaration-after-statement -Wformat-nonliteral |
1297 |
- CFLAGS += -I. -fPIC |
1298 |
- |
1299 |
-diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile |
1300 |
---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800 |
1301 |
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800 |
1302 |
-@@ -9,7 +9,7 @@ |
1303 |
- |
1304 |
- .PHONY : all clean build-all |
1305 |
- |
1306 |
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin |
1307 |
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin |
1308 |
- CFLAGS += -I$(SRC_PATH) |
1309 |
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) |
1310 |
- QEMU_CFLAGS = $(CFLAGS) |
1311 |
-diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk |
1312 |
---- tools/vtpm/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
1313 |
-+++ tools/vtpm/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
1314 |
-@@ -6,7 +6,7 @@ |
1315 |
- # |
1316 |
- |
1317 |
- # General compiler flags |
1318 |
--CFLAGS = -Werror -g3 |
1319 |
-+CFLAGS = -g3 |
1320 |
- |
1321 |
- # Generic project files |
1322 |
- HDRS = $(wildcard *.h) |
1323 |
-diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk |
1324 |
---- tools/vtpm_manager/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
1325 |
-+++ tools/vtpm_manager/Rules.mk 2013-01-30 12:31:43.511941097 +0800 |
1326 |
-@@ -6,7 +6,7 @@ |
1327 |
- # |
1328 |
- |
1329 |
- # General compiler flags |
1330 |
--CFLAGS = -Werror -g3 |
1331 |
-+CFLAGS = -g3 |
1332 |
- |
1333 |
- # Generic project files |
1334 |
- HDRS = $(wildcard *.h) |
1335 |
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile |
1336 |
---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800 |
1337 |
-+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800 |
1338 |
-@@ -18,7 +18,7 @@ |
1339 |
- all install xentop: |
1340 |
- else |
1341 |
- |
1342 |
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) |
1343 |
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) |
1344 |
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) |
1345 |
- CFLAGS += -DHOST_$(XEN_OS) |
1346 |
- |
1347 |
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk |
1348 |
---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
1349 |
-+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800 |
1350 |
-@@ -9,7 +9,7 @@ |
1351 |
- HAS_DEVICE_TREE := y |
1352 |
- |
1353 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
1354 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
1355 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
1356 |
- CFLAGS += -I$(BASEDIR)/include |
1357 |
- |
1358 |
- # Prevent floating-point variables from creeping into Xen. |
1359 |
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk |
1360 |
---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
1361 |
-+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800 |
1362 |
-@@ -24,7 +24,7 @@ |
1363 |
- endif |
1364 |
- |
1365 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
1366 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
1367 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
1368 |
- CFLAGS += -I$(BASEDIR)/include |
1369 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic |
1370 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default |
1371 |
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile |
1372 |
---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800 |
1373 |
-+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800 |
1374 |
-@@ -78,7 +78,7 @@ |
1375 |
- all: headers.chk |
1376 |
- |
1377 |
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile |
1378 |
-- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new |
1379 |
-+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new |
1380 |
- mv $@.new $@ |
1381 |
- |
1382 |
- endif |
1383 |
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile |
1384 |
---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800 |
1385 |
-+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800 |
1386 |
-@@ -1,7 +1,7 @@ |
1387 |
- XEN_ROOT=$(CURDIR)/../../../.. |
1388 |
- include $(XEN_ROOT)/tools/Rules.mk |
1389 |
- |
1390 |
--CFLAGS += -Werror |
1391 |
-+CFLAGS += |
1392 |
- CFLAGS += $(CFLAGS_libxenctrl) |
1393 |
- CFLAGS += $(CFLAGS_libxenguest) |
1394 |
- CFLAGS += $(CFLAGS_libxenstore) |
1395 |
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile |
1396 |
---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800 |
1397 |
-+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800 |
1398 |
-@@ -1,7 +1,7 @@ |
1399 |
- XEN_ROOT=$(CURDIR)/../../.. |
1400 |
- include $(XEN_ROOT)/tools/Rules.mk |
1401 |
- |
1402 |
--CFLAGS += -Werror |
1403 |
-+CFLAGS += |
1404 |
- |
1405 |
- CFLAGS += $(CFLAGS_libxenctrl) |
1406 |
- CFLAGS += $(CFLAGS_xeninclude) |
1407 |
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile |
1408 |
---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800 |
1409 |
-+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800 |
1410 |
-@@ -1,7 +1,7 @@ |
1411 |
- XEN_ROOT=$(CURDIR)/../../.. |
1412 |
- include $(XEN_ROOT)/tools/Rules.mk |
1413 |
- |
1414 |
--CFLAGS += -Werror |
1415 |
-+CFLAGS += |
1416 |
- |
1417 |
- CFLAGS += $(CFLAGS_libxenctrl) |
1418 |
- CFLAGS += $(CFLAGS_libxenguest) |
1419 |
- |
1420 |
|
1421 |
diff --git a/app-emulation/xen-stubdom/files/xen-4.2.0-jserver.patch b/app-emulation/xen-stubdom/files/xen-4.2.0-jserver.patch |
1422 |
deleted file mode 100644 |
1423 |
index 514fd05..0000000 |
1424 |
--- a/app-emulation/xen-stubdom/files/xen-4.2.0-jserver.patch |
1425 |
+++ /dev/null |
1426 |
@@ -1,32 +0,0 @@ |
1427 |
-diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile |
1428 |
---- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 |
1429 |
-+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 |
1430 |
-@@ -14,13 +14,13 @@ |
1431 |
- .PHONY: blowfish.h |
1432 |
- blowfish.h: |
1433 |
- rm -f blowfish.bin |
1434 |
-- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all |
1435 |
-+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all |
1436 |
- (echo "static unsigned int blowfish32_code[] = {"; \ |
1437 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
1438 |
- echo "};") >$@ |
1439 |
- rm -f blowfish.bin |
1440 |
- ifeq ($(XEN_COMPILE_ARCH),x86_64) |
1441 |
-- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all |
1442 |
-+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all |
1443 |
- (echo "static unsigned int blowfish64_code[] = {"; \ |
1444 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
1445 |
- echo "};") >>$@ |
1446 |
- |
1447 |
-diff -ur xen-4.2.0.orig/tools/firmware/vgabios/Makefile xen-4.2.0/tools/firmware/vgabios/Makefile |
1448 |
---- tools/firmware/vgabios/Makefile 2013-02-04 13:56:50.973533544 +0800 |
1449 |
-+++ tools/firmware/vgabios/Makefile 2013-02-04 13:57:21.380535958 +0800 |
1450 |
-@@ -27,7 +27,7 @@ |
1451 |
- |
1452 |
- .PHONY: release |
1453 |
- release: |
1454 |
-- VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios |
1455 |
-+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios |
1456 |
- /bin/rm -f *.o *.s *.ld86 \ |
1457 |
- temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#* |
1458 |
- cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin |
1459 |
|
1460 |
diff --git a/app-emulation/xen-stubdom/files/xen-4.2.2-CC.patch b/app-emulation/xen-stubdom/files/xen-4.2.2-CC.patch |
1461 |
deleted file mode 100644 |
1462 |
index 9280e38..0000000 |
1463 |
--- a/app-emulation/xen-stubdom/files/xen-4.2.2-CC.patch |
1464 |
+++ /dev/null |
1465 |
@@ -1,12 +0,0 @@ |
1466 |
-diff -ur xen-4.2.1.orig/stubdom/Makefile xen-4.2.1/stubdom/Makefile |
1467 |
---- stubdom/Makefile 2012-12-17 23:00:06.000000000 +0800 |
1468 |
-+++ stubdom/Makefile 2013-02-10 16:01:01.883644638 +0800 |
1469 |
-@@ -130,7 +130,7 @@ |
1470 |
- cross-zlib: $(ZLIB_STAMPFILE) |
1471 |
- $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) |
1472 |
- ( cd $< && \ |
1473 |
-- CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ |
1474 |
-+ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ |
1475 |
- $(MAKE) DESTDIR= libz.a && \ |
1476 |
- $(MAKE) DESTDIR= install ) |
1477 |
- |
1478 |
|
1479 |
diff --git a/app-emulation/xen-stubdom/files/xen-4.2.2-externals.patch b/app-emulation/xen-stubdom/files/xen-4.2.2-externals.patch |
1480 |
deleted file mode 100644 |
1481 |
index 2c3b1b7..0000000 |
1482 |
--- a/app-emulation/xen-stubdom/files/xen-4.2.2-externals.patch |
1483 |
+++ /dev/null |
1484 |
@@ -1,74 +0,0 @@ |
1485 |
-# Patch Makefile to patch insource newlib, |
1486 |
-# Prevent internal downloading of external packages |
1487 |
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile |
1488 |
---- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800 |
1489 |
-+++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800 |
1490 |
-@@ -95,12 +95,13 @@ |
1491 |
- ############## |
1492 |
- |
1493 |
- newlib-$(NEWLIB_VERSION).tar.gz: |
1494 |
-- $(WGET) $(NEWLIB_URL)/$@ |
1495 |
-+# $(WGET) $(NEWLIB_URL)/$@ |
1496 |
- |
1497 |
- newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz |
1498 |
- tar xzf $< |
1499 |
- patch -d $@ -p0 < newlib.patch |
1500 |
- patch -d $@ -p0 < newlib-chk.patch |
1501 |
-+ patch -d $@ -p0 < newlib-implicits.patch |
1502 |
- patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch |
1503 |
- find $@ -type f | xargs perl -i.bak \ |
1504 |
- -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' |
1505 |
-@@ -110,7 +110,7 @@ |
1506 |
- $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION) |
1507 |
- mkdir -p newlib-$(XEN_TARGET_ARCH) |
1508 |
- ( cd newlib-$(XEN_TARGET_ARCH) && \ |
1509 |
-- CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ |
1510 |
-+ CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ |
1511 |
- $(MAKE) DESTDIR= && \ |
1512 |
- $(MAKE) DESTDIR= install ) |
1513 |
- |
1514 |
-@@ -121,7 +122,7 @@ |
1515 |
- ############ |
1516 |
- |
1517 |
- zlib-$(ZLIB_VERSION).tar.gz: |
1518 |
-- $(WGET) $(ZLIB_URL)/$@ |
1519 |
-+# $(WGET) $(ZLIB_URL)/$@ |
1520 |
- |
1521 |
- zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz |
1522 |
- tar xzf $< |
1523 |
-@@ -141,7 +142,7 @@ |
1524 |
- ############## |
1525 |
- |
1526 |
- pciutils-$(LIBPCI_VERSION).tar.bz2: |
1527 |
-- $(WGET) $(LIBPCI_URL)/$@ |
1528 |
-+# $(WGET) $(LIBPCI_URL)/$@ |
1529 |
- |
1530 |
- pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2 |
1531 |
- tar xjf $< |
1532 |
-@@ -169,7 +170,7 @@ |
1533 |
- ###### |
1534 |
- |
1535 |
- lwip-$(LWIP_VERSION).tar.gz: |
1536 |
-- $(WGET) $(LWIP_URL)/$@ |
1537 |
-+# $(WGET) $(LWIP_URL)/$@ |
1538 |
- |
1539 |
- lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz |
1540 |
- tar xzf $< |
1541 |
-@@ -325,7 +326,7 @@ |
1542 |
- ###### |
1543 |
- |
1544 |
- grub-$(GRUB_VERSION).tar.gz: |
1545 |
-- $(WGET) $(GRUB_URL)/$@ |
1546 |
-+#$(WGET) $(GRUB_URL)/$@ |
1547 |
- |
1548 |
- grub-upstream: grub-$(GRUB_VERSION).tar.gz |
1549 |
- tar xzf $< |
1550 |
-@@ -392,7 +393,7 @@ |
1551 |
- $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
1552 |
- $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" |
1553 |
- |
1554 |
--install-grub: pv-grub |
1555 |
-+install-grub: |
1556 |
- $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
1557 |
- $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" |
1558 |
- |
1559 |
|
1560 |
diff --git a/app-emulation/xen-stubdom/metadata.xml b/app-emulation/xen-stubdom/metadata.xml |
1561 |
deleted file mode 100644 |
1562 |
index 6a0aea1..0000000 |
1563 |
--- a/app-emulation/xen-stubdom/metadata.xml |
1564 |
+++ /dev/null |
1565 |
@@ -1,16 +0,0 @@ |
1566 |
-<?xml version="1.0" encoding="UTF-8"?> |
1567 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1568 |
-<pkgmetadata> |
1569 |
- <herd>xen</herd> |
1570 |
- <maintainer> |
1571 |
- <email>idella4@g.o</email> |
1572 |
- <name>Ian Delaney</name> |
1573 |
- </maintainer> |
1574 |
- <maintainer> |
1575 |
- <email>spookyghost@×××××××××××××.uk</email> |
1576 |
- <name>James Dingwall</name> |
1577 |
- </maintainer> |
1578 |
- <use> |
1579 |
- <flag name='custom-cflags'>Build with user-specified CFLAGS</flag> |
1580 |
- </use> |
1581 |
-</pkgmetadata> |
1582 |
|
1583 |
diff --git a/app-emulation/xen-stubdom/xen-stubdom-4.2.2.ebuild b/app-emulation/xen-stubdom/xen-stubdom-4.2.2.ebuild |
1584 |
deleted file mode 100644 |
1585 |
index 3cb003d..0000000 |
1586 |
--- a/app-emulation/xen-stubdom/xen-stubdom-4.2.2.ebuild |
1587 |
+++ /dev/null |
1588 |
@@ -1,114 +0,0 @@ |
1589 |
-# Copyright 1999-2013 Gentoo Foundation |
1590 |
-# Distributed under the terms of the GNU General Public License v2 |
1591 |
-# $Header: $ |
1592 |
- |
1593 |
-EAPI=5 |
1594 |
-PYTHON_DEPEND="2:2.6" |
1595 |
- |
1596 |
-inherit flag-o-matic eutils multilib python toolchain-funcs |
1597 |
- |
1598 |
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
1599 |
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
1600 |
-GRUB_URL=mirror://gnu-alpha/grub |
1601 |
-SRC_URI=" |
1602 |
- http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
1603 |
- $GRUB_URL/grub-0.97.tar.gz |
1604 |
- $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz |
1605 |
- $LIBPCI_URL/pciutils-2.2.9.tar.bz2 |
1606 |
- $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz |
1607 |
- $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz" |
1608 |
- |
1609 |
-S="${WORKDIR}/xen-${PV}" |
1610 |
- |
1611 |
-DESCRIPTION="allows XEN HVM guests to be run in a stubdom which improves isolation and performance." |
1612 |
-HOMEPAGE="http://xen.org/" |
1613 |
-LICENSE="GPL-2" |
1614 |
-SLOT="0" |
1615 |
-KEYWORDS="~amd64 ~x86" |
1616 |
-IUSE="custom-cflags" |
1617 |
- |
1618 |
-DEPEND="sys-devel/gettext" |
1619 |
- |
1620 |
-RDEPEND=">=app-emulation/xen-4.2.1" |
1621 |
- |
1622 |
-pkg_setup() { |
1623 |
- python_set_active_version 2 |
1624 |
- python_pkg_setup |
1625 |
-} |
1626 |
- |
1627 |
-src_prepare() { |
1628 |
- |
1629 |
- # if the user *really* wants to use their own custom-cflags, let them |
1630 |
- if use custom-cflags; then |
1631 |
- einfo "User wants their own CFLAGS - removing defaults" |
1632 |
- # try and remove all the default custom-cflags |
1633 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
1634 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
1635 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
1636 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
1637 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
1638 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
1639 |
- -i {} \; |
1640 |
- fi |
1641 |
- |
1642 |
- #Substitute for internal downloading |
1643 |
- cp $DISTDIR/zlib-1.2.3.tar.gz \ |
1644 |
- $DISTDIR/pciutils-2.2.9.tar.bz2 \ |
1645 |
- $DISTDIR/lwip-1.3.0.tar.gz \ |
1646 |
- $DISTDIR/newlib-1.16.0.tar.gz \ |
1647 |
- $DISTDIR/grub-0.97.tar.gz \ |
1648 |
- ./stubdom/ || die "files not coped to stubdom" |
1649 |
- einfo "files copied to stubdom" |
1650 |
- |
1651 |
- # Patch the unmergeable newlib, fix most of the leftover gcc QA issues |
1652 |
- cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
1653 |
- |
1654 |
- # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
1655 |
- epatch "${FILESDIR}"/${P/-stubdom/}-externals.patch |
1656 |
- |
1657 |
- # Drop .config and Fix gcc-4.6 |
1658 |
- epatch "${FILESDIR}"/${PN/-stubdom/}-4-fix_dotconfig-gcc.patch |
1659 |
- |
1660 |
- # fix jobserver in Makefile |
1661 |
- epatch "${FILESDIR}"/${PN/-stubdom/}-4.2.0-jserver.patch |
1662 |
- |
1663 |
- #Sec patch |
1664 |
- epatch "${FILESDIR}"/${PN/-stubdom/}-4-CVE-2012-6075-XSA-41.patch |
1665 |
- |
1666 |
- # wrt Bug #455196 |
1667 |
- epatch "${FILESDIR}"/${P/-stubdom/}-CC.patch |
1668 |
-} |
1669 |
- |
1670 |
-src_compile() { |
1671 |
- use custom-cflags || unset CFLAGS |
1672 |
- if test-flag-CC -fno-strict-overflow; then |
1673 |
- append-flags -fno-strict-overflow |
1674 |
- fi |
1675 |
- |
1676 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include |
1677 |
- |
1678 |
- if use x86; then |
1679 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
1680 |
- XEN_TARGET_ARCH="x86_32" -C stubdom genpath ioemu-stubdom |
1681 |
- elif use amd64; then |
1682 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" \ |
1683 |
- XEN_TARGET_ARCH="x86_64" -C stubdom genpath ioemu-stubdom |
1684 |
- fi |
1685 |
-} |
1686 |
- |
1687 |
-src_install() { |
1688 |
- if use x86; then |
1689 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-ioemu |
1690 |
- fi |
1691 |
- if use amd64; then |
1692 |
- emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-ioemu |
1693 |
- fi |
1694 |
-} |
1695 |
- |
1696 |
-pkg_postinst() { |
1697 |
- elog " Official Xen Guide and the unoffical wiki page:" |
1698 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
1699 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
1700 |
- elog " Xen stubdom information" |
1701 |
- elog " http://wiki.xen.org/wiki/Device_Model_Stub_Domains" |
1702 |
-} |
1703 |
|
1704 |
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest |
1705 |
deleted file mode 100644 |
1706 |
index 568b0d7..0000000 |
1707 |
--- a/app-emulation/xen-tools/Manifest |
1708 |
+++ /dev/null |
1709 |
@@ -1,6 +0,0 @@ |
1710 |
-DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc |
1711 |
-DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcbbc81b732a2f672079c42fb44153ee62 SHA512 4f886088ebaa911590b8cb19db5c5dbc8f1384d2d5a7c4bf04df083e177513b3123b1839dad744171670eded8b69ce092a774288aec1804d00aa32b1b6778599 WHIRLPOOL f2e62682d7213ee5eaecbc2590637ef36d9c86f746840c0ee758c0c153139f485032ea2cd098c87bb8a2b5f17f91375b8fb65599e3b71b45b1645df85a88887f |
1712 |
-DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942eea1490a9e7e01f478541577025f6eef76e0c76de SHA512 e9ebe3711e3f678d3632f8e8e645f8be4fb65608aff04aeeb0e1152521bf571bc4d879f136d23bb0aa8bd4c4ec20f294b472cf54dc70916e52d330328aadd357 WHIRLPOOL 6138271f72fd96fabe3cffc07a6efcb9c0e195ed96f4ad708d00e85e0a84a03900dc41389cd4f26d533a3aa42142a9e17708d7b87d722f1c9348f61a5db3e59d |
1713 |
-DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea |
1714 |
-DIST xen-4.3.0.tar.gz 16425975 SHA256 e1e9faabe4886e2227aacdbde74410653b233d66642ca1972a860cbec6439961 SHA512 e6b8f64e15e48704ea5cee5585cd6151fe6a5a62bc4670caf0b762c1aa71c9598db236c637ac34c42c92c6e8a5001acdd3d9d4b9305401a26273279358f481d6 WHIRLPOOL a91f14bc6535127ab17d3867b92fb3e008089453d5ba7996fd1d0b5c6d32a881c07df320f018c928e919f28de7b4ab4757c6bdb020e0cdb7d67960d4cab9dda0 |
1715 |
-DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406 |
1716 |
|
1717 |
diff --git a/app-emulation/xen-tools/files/fix-gold-ld.patch b/app-emulation/xen-tools/files/fix-gold-ld.patch |
1718 |
deleted file mode 100644 |
1719 |
index 654eb25..0000000 |
1720 |
--- a/app-emulation/xen-tools/files/fix-gold-ld.patch |
1721 |
+++ /dev/null |
1722 |
@@ -1,14 +0,0 @@ |
1723 |
-diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile |
1724 |
-index cbd60b4..d2b83dd 100644 |
1725 |
---- a/tools/libfsimage/common/Makefile |
1726 |
-+++ b/tools/libfsimage/common/Makefile |
1727 |
-@@ -5,7 +5,7 @@ MAJOR = 1.0 |
1728 |
- MINOR = 0 |
1729 |
- |
1730 |
- LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS |
1731 |
--LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU |
1732 |
-+LDFLAGS-$(CONFIG_Linux) = |
1733 |
- LDFLAGS = $(LDFLAGS-y) |
1734 |
- |
1735 |
- CFLAGS += $(PTHREAD_CFLAGS) |
1736 |
- |
1737 |
|
1738 |
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf |
1739 |
new file mode 100644 |
1740 |
index 0000000..6fe9bf0 |
1741 |
--- /dev/null |
1742 |
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf |
1743 |
@@ -0,0 +1,126 @@ |
1744 |
+# Drop .config, fixes to gcc-4.6 |
1745 |
+_gx001=" xen-4-fix_dotconfig-gcc.patch" |
1746 |
+_gx020=" xen-4.3-fix_dotconfig-gcc.patch" |
1747 |
+ |
1748 |
+# Fix texi2html build error with new texi2html, qemu.doc.html |
1749 |
+_gx002=" xen-tools-4-docfix.patch" |
1750 |
+_gx003=" xen-tools-4-qemu-xen-doc.patch" |
1751 |
+ |
1752 |
+_gx004=" xen-tools-4.2-pod-utf8-chars.patch" |
1753 |
+_gx005=" xen-tools-4.2-pod-docs.patch" |
1754 |
+_gx006=" xen-tools-4.2-pod-xl.patch" |
1755 |
+ |
1756 |
+# Fix network broadcast on bridged networks |
1757 |
+_gx007=" xen-tools-3.4.0-network-bridge-broadcast.patch" |
1758 |
+ |
1759 |
+# Bug 496708 |
1760 |
+_gx008=" xen-tools-4-unbundle-ipxe.patch" |
1761 |
+#use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch |
1762 |
+ |
1763 |
+# Fix bridge by idella4, bug #362575 |
1764 |
+_gx009=" xen-tools-4.1.1-bridge.patch" |
1765 |
+ |
1766 |
+# Conditional patch, fix in ebuild |
1767 |
+# Don't build ipxe with pie on hardened, Bug #360805 |
1768 |
+#if gcc-specs-pie; then |
1769 |
+# epatch "${FILESDIR}"/ipxe-nopie.patch |
1770 |
+#fi |
1771 |
+ |
1772 |
+# Prevent double stripping of files at install |
1773 |
+_gx010=" xen-4.2.0-nostrip.patch" |
1774 |
+_gx024+=" xen-4.4-nostrip.patch" |
1775 |
+ |
1776 |
+# fix jobserver in Makefile |
1777 |
+_gx011=" xen-4.2.0-jserver.patch" |
1778 |
+_gx021=" xen-4.3-jserver.patch" |
1779 |
+ |
1780 |
+# add missing header, Bug #467200 |
1781 |
+_gx012=" xen-4-ulong.patch" |
1782 |
+_gx013=" xen-tools-4.2-xen_disk_leak.patch" |
1783 |
+ |
1784 |
+# Set dom0-min-mem to kb; Bug #472982 |
1785 |
+_gx014=" xen-4.2-configsxp.patch" |
1786 |
+ |
1787 |
+# Bug 463840 |
1788 |
+_gx015=" xen-tools-4.2.2-install.patch" |
1789 |
+_gx016=" xen-tools-4.2.2-rt-link.patch" |
1790 |
+ |
1791 |
+# Bug 379537 |
1792 |
+_gx017=" fix-gold-ld.patch" |
1793 |
+ |
1794 |
+# Bug 510976 |
1795 |
+_gx018=" xen-tools-4.2.4-udev-rules.patch" |
1796 |
+ |
1797 |
+# bundled seabios |
1798 |
+_gx019=" xen-tools-4-anti-seabios-download.patch" |
1799 |
+_gx032=" xen-tools-4.5-anti-seabios-download.patch" |
1800 |
+ |
1801 |
+# Bug 477676 |
1802 |
+_gx022=" xen-tools-4.3-ar-cc.patch" |
1803 |
+_gx038=" xen-tools-4.8-ar-cc.patch" |
1804 |
+ |
1805 |
+# Prevent file collision with qemu package Bug 478064 |
1806 |
+_gx023=" qemu-bridge.patch" |
1807 |
+_gx025=" xen-4.4-qemu-bridge.patch" |
1808 |
+_gx031=" xen-4.5-qemu-bridge.patch" |
1809 |
+_gx039=" xen-4.8-qemu-bridge.patch" |
1810 |
+#mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
1811 |
+ |
1812 |
+_gx026=" xen-tools-4.4-api-fix.patch" |
1813 |
+ |
1814 |
+# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302 |
1815 |
+_gx027=" xen-tools-4-qemu-fix-po-collision.patch" |
1816 |
+ |
1817 |
+# Fix build failure with ncurses[tinfo], bug 526526 |
1818 |
+_gx028=" xen-tools-4.4.1-tinfo.patch" |
1819 |
+ |
1820 |
+# Don't download ovmf, use pre-released |
1821 |
+_gx029=" xen-tools-4-anti-ovmf-download.patch" |
1822 |
+ |
1823 |
+# fix build err while using gcc-4.5.x, c99 |
1824 |
+_gx033=" xen-tools-4.4.2-gcc99.patch" |
1825 |
+_gx034=" xen-tools-4.5.0-gcc99.patch" |
1826 |
+ |
1827 |
+_gx035=" xen-tools-4.2-pod-docs-r1.patch" |
1828 |
+# disable stackcheck for hardened system, bug 569810 |
1829 |
+_gx036=" xen-tools-4.6-no-stackcheck.patch" |
1830 |
+ |
1831 |
+# increase stack to fix xenqemu err |
1832 |
+# https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03961.html |
1833 |
+_gx037=" xen-tools-4.6-increase-stack-size.patch" |
1834 |
+ |
1835 |
+ |
1836 |
+#Fix issues with zero-length records in migration v2" |
1837 |
+#https://xenbits.xen.org/gitweb/?p=people/andrewcoop/xen.git;a=shortlog;h=refs/heads/tools-fix-zero-length-records |
1838 |
+_gx040=" 0001-docs-Clarify-the-expected-behaviour-of-zero-length-r.patch |
1839 |
+ 0003-tools-libxc-Avoid-generating-inappropriate-zero-leng.patch |
1840 |
+ 0004-tools-python-Adjust-migration-v2-library-to-warn-abo.patch" |
1841 |
+ |
1842 |
+_gx041=" 0002-tools-libxc-Tolerate-zero-length-records-in-migratio.patch" |
1843 |
+ |
1844 |
+# xen-tools-4.7.2 patches set |
1845 |
+_gpv_xen_tools_472_0=" |
1846 |
+${_gx008} ${_gx021} |
1847 |
+${_gx022} ${_gx017} ${_gx031} |
1848 |
+${_gx027} ${_gx032} |
1849 |
+${_gx028} ${_gx029} ${_gx036} |
1850 |
+${_gx037} ${_gx040} ${_gx041} |
1851 |
+" |
1852 |
+ |
1853 |
+# xen-tools-4.7.3 patches set |
1854 |
+_gpv_xen_tools_473_0=" |
1855 |
+${_gx008} ${_gx021} |
1856 |
+${_gx022} ${_gx017} ${_gx031} |
1857 |
+${_gx027} ${_gx032} |
1858 |
+${_gx028} ${_gx029} ${_gx036} |
1859 |
+${_gx037} ${_gx040} |
1860 |
+" |
1861 |
+ |
1862 |
+# xen-tools-4.8.1 patches set |
1863 |
+_gpv_xen_tools_481_0=" |
1864 |
+${_gx008} |
1865 |
+${_gx038} ${_gx017} ${_gx039} |
1866 |
+${_gx027} ${_gx032} |
1867 |
+${_gx028} ${_gx029} |
1868 |
+${_gx037} ${_gx040} |
1869 |
+" |
1870 |
|
1871 |
diff --git a/app-emulation/xen-tools/files/ipxe-nopie.patch b/app-emulation/xen-tools/files/ipxe-nopie.patch |
1872 |
deleted file mode 100644 |
1873 |
index c5be735..0000000 |
1874 |
--- a/app-emulation/xen-tools/files/ipxe-nopie.patch |
1875 |
+++ /dev/null |
1876 |
@@ -1,29 +0,0 @@ |
1877 |
-2011-10-22 Ralf Glauberman <ralfglauberman@×××.de> |
1878 |
- |
1879 |
- #360805 Don't compile ipxe with pie on hardened. |
1880 |
- * /tools/firmware/etherboot/patches/ipxe-nopie.patche New patch |
1881 |
- * /tools/firmware/etherboot/patches/series Add ipxe-nopie.patch |
1882 |
- |
1883 |
---- a/tools/firmware/etherboot/patches/ipxe-nopie.patch 1970-01-01 01:00:00.000000000 +0100 |
1884 |
-+++ b/tools/firmware/etherboot/patches/ipxe-nopie.patch 2011-03-27 17:45:13.929697782 +0200 |
1885 |
-@@ -0,0 +1,11 @@ |
1886 |
-+--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200 |
1887 |
-++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200 |
1888 |
-+@@ -4,7 +4,7 @@ |
1889 |
-+ # |
1890 |
-+ |
1891 |
-+ CLEANUP := |
1892 |
-+-CFLAGS := |
1893 |
-++CFLAGS := -nopie |
1894 |
-+ ASFLAGS := |
1895 |
-+ LDFLAGS := |
1896 |
-+ MAKEDEPS := Makefile |
1897 |
---- a/tools/firmware/etherboot/patches/series 2011-03-25 11:42:50.000000000 +0100 |
1898 |
-+++ b/tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200 |
1899 |
-@@ -1,4 +1,5 @@ |
1900 |
- boot_prompt_option.patch |
1901 |
- build_fix_1.patch |
1902 |
- build_fix_2.patch |
1903 |
- build_fix_3.patch |
1904 |
-+ipxe-nopie.patch |
1905 |
- |
1906 |
|
1907 |
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 |
1908 |
deleted file mode 100644 |
1909 |
index 7513ac3..0000000 |
1910 |
--- a/app-emulation/xen-tools/files/xen-4-CVE-2012-6075-XSA-41.patch |
1911 |
+++ /dev/null |
1912 |
@@ -1,39 +0,0 @@ |
1913 |
-authorMichael Contreras <michael@×××××××.com> |
1914 |
- Mon, 3 Dec 2012 04:11:22 +0000 (20:11 -0800) |
1915 |
-committerAnthony Liguori <aliguori@××××××.com> |
1916 |
- Mon, 3 Dec 2012 14:14:10 +0000 (08:14 -0600) |
1917 |
- |
1918 |
-The e1000_receive function for the e1000 needs to discard packets longer than |
1919 |
-1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes |
1920 |
-this behavior and allocates memory based on this assumption. |
1921 |
- |
1922 |
-Signed-off-by: Michael Contreras <michael@×××××××.com> |
1923 |
-Signed-off-by: Anthony Liguori <aliguori@××××××.com> |
1924 |
-hw/e1000.c |
1925 |
- |
1926 |
---- tools/qemu-xen/hw/e1000.c |
1927 |
-+++ tools/qemu-xen/hw/e1000.c |
1928 |
-@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); |
1929 |
- #define PNPMMIO_SIZE 0x20000 |
1930 |
- #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */ |
1931 |
- |
1932 |
-+/* this is the size past which hardware will drop packets when setting LPE=0 */ |
1933 |
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522 |
1934 |
-+ |
1935 |
- /* |
1936 |
- * HW models: |
1937 |
- * E1000_DEV_ID_82540EM works with Windows and Linux |
1938 |
-@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size) |
1939 |
- size = sizeof(min_buf); |
1940 |
- } |
1941 |
- |
1942 |
-+ /* Discard oversized packets if !LPE and !SBP. */ |
1943 |
-+ if (size > MAXIMUM_ETHERNET_VLAN_SIZE |
1944 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE) |
1945 |
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { |
1946 |
-+ return size; |
1947 |
-+ } |
1948 |
-+ |
1949 |
- if (!receive_filter(s, buf, size)) |
1950 |
- return size; |
1951 |
- |
1952 |
|
1953 |
diff --git a/app-emulation/xen-tools/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-tools/files/xen-4-fix_dotconfig-gcc.patch |
1954 |
deleted file mode 100644 |
1955 |
index 4e08a30..0000000 |
1956 |
--- a/app-emulation/xen-tools/files/xen-4-fix_dotconfig-gcc.patch |
1957 |
+++ /dev/null |
1958 |
@@ -1,245 +0,0 @@ |
1959 |
-# Fix gcc-4.6 |
1960 |
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk |
1961 |
---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 |
1962 |
-+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 |
1963 |
-@@ -6,7 +6,7 @@ |
1964 |
- |
1965 |
- # Define some default flags. |
1966 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
1967 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
1968 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
1969 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
1970 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
1971 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
1972 |
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile |
1973 |
---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 |
1974 |
-+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 |
1975 |
-@@ -73,7 +73,7 @@ |
1976 |
- |
1977 |
- -include $(XEN_TARGET_ARCH)/Makefile |
1978 |
- |
1979 |
--CFLAGS += -Werror -Wmissing-prototypes |
1980 |
-+CFLAGS += -Wmissing-prototypes |
1981 |
- CFLAGS += -I. $(CFLAGS_xeninclude) |
1982 |
- |
1983 |
- # Needed for posix_fadvise64() in xc_linux.c |
1984 |
-# Drop .config |
1985 |
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk |
1986 |
---- Config.mk 2012-09-17 18:23:12.000000000 +0800 |
1987 |
-+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 |
1988 |
-@@ -7,7 +7,6 @@ Drop .config |
1989 |
- # fallback for older make |
1990 |
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) |
1991 |
- |
1992 |
---include $(XEN_ROOT)/.config |
1993 |
- |
1994 |
- # A debug build of Xen and tools? |
1995 |
- debug ?= n |
1996 |
-@@ -24,7 +24,7 @@ |
1997 |
- |
1998 |
- # Tools to run on system hosting the build |
1999 |
- HOSTCC = gcc |
2000 |
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer |
2001 |
-+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer |
2002 |
- HOSTCFLAGS += -fno-strict-aliasing |
2003 |
- |
2004 |
- DISTDIR ?= $(XEN_ROOT)/dist |
2005 |
-@@ -156,7 +156,7 @@ |
2006 |
- |
2007 |
- CFLAGS += -std=gnu99 |
2008 |
- |
2009 |
--CFLAGS += -Wall -Wstrict-prototypes |
2010 |
-+CFLAGS += -Wstrict-prototypes |
2011 |
- |
2012 |
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' |
2013 |
- # and is over-zealous with the printf format lint |
2014 |
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile |
2015 |
---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800 |
2016 |
-+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800 |
2017 |
-@@ -9,7 +9,7 @@ |
2018 |
- LOCK_UTIL = lock-util |
2019 |
- INST_DIR = $(SBINDIR) |
2020 |
- |
2021 |
--CFLAGS += -Werror -g |
2022 |
-+CFLAGS += -g |
2023 |
- CFLAGS += -Wno-unused |
2024 |
- CFLAGS += -fno-strict-aliasing |
2025 |
- CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers |
2026 |
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk |
2027 |
---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800 |
2028 |
-+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800 |
2029 |
-@@ -1,4 +1,4 @@ |
2030 |
- include $(XEN_ROOT)/tools/Rules.mk |
2031 |
- |
2032 |
--CFLAGS += -Werror -Wmissing-prototypes |
2033 |
-+CFLAGS += -Wmissing-prototypes |
2034 |
- # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion |
2035 |
-diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile |
2036 |
---- tools/debugger/xenitp/Makefile 2012-12-17 23:00:22.000000000 +0800 |
2037 |
-+++ tools/debugger/xenitp/Makefile 2013-01-30 12:31:43.516941098 +0800 |
2038 |
-@@ -1,7 +1,7 @@ |
2039 |
- XEN_ROOT=$(CURDIR)/../../.. |
2040 |
- include $(XEN_ROOT)/tools/Rules.mk |
2041 |
- |
2042 |
--#CFLAGS += -Werror -g -O0 |
2043 |
-+#CFLAGS += -g -O0 |
2044 |
- |
2045 |
- CFLAGS += $(CFLAGS_libxenctrl) |
2046 |
- |
2047 |
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile |
2048 |
---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800 |
2049 |
-+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800 |
2050 |
-@@ -4,7 +4,7 @@ |
2051 |
- HARNESS_SRCS:=main.c |
2052 |
- # io_queue.c |
2053 |
- |
2054 |
--CFLAGS=-Wall -Werror -g -O -laio |
2055 |
-+CFLAGS=-Wall -g -O -laio |
2056 |
- #-lpthread -lrt |
2057 |
- |
2058 |
- all: $(PROGS) |
2059 |
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk |
2060 |
---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800 |
2061 |
-+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
2062 |
-@@ -1,7 +1,7 @@ |
2063 |
- include $(XEN_ROOT)/tools/Rules.mk |
2064 |
- |
2065 |
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" |
2066 |
--CFLAGS += -Werror -D_GNU_SOURCE |
2067 |
-+CFLAGS += -D_GNU_SOURCE |
2068 |
- LDFLAGS += -L../common/ |
2069 |
- |
2070 |
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) |
2071 |
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile |
2072 |
---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800 |
2073 |
-+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800 |
2074 |
-@@ -11,7 +11,7 @@ |
2075 |
- XLUMAJOR = 1.0 |
2076 |
- XLUMINOR = 1 |
2077 |
- |
2078 |
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ |
2079 |
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ |
2080 |
- -Wno-declaration-after-statement -Wformat-nonliteral |
2081 |
- CFLAGS += -I. -fPIC |
2082 |
- |
2083 |
-diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile |
2084 |
---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800 |
2085 |
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800 |
2086 |
-@@ -9,7 +9,7 @@ |
2087 |
- |
2088 |
- .PHONY : all clean build-all |
2089 |
- |
2090 |
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin |
2091 |
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin |
2092 |
- CFLAGS += -I$(SRC_PATH) |
2093 |
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) |
2094 |
- QEMU_CFLAGS = $(CFLAGS) |
2095 |
-diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk |
2096 |
---- tools/vtpm/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
2097 |
-+++ tools/vtpm/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
2098 |
-@@ -6,7 +6,7 @@ |
2099 |
- # |
2100 |
- |
2101 |
- # General compiler flags |
2102 |
--CFLAGS = -Werror -g3 |
2103 |
-+CFLAGS = -g3 |
2104 |
- |
2105 |
- # Generic project files |
2106 |
- HDRS = $(wildcard *.h) |
2107 |
-diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk |
2108 |
---- tools/vtpm_manager/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
2109 |
-+++ tools/vtpm_manager/Rules.mk 2013-01-30 12:31:43.511941097 +0800 |
2110 |
-@@ -6,7 +6,7 @@ |
2111 |
- # |
2112 |
- |
2113 |
- # General compiler flags |
2114 |
--CFLAGS = -Werror -g3 |
2115 |
-+CFLAGS = -g3 |
2116 |
- |
2117 |
- # Generic project files |
2118 |
- HDRS = $(wildcard *.h) |
2119 |
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile |
2120 |
---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800 |
2121 |
-+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800 |
2122 |
-@@ -18,7 +18,7 @@ |
2123 |
- all install xentop: |
2124 |
- else |
2125 |
- |
2126 |
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) |
2127 |
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) |
2128 |
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) |
2129 |
- CFLAGS += -DHOST_$(XEN_OS) |
2130 |
- |
2131 |
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk |
2132 |
---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
2133 |
-+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800 |
2134 |
-@@ -9,7 +9,7 @@ |
2135 |
- HAS_DEVICE_TREE := y |
2136 |
- |
2137 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
2138 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
2139 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
2140 |
- CFLAGS += -I$(BASEDIR)/include |
2141 |
- |
2142 |
- # Prevent floating-point variables from creeping into Xen. |
2143 |
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk |
2144 |
---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
2145 |
-+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800 |
2146 |
-@@ -24,7 +24,7 @@ |
2147 |
- endif |
2148 |
- |
2149 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
2150 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
2151 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
2152 |
- CFLAGS += -I$(BASEDIR)/include |
2153 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic |
2154 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default |
2155 |
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile |
2156 |
---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800 |
2157 |
-+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800 |
2158 |
-@@ -78,7 +78,7 @@ |
2159 |
- all: headers.chk |
2160 |
- |
2161 |
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile |
2162 |
-- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new |
2163 |
-+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new |
2164 |
- mv $@.new $@ |
2165 |
- |
2166 |
- endif |
2167 |
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile |
2168 |
---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800 |
2169 |
-+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800 |
2170 |
-@@ -1,7 +1,7 @@ |
2171 |
- XEN_ROOT=$(CURDIR)/../../../.. |
2172 |
- include $(XEN_ROOT)/tools/Rules.mk |
2173 |
- |
2174 |
--CFLAGS += -Werror |
2175 |
-+CFLAGS += |
2176 |
- CFLAGS += $(CFLAGS_libxenctrl) |
2177 |
- CFLAGS += $(CFLAGS_libxenguest) |
2178 |
- CFLAGS += $(CFLAGS_libxenstore) |
2179 |
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile |
2180 |
---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800 |
2181 |
-+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800 |
2182 |
-@@ -1,7 +1,7 @@ |
2183 |
- XEN_ROOT=$(CURDIR)/../../.. |
2184 |
- include $(XEN_ROOT)/tools/Rules.mk |
2185 |
- |
2186 |
--CFLAGS += -Werror |
2187 |
-+CFLAGS += |
2188 |
- |
2189 |
- CFLAGS += $(CFLAGS_libxenctrl) |
2190 |
- CFLAGS += $(CFLAGS_xeninclude) |
2191 |
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile |
2192 |
---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800 |
2193 |
-+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800 |
2194 |
-@@ -1,7 +1,7 @@ |
2195 |
- XEN_ROOT=$(CURDIR)/../../.. |
2196 |
- include $(XEN_ROOT)/tools/Rules.mk |
2197 |
- |
2198 |
--CFLAGS += -Werror |
2199 |
-+CFLAGS += |
2200 |
- |
2201 |
- CFLAGS += $(CFLAGS_libxenctrl) |
2202 |
- CFLAGS += $(CFLAGS_libxenguest) |
2203 |
- |
2204 |
|
2205 |
diff --git a/app-emulation/xen-tools/files/xen-4.2-configsxp.patch b/app-emulation/xen-tools/files/xen-4.2-configsxp.patch |
2206 |
deleted file mode 100644 |
2207 |
index 4c159c1..0000000 |
2208 |
--- a/app-emulation/xen-tools/files/xen-4.2-configsxp.patch |
2209 |
+++ /dev/null |
2210 |
@@ -1,24 +0,0 @@ |
2211 |
-diff -ur xen-4.2.1.orig/tools/examples/xend-config.sxp xen-4.2.1/tools/examples/xend-config.sxp |
2212 |
---- tools/examples/xend-config.sxp 2012-12-17 23:00:23.000000000 +0800 |
2213 |
-+++ tools/examples/xend-config.sxp 2013-06-27 21:32:50.198221774 +0800 |
2214 |
-@@ -200,7 +200,7 @@ |
2215 |
- #(network-script network-nat) |
2216 |
- #(vif-script vif-nat) |
2217 |
- |
2218 |
--# dom0-min-mem is the lowest permissible memory level (in MB) for dom0. |
2219 |
-+# dom0-min-mem is the lowest permissible memory level (in kb) for dom0. |
2220 |
- # This is a minimum both for auto-ballooning (as enabled by |
2221 |
- # enable-dom0-ballooning below) and for xm mem-set when applied to dom0. |
2222 |
- (dom0-min-mem 196) |
2223 |
-diff -ur xen-4.2.1.orig/tools/python/xen/xend/tests/xend-config.sxp xen-4.2.1/tools/python/xen/xend/tests/xend-config.sxp |
2224 |
---- tools/python/xen/xend/tests/xend-config.sxp 2012-12-17 23:01:27.000000000 +0800 |
2225 |
-+++ tools/python/xen/xend/tests/xend-config.sxp 2013-06-27 21:32:02.726225130 +0800 |
2226 |
-@@ -116,7 +116,7 @@ |
2227 |
- |
2228 |
- |
2229 |
- # Dom0 will balloon out when needed to free memory for domU. |
2230 |
--# dom0-min-mem is the lowest memory level (in MB) dom0 will get down to. |
2231 |
-+# dom0-min-mem is the lowest memory level (in kb) dom0 will get down to. |
2232 |
- # If dom0-min-mem=0, dom0 will never balloon out. |
2233 |
- (dom0-min-mem 196) |
2234 |
- |
2235 |
|
2236 |
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 |
2237 |
deleted file mode 100644 |
2238 |
index 95a1ce6..0000000 |
2239 |
--- a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch |
2240 |
+++ /dev/null |
2241 |
@@ -1,28 +0,0 @@ |
2242 |
-diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile |
2243 |
---- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800 |
2244 |
-+++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800 |
2245 |
-@@ -28,13 +28,6 @@ |
2246 |
- $(MAKE) -C $D/src bin/$(*F).rom |
2247 |
- |
2248 |
- $T: |
2249 |
-- if ! wget -O _$T $(IPXE_TARBALL_URL); then \ |
2250 |
-- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ |
2251 |
-- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ |
2252 |
-- $(IPXE_GIT_TAG) | gzip >../_$T); \ |
2253 |
-- rm -rf $D.git; \ |
2254 |
-- fi |
2255 |
-- mv _$T $T |
2256 |
- |
2257 |
- $D/src/arch/i386/Makefile: $T Config |
2258 |
- rm -rf $D |
2259 |
-diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile |
2260 |
---- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800 |
2261 |
-+++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800 |
2262 |
-@@ -18,7 +18,6 @@ |
2263 |
- cp ovmf-makefile ovmf/Makefile; |
2264 |
- |
2265 |
- seabios-dir: |
2266 |
-- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir |
2267 |
- cp seabios-config seabios-dir/.config; |
2268 |
- |
2269 |
- .PHONY: all |
2270 |
|
2271 |
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch |
2272 |
deleted file mode 100644 |
2273 |
index d42080c..0000000 |
2274 |
--- a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch |
2275 |
+++ /dev/null |
2276 |
@@ -1,20 +0,0 @@ |
2277 |
-diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile |
2278 |
---- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 |
2279 |
-+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 |
2280 |
-@@ -14,13 +14,13 @@ |
2281 |
- .PHONY: blowfish.h |
2282 |
- blowfish.h: |
2283 |
- rm -f blowfish.bin |
2284 |
-- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all |
2285 |
-+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all |
2286 |
- (echo "static unsigned int blowfish32_code[] = {"; \ |
2287 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
2288 |
- echo "};") >$@ |
2289 |
- rm -f blowfish.bin |
2290 |
- ifeq ($(XEN_COMPILE_ARCH),x86_64) |
2291 |
-- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all |
2292 |
-+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all |
2293 |
- (echo "static unsigned int blowfish64_code[] = {"; \ |
2294 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
2295 |
- echo "};") >>$@ |
2296 |
- |
2297 |
|
2298 |
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch |
2299 |
deleted file mode 100644 |
2300 |
index de06279..0000000 |
2301 |
--- a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch |
2302 |
+++ /dev/null |
2303 |
@@ -1,37 +0,0 @@ |
2304 |
-diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile |
2305 |
---- tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800 |
2306 |
-+++ tools/qemu-xen-traditional/Makefile 2012-11-22 06:12:29.433599695 +0800 |
2307 |
-@@ -243,7 +243,7 @@ |
2308 |
- install: all $(if $(BUILD_DOCS),install-doc) |
2309 |
- mkdir -p "$(DESTDIR)$(bindir)" |
2310 |
- ifneq ($(TOOLS),) |
2311 |
-- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" |
2312 |
-+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" |
2313 |
- endif |
2314 |
- ifneq ($(BLOBS),) |
2315 |
- mkdir -p "$(DESTDIR)$(datadir)" |
2316 |
-diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target |
2317 |
---- tools/qemu-xen-traditional/Makefile.target 2012-09-07 00:05:30.000000000 +0800 |
2318 |
-+++ tools/qemu-xen-traditional/Makefile.target 2012-11-22 06:26:45.302521231 +0800 |
2319 |
-@@ -755,7 +755,7 @@ |
2320 |
- |
2321 |
- install: all install-hook |
2322 |
- ifneq ($(PROGS),) |
2323 |
-- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" |
2324 |
-+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" |
2325 |
- endif |
2326 |
- |
2327 |
- # Include automatically generated dependency files |
2328 |
-diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target |
2329 |
---- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800 |
2330 |
-+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800 |
2331 |
-@@ -437,9 +437,6 @@ |
2332 |
- install: all |
2333 |
- ifneq ($(PROGS),) |
2334 |
- $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" |
2335 |
--ifneq ($(STRIP),) |
2336 |
-- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) |
2337 |
--endif |
2338 |
- endif |
2339 |
- ifdef CONFIG_TRACE_SYSTEMTAP |
2340 |
- ifdef CONFIG_TRACE_SYSTEMTAP |
2341 |
|
2342 |
diff --git a/app-emulation/xen-tools/files/xen-4.3-jserver.patch b/app-emulation/xen-tools/files/xen-4.3-jserver.patch |
2343 |
deleted file mode 100644 |
2344 |
index 514fd05..0000000 |
2345 |
--- a/app-emulation/xen-tools/files/xen-4.3-jserver.patch |
2346 |
+++ /dev/null |
2347 |
@@ -1,32 +0,0 @@ |
2348 |
-diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile |
2349 |
---- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 |
2350 |
-+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 |
2351 |
-@@ -14,13 +14,13 @@ |
2352 |
- .PHONY: blowfish.h |
2353 |
- blowfish.h: |
2354 |
- rm -f blowfish.bin |
2355 |
-- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all |
2356 |
-+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all |
2357 |
- (echo "static unsigned int blowfish32_code[] = {"; \ |
2358 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
2359 |
- echo "};") >$@ |
2360 |
- rm -f blowfish.bin |
2361 |
- ifeq ($(XEN_COMPILE_ARCH),x86_64) |
2362 |
-- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all |
2363 |
-+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all |
2364 |
- (echo "static unsigned int blowfish64_code[] = {"; \ |
2365 |
- od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
2366 |
- echo "};") >>$@ |
2367 |
- |
2368 |
-diff -ur xen-4.2.0.orig/tools/firmware/vgabios/Makefile xen-4.2.0/tools/firmware/vgabios/Makefile |
2369 |
---- tools/firmware/vgabios/Makefile 2013-02-04 13:56:50.973533544 +0800 |
2370 |
-+++ tools/firmware/vgabios/Makefile 2013-02-04 13:57:21.380535958 +0800 |
2371 |
-@@ -27,7 +27,7 @@ |
2372 |
- |
2373 |
- .PHONY: release |
2374 |
- release: |
2375 |
-- VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios |
2376 |
-+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios |
2377 |
- /bin/rm -f *.o *.s *.ld86 \ |
2378 |
- temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#* |
2379 |
- cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin |
2380 |
|
2381 |
diff --git a/app-emulation/xen-tools/files/xen-4.4-nostrip.patch b/app-emulation/xen-tools/files/xen-4.4-nostrip.patch |
2382 |
deleted file mode 100644 |
2383 |
index 7ddd354..0000000 |
2384 |
--- a/app-emulation/xen-tools/files/xen-4.4-nostrip.patch |
2385 |
+++ /dev/null |
2386 |
@@ -1,13 +0,0 @@ |
2387 |
-diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target |
2388 |
---- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800 |
2389 |
-+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800 |
2390 |
-@@ -437,9 +437,6 @@ |
2391 |
- install: all |
2392 |
- ifneq ($(PROGS),) |
2393 |
- $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" |
2394 |
--ifneq ($(STRIP),) |
2395 |
-- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) |
2396 |
--endif |
2397 |
- endif |
2398 |
- ifdef CONFIG_TRACE_SYSTEMTAP |
2399 |
- ifdef CONFIG_TRACE_SYSTEMTAP |
2400 |
|
2401 |
diff --git a/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch b/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch |
2402 |
deleted file mode 100644 |
2403 |
index 8544561..0000000 |
2404 |
--- a/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch |
2405 |
+++ /dev/null |
2406 |
@@ -1,79 +0,0 @@ |
2407 |
-diff --git a/tools/qemu-xen/Makefile b/tools/qemu-xen/Makefile |
2408 |
-index 4d257f1..db2c2ad 100644 |
2409 |
---- a/tools/qemu-xen/Makefile |
2410 |
-+++ b/tools/qemu-xen/Makefile |
2411 |
-@@ -62,7 +62,7 @@ $(call set-vpath, $(SRC_PATH)) |
2412 |
- |
2413 |
- LIBS+=-lz $(LIBS_TOOLS) |
2414 |
- |
2415 |
--HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) |
2416 |
-+HELPERS-$(CONFIG_LINUX) = xen-bridge-helper$(EXESUF) |
2417 |
- |
2418 |
- ifdef BUILD_DOCS |
2419 |
- DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt |
2420 |
-@@ -186,7 +186,7 @@ qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a |
2421 |
- qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a |
2422 |
- qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a |
2423 |
- |
2424 |
--qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o |
2425 |
-+xen-bridge-helper$(EXESUF): xen-bridge-helper.o |
2426 |
- |
2427 |
- fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o libqemuutil.a libqemustub.a |
2428 |
- fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap |
2429 |
-diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h |
2430 |
-index 30e4b04..6691ff0 100644 |
2431 |
---- a/tools/qemu-xen/include/net/net.h |
2432 |
-+++ b/tools/qemu-xen/include/net/net.h |
2433 |
-@@ -178,7 +178,7 @@ NetClientState *net_hub_port_find(int hub_id); |
2434 |
- |
2435 |
- #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" |
2436 |
- #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" |
2437 |
--#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" |
2438 |
-+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" |
2439 |
- #define DEFAULT_BRIDGE_INTERFACE "br0" |
2440 |
- |
2441 |
- void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); |
2442 |
-diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c |
2443 |
-index 6a0974e..74b4635 100644 |
2444 |
---- a/tools/qemu-xen/qemu-bridge-helper.c |
2445 |
-+++ b/tools/qemu-xen/qemu-bridge-helper.c |
2446 |
-@@ -67,7 +67,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList; |
2447 |
- static void usage(void) |
2448 |
- { |
2449 |
- fprintf(stderr, |
2450 |
-- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); |
2451 |
-+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); |
2452 |
- } |
2453 |
- |
2454 |
- static int parse_acl_file(const char *filename, ACLList *acl_list) |
2455 |
-diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx |
2456 |
-index d15338e..f7104f1 100644 |
2457 |
---- a/tools/qemu-xen/qemu-options.hx |
2458 |
-+++ b/tools/qemu-xen/qemu-options.hx |
2459 |
-@@ -1601,7 +1601,7 @@ to disable script execution. |
2460 |
- |
2461 |
- If running QEMU as an unprivileged user, use the network helper |
2462 |
- @var{helper} to configure the TAP interface. The default network |
2463 |
--helper executable is @file{/usr/local/libexec/qemu-bridge-helper}. |
2464 |
-+helper executable is @file{/usr/local/libexec/xen-bridge-helper}. |
2465 |
- |
2466 |
- @option{fd}=@var{h} can be used to specify the handle of an already |
2467 |
- opened host TAP interface. |
2468 |
-@@ -1625,7 +1625,7 @@ qemu-system-i386 linux.img \ |
2469 |
- #launch a QEMU instance with the default network helper to |
2470 |
- #connect a TAP device to bridge br0 |
2471 |
- qemu-system-i386 linux.img \ |
2472 |
-- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper" |
2473 |
-+ -net nic -net tap,"helper=/usr/local/libexec/xen-bridge-helper" |
2474 |
- @end example |
2475 |
- |
2476 |
- @item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}] |
2477 |
-@@ -1634,7 +1634,7 @@ Connect a host TAP network interface to a host bridge device. |
2478 |
- |
2479 |
- Use the network helper @var{helper} to configure the TAP interface and |
2480 |
- attach it to the bridge. The default network helper executable is |
2481 |
--@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge |
2482 |
-+@file{/usr/local/libexec/xen-bridge-helper} and the default bridge |
2483 |
- device is @file{br0}. |
2484 |
- |
2485 |
- Examples: |
2486 |
|
2487 |
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.0-network-bridge-broadcast.patch b/app-emulation/xen-tools/files/xen-tools-3.4.0-network-bridge-broadcast.patch |
2488 |
deleted file mode 100644 |
2489 |
index c926510..0000000 |
2490 |
--- a/app-emulation/xen-tools/files/xen-tools-3.4.0-network-bridge-broadcast.patch |
2491 |
+++ /dev/null |
2492 |
@@ -1,11 +0,0 @@ |
2493 |
---- xen-3.4.0/tools/hotplug/Linux/network-bridge.orig 2009-05-18 15:05:38.000000000 +0400 |
2494 |
-+++ xen-3.4.0/tools/hotplug/Linux/network-bridge 2009-06-09 23:16:05.000000000 +0400 |
2495 |
-@@ -101,7 +101,7 @@ |
2496 |
- tdev=tmpbridge |
2497 |
- |
2498 |
- get_ip_info() { |
2499 |
-- addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'` |
2500 |
-+ addr_pfx=`ip addr show dev $1 | egrep '^ *inet ' | sed -e 's/ *inet //' -e "s/$1//"` |
2501 |
- gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'` |
2502 |
- } |
2503 |
- |
2504 |
|
2505 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4-docfix.patch b/app-emulation/xen-tools/files/xen-tools-4-docfix.patch |
2506 |
deleted file mode 100644 |
2507 |
index c9205a4..0000000 |
2508 |
--- a/app-emulation/xen-tools/files/xen-tools-4-docfix.patch |
2509 |
+++ /dev/null |
2510 |
@@ -1,12 +0,0 @@ |
2511 |
-diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile |
2512 |
---- xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800 |
2513 |
-+++ xen-4.2.0/tools/qemu-xen-traditional/Makefile 2013-01-29 11:12:20.502989453 +0800 |
2514 |
-@@ -275,7 +275,7 @@ |
2515 |
- |
2516 |
- # documentation |
2517 |
- %.html: %.texi |
2518 |
-- texi2html -monolithic -number $< |
2519 |
-+ texi2html -monolithic $< |
2520 |
- |
2521 |
- %.info: %.texi |
2522 |
- makeinfo $< -o $@ |
2523 |
|
2524 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch |
2525 |
deleted file mode 100644 |
2526 |
index 902c9ac..0000000 |
2527 |
--- a/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch |
2528 |
+++ /dev/null |
2529 |
@@ -1,33 +0,0 @@ |
2530 |
---- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-27 21:57:04.481812859 +0100 |
2531 |
-+++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-06-02 18:52:44.935034128 +0100 |
2532 |
-@@ -48,7 +48,7 @@ |
2533 |
- else |
2534 |
- CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin |
2535 |
- endif |
2536 |
--ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) |
2537 |
-+ETHERBOOT_ROMS := $(addprefix /usr/share/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS))) |
2538 |
- endif |
2539 |
- |
2540 |
- ROMS := |
2541 |
---- xen-4.2.0/Config.mk.orig 2012-05-27 21:57:04.479812884 +0100 |
2542 |
-+++ xen-4.2.0/Config.mk 2012-06-02 18:55:14.087169469 +0100 |
2543 |
-@@ -206,7 +206,7 @@ |
2544 |
- # Wed Jun 26 16:30:45 2013 +0100 |
2545 |
- # xen: Don't perform SMP setup. |
2546 |
- |
2547 |
--ETHERBOOT_NICS ?= rtl8139 8086100e |
2548 |
-+ETHERBOOT_NICS ?= 10ec8139 8086100e |
2549 |
- |
2550 |
- # Specify which qemu-dm to use. This may be `ioemu' to use the old |
2551 |
- # Mercurial in-tree version, or a local directory, or a git URL. |
2552 |
---- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-27 21:57:04.480812871 +0100 |
2553 |
-+++ xen-4.2.0/tools/firmware/Makefile 2012-06-02 19:03:52.254691484 +0100 |
2554 |
-@@ -10,7 +10,7 @@ |
2555 |
- #SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir |
2556 |
- SUBDIRS-$(CONFIG_ROMBIOS) += rombios |
2557 |
- SUBDIRS-$(CONFIG_ROMBIOS) += vgabios |
2558 |
--SUBDIRS-$(CONFIG_ROMBIOS) += etherboot |
2559 |
-+#SUBDIRS-$(CONFIG_ROMBIOS) += etherboot |
2560 |
- SUBDIRS-y += hvmloader |
2561 |
- |
2562 |
- ovmf: |
2563 |
|
2564 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch |
2565 |
deleted file mode 100644 |
2566 |
index 4b3a4ba..0000000 |
2567 |
--- a/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch |
2568 |
+++ /dev/null |
2569 |
@@ -1,12 +0,0 @@ |
2570 |
-diff -ur xen-4.1.1.orig//tools/hotplug/Linux/network-bridge xen-4.1.1/tools/hotplug/Linux/network-bridge |
2571 |
---- xen-4.1.1.orig//tools/hotplug/Linux/network-bridge 2011-10-14 02:28:43.481714285 +0800 |
2572 |
-+++ xen-4.1.1/tools/hotplug/Linux/network-bridge 2011-10-16 01:06:11.226673108 +0800 |
2573 |
-@@ -216,7 +216,7 @@ |
2574 |
- return |
2575 |
- fi |
2576 |
- |
2577 |
-- if [ `brctl show | wc -l` != 1 ]; then |
2578 |
-+ if [ `brctl show | grep $netdev | wc -l` != 0 ]; then |
2579 |
- return |
2580 |
- fi |
2581 |
- |
2582 |
|
2583 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4.3-ar-cc.patch b/app-emulation/xen-tools/files/xen-tools-4.3-ar-cc.patch |
2584 |
deleted file mode 100644 |
2585 |
index 174b404..0000000 |
2586 |
--- a/app-emulation/xen-tools/files/xen-tools-4.3-ar-cc.patch |
2587 |
+++ /dev/null |
2588 |
@@ -1,84 +0,0 @@ |
2589 |
-diff -ur xen-4.3.0.orig/tools/debugger/gdbsx/gx/Makefile xen-4.3.0/tools/debugger/gdbsx/gx/Makefile |
2590 |
---- tools/debugger/gdbsx/gx/Makefile 2013-07-09 18:46:56.000000000 +0800 |
2591 |
-+++ tools/debugger/gdbsx/gx/Makefile 2013-07-23 16:14:53.930752663 +0800 |
2592 |
-@@ -3,6 +3,7 @@ |
2593 |
- |
2594 |
- GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o |
2595 |
- GX_HDRS := $(wildcard *.h) |
2596 |
-+AR="ar" |
2597 |
- |
2598 |
- .PHONY: all |
2599 |
- all: gx_all.a |
2600 |
-@@ -16,5 +17,5 @@ |
2601 |
- # $(CC) -c $(CFLAGS) -o $@ $< |
2602 |
- |
2603 |
- gx_all.a: $(GX_OBJS) Makefile $(GX_HDRS) |
2604 |
-- ar cr $@ $(GX_OBJS) # problem with ld using -m32 |
2605 |
-+ $(AR) cr $@ $(GX_OBJS) # problem with ld using -m32 |
2606 |
- |
2607 |
-diff -ur xen-4.3.0.orig/tools/firmware/rombios/Makefile xen-4.3.0/tools/firmware/rombios/Makefile |
2608 |
---- tools/firmware/rombios/Makefile 2013-07-09 18:46:56.000000000 +0800 |
2609 |
-+++ tools/firmware/rombios/Makefile 2013-07-23 21:57:21.258085143 +0800 |
2610 |
-@@ -1,5 +1,6 @@ |
2611 |
- XEN_ROOT = $(CURDIR)/../../.. |
2612 |
- include $(XEN_ROOT)/tools/Rules.mk |
2613 |
-+CC="gcc" |
2614 |
- |
2615 |
- SUBDIRS := 32bit |
2616 |
- |
2617 |
-@@ -16,7 +17,7 @@ |
2618 |
- rm -f $(DEPS) |
2619 |
- |
2620 |
- BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c |
2621 |
-- gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c |
2622 |
-+ $(CC) -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c |
2623 |
- bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c |
2624 |
- sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s |
2625 |
- as86 _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt |
2626 |
-@@ -26,6 +27,6 @@ |
2627 |
- rm -f _rombios_.s |
2628 |
- |
2629 |
- biossums: biossums.c |
2630 |
-- gcc -o biossums biossums.c |
2631 |
-+ $(CC) -o biossums biossums.c |
2632 |
- |
2633 |
- -include $(DEPS) |
2634 |
-diff -ur xen-4.3.0.orig/tools/firmware/vgabios/Makefile xen-4.3.0/tools/firmware/vgabios/Makefile |
2635 |
---- tools/firmware/vgabios/Makefile 2013-07-09 18:46:56.000000000 +0800 |
2636 |
-+++ tools/firmware/vgabios/Makefile 2013-07-23 22:42:39.041261388 +0800 |
2637 |
-@@ -37,7 +37,7 @@ |
2638 |
- tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/ |
2639 |
- |
2640 |
- vgabios.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h |
2641 |
-- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c |
2642 |
-+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c |
2643 |
- $(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c |
2644 |
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s |
2645 |
- $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt |
2646 |
-@@ -47,7 +47,7 @@ |
2647 |
- ls -l VGABIOS-lgpl-latest.bin |
2648 |
- |
2649 |
- vgabios.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h |
2650 |
-- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c |
2651 |
-+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c |
2652 |
- $(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c |
2653 |
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s |
2654 |
- $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt |
2655 |
-@@ -57,7 +57,7 @@ |
2656 |
- ls -l VGABIOS-lgpl-latest.debug.bin |
2657 |
- |
2658 |
- vgabios-cirrus.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c |
2659 |
-- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c |
2660 |
-+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c |
2661 |
- $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c |
2662 |
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s |
2663 |
- $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios-cirrus.txt |
2664 |
-@@ -67,7 +67,7 @@ |
2665 |
- ls -l VGABIOS-lgpl-latest.cirrus.bin |
2666 |
- |
2667 |
- vgabios-cirrus.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c |
2668 |
-- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c |
2669 |
-+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c |
2670 |
- $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c |
2671 |
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s |
2672 |
- $(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios-cirrus.debug.txt |
2673 |
|
2674 |
diff --git a/app-emulation/xen-tools/files/xen-tools-4.4-api-fix.patch b/app-emulation/xen-tools/files/xen-tools-4.4-api-fix.patch |
2675 |
deleted file mode 100644 |
2676 |
index fc0124c..0000000 |
2677 |
--- a/app-emulation/xen-tools/files/xen-tools-4.4-api-fix.patch |
2678 |
+++ /dev/null |
2679 |
@@ -1,48 +0,0 @@ |
2680 |
-diff --git a/tools/configure b/tools/configure |
2681 |
-index afc3000..6187468 100755 |
2682 |
---- a/tools/configure |
2683 |
-+++ b/tools/configure |
2684 |
-@@ -4615,7 +4615,7 @@ if test x"${PERL}" = x"no" |
2685 |
- then |
2686 |
- as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 |
2687 |
- fi |
2688 |
--if test "x$xapi" = "xy"; then : |
2689 |
-+if test "x$xenapi" = "xy"; then : |
2690 |
- |
2691 |
- # Extract the first word of "curl-config", so it can be a program name with args. |
2692 |
- set dummy curl-config; ac_word=$2 |
2693 |
-diff --git a/tools/configure.ac b/tools/configure.ac |
2694 |
-index 0754f0e..cc884f7 100644 |
2695 |
---- a/tools/configure.ac |
2696 |
-+++ b/tools/configure.ac |
2697 |
-@@ -150,7 +150,7 @@ AC_PROG_INSTALL |
2698 |
- AC_PATH_PROG([BISON], [bison]) |
2699 |
- AC_PATH_PROG([FLEX], [flex]) |
2700 |
- AX_PATH_PROG_OR_FAIL([PERL], [perl]) |
2701 |
--AS_IF([test "x$xapi" = "xy"], [ |
2702 |
-+AS_IF([test "x$xenapi" = "xy"], [ |
2703 |
- AX_PATH_PROG_OR_FAIL([CURL], [curl-config]) |
2704 |
- AX_PATH_PROG_OR_FAIL([XML], [xml2-config]) |
2705 |
- ]) |
2706 |
-diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile |
2707 |
-index b66f0bc..94b854b 100644 |
2708 |
---- a/tools/libxen/Makefile |
2709 |
-+++ b/tools/libxen/Makefile |
2710 |
-@@ -22,12 +22,15 @@ MAJOR = 1.0 |
2711 |
- MINOR = 0 |
2712 |
- |
2713 |
- CFLAGS += -Iinclude \ |
2714 |
-- $(shell $(XML2_CONFIG) --cflags) \ |
2715 |
-- $(shell $(CURL_CONFIG) --cflags) \ |
2716 |
- -fPIC |
2717 |
- |
2718 |
-+ifeq ($(LIBXENAPI_BINDINGS),y) |
2719 |
-+CFLAGS += $(shell $(XML2_CONFIG) --cflags) \ |
2720 |
-+ $(shell $(CURL_CONFIG) --cflags) |
2721 |
-+ |
2722 |
- LDFLAGS += $(shell $(XML2_CONFIG) --libs) \ |
2723 |
- $(shell $(CURL_CONFIG) --libs) |
2724 |
-+endif |
2725 |
- |
2726 |
- LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h) include/xen/api/xen_all.h |
2727 |
- LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c)) |
2728 |
|
2729 |
diff --git a/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch b/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch |
2730 |
deleted file mode 100644 |
2731 |
index 2059d6c..0000000 |
2732 |
--- a/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch |
2733 |
+++ /dev/null |
2734 |
@@ -1,56 +0,0 @@ |
2735 |
-diff -uNr a/tools/Makefile b/tools/Makefile |
2736 |
---- a/tools/Makefile 2012-03-10 07:19:16.000000000 +0100 |
2737 |
-+++ b/tools/Makefile 2012-03-12 17:19:04.000000000 +0100 |
2738 |
-@@ -118,11 +118,17 @@ |
2739 |
- $(GIT) reset --hard $(QEMU_TAG); \ |
2740 |
- fi |
2741 |
- |
2742 |
--subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find |
2743 |
-+subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find |
2744 |
- set -e; \ |
2745 |
- $(buildmakevars2shellvars); \ |
2746 |
- cd qemu-xen-traditional-dir; \ |
2747 |
- $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \ |
2748 |
-+ $(MAKE) |
2749 |
-+ |
2750 |
-+subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find |
2751 |
-+ set -e; \ |
2752 |
-+ $(buildmakevars2shellvars); \ |
2753 |
-+ cd qemu-xen-traditional-dir; \ |
2754 |
- $(MAKE) install |
2755 |
- |
2756 |
- subdir-clean-qemu-xen-traditional-dir: |
2757 |
-@@ -140,14 +146,14 @@ |
2758 |
- $(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \ |
2759 |
- fi |
2760 |
- |
2761 |
--subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find |
2762 |
-+subdir-all-qemu-xen-dir: qemu-xen-dir-find |
2763 |
- if test -d $(QEMU_UPSTREAM_URL) ; then \ |
2764 |
- source=$(QEMU_UPSTREAM_URL); \ |
2765 |
- else \ |
2766 |
- source=.; \ |
2767 |
- fi; \ |
2768 |
- cd qemu-xen-dir; \ |
2769 |
-- $$source/configure --enable-xen --target-list=i386-softmmu \ |
2770 |
-+ CFLAGS="" $$source/configure --enable-xen --target-list=i386-softmmu \ |
2771 |
- --source-path=$$source \ |
2772 |
- --extra-cflags="-I$(XEN_ROOT)/tools/include \ |
2773 |
- -I$(XEN_ROOT)/tools/libxc \ |
2774 |
-@@ -156,8 +162,16 @@ |
2775 |
- -L$(XEN_ROOT)/tools/xenstore" \ |
2776 |
- --bindir=$(LIBEXEC) \ |
2777 |
- --disable-kvm \ |
2778 |
-+ --disable-docs \ |
2779 |
-+ --datadir=$(DESTDIR)/usr/share/xen/qemu-upstream \ |
2780 |
-+ --sysconfdir=$(DESTDIR)/etc/xen/qemu-upstream \ |
2781 |
- --python=$(PYTHON) \ |
2782 |
- $(IOEMU_CONFIGURE_CROSS); \ |
2783 |
-+ sed -i 's#$$(sysconfdir)/qemu#$$(sysconfdir)#' Makefile; \ |
2784 |
-+ $(MAKE) |
2785 |
-+ |
2786 |
-+subdir-install-qemu-xen-dir: qemu-xen-dir-find |
2787 |
-+ cd qemu-xen-dir; \ |
2788 |
- $(MAKE) install |
2789 |
- |
2790 |
- subdir-clean-qemu-xen-dir: |
2791 |
|
2792 |
diff --git a/app-emulation/xen-tools/files/xencommons.initd b/app-emulation/xen-tools/files/xencommons.initd |
2793 |
index 5ece118..d1fbb18 100644 |
2794 |
--- a/app-emulation/xen-tools/files/xencommons.initd |
2795 |
+++ b/app-emulation/xen-tools/files/xencommons.initd |
2796 |
@@ -1,7 +1,6 @@ |
2797 |
-#!/sbin/runscript |
2798 |
+#!/sbin/openrc-run |
2799 |
# Copyright 1999-2013 Gentoo Foundation |
2800 |
# Distributed under the terms of the GNU General Public License v2 |
2801 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xencommons.initd,v 1.1 2013/12/06 23:34:11 idella4 Exp $ |
2802 |
|
2803 |
depend() { |
2804 |
before xenstored |
2805 |
|
2806 |
diff --git a/app-emulation/xen-tools/files/xenconsoled.initd b/app-emulation/xen-tools/files/xenconsoled.initd |
2807 |
index e2d245f..d31737a 100644 |
2808 |
--- a/app-emulation/xen-tools/files/xenconsoled.initd |
2809 |
+++ b/app-emulation/xen-tools/files/xenconsoled.initd |
2810 |
@@ -1,7 +1,6 @@ |
2811 |
-#!/sbin/runscript |
2812 |
+#!/sbin/openrc-run |
2813 |
# Copyright 1999-2014 Gentoo Foundation |
2814 |
# Distributed under the terms of the GNU General Public License v2 |
2815 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenconsoled.initd,v 1.6 2014/02/13 07:59:09 dlan Exp $ |
2816 |
|
2817 |
depend() { |
2818 |
need xenstored |
2819 |
|
2820 |
diff --git a/app-emulation/xen-tools/files/xend.initd-r2 b/app-emulation/xen-tools/files/xend.initd-r2 |
2821 |
deleted file mode 100644 |
2822 |
index 837decc..0000000 |
2823 |
--- a/app-emulation/xen-tools/files/xend.initd-r2 |
2824 |
+++ /dev/null |
2825 |
@@ -1,52 +0,0 @@ |
2826 |
-#!/sbin/runscript |
2827 |
-# Copyright 1999-2014 Gentoo Foundation |
2828 |
-# Distributed under the terms of the GNU General Public License v2 |
2829 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.5 2014/01/02 04:58:53 idella4 Exp $ |
2830 |
- |
2831 |
-extra_commands="status" |
2832 |
- |
2833 |
-depend() { |
2834 |
- need net xenconsoled xenstored |
2835 |
- before xendomains sshd |
2836 |
-} |
2837 |
- |
2838 |
-await_daemons_up() { |
2839 |
- for ((i=0; i<5; i++)); do |
2840 |
- sleep 1 |
2841 |
- /usr/sbin/xend status && return 0 |
2842 |
- done |
2843 |
- return 1 |
2844 |
-} |
2845 |
- |
2846 |
-is_privileged_domain() { |
2847 |
- grep -qsE '^control_d$' /proc/xen/capabilities |
2848 |
- return $? |
2849 |
-} |
2850 |
- |
2851 |
-start() { |
2852 |
- if is_privileged_domain ; then |
2853 |
- ebegin "Starting Xen control daemon" |
2854 |
- /usr/sbin/xend start |
2855 |
- /usr/sbin/xend status || await_daemons_up |
2856 |
- eend $? |
2857 |
- else |
2858 |
- eerror "Can't start xend - this is not a privileged domain." |
2859 |
- return 1 |
2860 |
- fi |
2861 |
-} |
2862 |
- |
2863 |
-stop() { |
2864 |
- if [ "$(xm list | wc -l)" -gt 2 ]; then |
2865 |
- ebegin " Stopping all domains" |
2866 |
- /usr/sbin/xl shutdown -a -w >/dev/null |
2867 |
- eend $? |
2868 |
- fi |
2869 |
- |
2870 |
- ebegin "Stopping Xen control daemon" |
2871 |
- /usr/sbin/xend stop |
2872 |
- eend $? |
2873 |
-} |
2874 |
- |
2875 |
-status() { |
2876 |
- is_privileged_domain && /usr/sbin/xend status |
2877 |
-} |
2878 |
|
2879 |
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2 |
2880 |
index 103384c..c1a7081 100644 |
2881 |
--- a/app-emulation/xen-tools/files/xendomains.initd-r2 |
2882 |
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2 |
2883 |
@@ -1,7 +1,6 @@ |
2884 |
-#!/sbin/runscript |
2885 |
-# Copyright 1999-2013 Gentoo Foundation |
2886 |
+#!/sbin/openrc-run |
2887 |
+# Copyright 1999-2014 Gentoo Foundation |
2888 |
# Distributed under the terms of the GNU General Public License v2 |
2889 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.8 2013/07/27 06:11:03 idella4 Exp $ |
2890 |
|
2891 |
extra_commands="status" |
2892 |
|
2893 |
@@ -77,7 +76,7 @@ stop() { |
2894 |
# Stop all domains with config files in AUTODIR. |
2895 |
DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)" |
2896 |
|
2897 |
- if [[ "$PARALLEL_SHUTDOWN" == "yes" ]] ; then |
2898 |
+ if [ "$PARALLEL_SHUTDOWN" = "yes" ] ; then |
2899 |
for dom in $DOMAINS ; do |
2900 |
name=$(get_domname ${dom}) |
2901 |
if is_running ${name} ; then |
2902 |
|
2903 |
diff --git a/app-emulation/xen-tools/files/xenqemudev.initd b/app-emulation/xen-tools/files/xenqemudev.initd |
2904 |
index 6f7066e..90da3ac 100644 |
2905 |
--- a/app-emulation/xen-tools/files/xenqemudev.initd |
2906 |
+++ b/app-emulation/xen-tools/files/xenqemudev.initd |
2907 |
@@ -1,7 +1,6 @@ |
2908 |
-#!/sbin/runscript |
2909 |
-# Copyright 1999-2013 Gentoo Foundation |
2910 |
+#!/sbin/openrc-run |
2911 |
+# Copyright 1999-2014 Gentoo Foundation |
2912 |
# Distributed under the terms of the GNU General Public License v2 |
2913 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenqemudev.initd,v 1.2 2013/12/07 06:49:41 idella4 Exp $ |
2914 |
|
2915 |
depend() { |
2916 |
need xencommons xenstored xenconsoled |
2917 |
@@ -16,7 +15,11 @@ xen_setvars() { |
2918 |
. /etc/xen/scripts/hotplugpath.sh |
2919 |
|
2920 |
XENQEMUDEV_PIDFILE=/run/xenqemudev.pid |
2921 |
+ |
2922 |
+ # xen-4.5 change the path |
2923 |
XEN_QEMU="${LIBEXEC}/qemu-system-i386" |
2924 |
+ [ -e ${XEN_QEMU} ] && return |
2925 |
+ XEN_QEMU="${LIBEXEC_BIN}/qemu-system-i386" |
2926 |
} |
2927 |
|
2928 |
xen_qemu_start() { |
2929 |
|
2930 |
diff --git a/app-emulation/xen-tools/files/xenstored.initd b/app-emulation/xen-tools/files/xenstored.initd |
2931 |
old mode 100755 |
2932 |
new mode 100644 |
2933 |
index 09009ea..d92616b |
2934 |
--- a/app-emulation/xen-tools/files/xenstored.initd |
2935 |
+++ b/app-emulation/xen-tools/files/xenstored.initd |
2936 |
@@ -1,4 +1,4 @@ |
2937 |
-#!/sbin/runscript |
2938 |
+#!/sbin/openrc-run |
2939 |
# Copyright 1999-2014 Gentoo Foundation |
2940 |
# Distributed under the terms of the GNU General Public License v2 |
2941 |
|
2942 |
@@ -22,7 +22,7 @@ start() { |
2943 |
--pidfile /run/xenstored.pid \ |
2944 |
-- --pid-file=/run/xenstored.pid \ |
2945 |
$XENSTORED_OPTS |
2946 |
- until xenstore-exists \ || ((15 < ++i)) |
2947 |
+ until xenstore-exists / || $((15 < ++i)) |
2948 |
do |
2949 |
echo -n . |
2950 |
sleep 1 |
2951 |
|
2952 |
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml |
2953 |
index bd4d8c1..5009c6f 100644 |
2954 |
--- a/app-emulation/xen-tools/metadata.xml |
2955 |
+++ b/app-emulation/xen-tools/metadata.xml |
2956 |
@@ -1,16 +1,22 @@ |
2957 |
<?xml version="1.0" encoding="UTF-8"?> |
2958 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
2959 |
<pkgmetadata> |
2960 |
- <herd>xen</herd> |
2961 |
+ <maintainer type="project"> |
2962 |
+ <email>xen@g.o</email> |
2963 |
+ <name>Gentoo Xen Project</name> |
2964 |
+ </maintainer> |
2965 |
<use> |
2966 |
- <flag name='api'>Build the C libxenapi bindings</flag> |
2967 |
- <flag name='flask'>Enable the Flask XSM module from NSA</flag> |
2968 |
- <flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v)</flag> |
2969 |
- <flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag> |
2970 |
- <flag name='pygrub'>Install the pygrub boot loader</flag> |
2971 |
- <flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag> |
2972 |
- <flag name='xend'>Enable support the xend and xm to manage xen</flag> |
2973 |
- <flag name='ocaml'>Enable support for the ocaml language</flag> |
2974 |
- <flag name='pam'>Enable pam support</flag> |
2975 |
+ <flag name="api">Build the C libxenapi bindings</flag> |
2976 |
+ <flag name="flask">Enable the Flask XSM module from NSA</flag> |
2977 |
+ <flag name="hvm">Enable support for hardware based virtualization (VT-x,AMD-v)</flag> |
2978 |
+ <flag name="qemu">Enable IOEMU support via the use of qemu-dm</flag> |
2979 |
+ <flag name="qemu-traditional">Build the old qemu traditional device model (useful only if you cannot change to the new device model e.g. Windows VMs)</flag> |
2980 |
+ <flag name="pygrub">Install the pygrub boot loader</flag> |
2981 |
+ <flag name="screen">Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag> |
2982 |
+ <flag name="system-qemu">Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag> |
2983 |
+ <flag name="system-seabios">Using <pkg>sys-firmware/seabios</pkg> instead of the bundled one</flag> |
2984 |
+ <flag name="ocaml">Enable support for the ocaml language</flag> |
2985 |
+ <flag name="ovmf">Enable support to boot UEFI guest vm, needed by hvm</flag> |
2986 |
+ <flag name="pam">Enable pam support</flag> |
2987 |
</use> |
2988 |
</pkgmetadata> |
2989 |
|
2990 |
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2.ebuild |
2991 |
deleted file mode 100644 |
2992 |
index a1c3581..0000000 |
2993 |
--- a/app-emulation/xen-tools/xen-tools-4.2.2.ebuild |
2994 |
+++ /dev/null |
2995 |
@@ -1,347 +0,0 @@ |
2996 |
-# Copyright 1999-2013 Gentoo Foundation |
2997 |
-# Distributed under the terms of the GNU General Public License v2 |
2998 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r2.ebuild,v 1.6 2013/03/05 18:05:35 idella4 Exp $ |
2999 |
- |
3000 |
-EAPI=5 |
3001 |
- |
3002 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
3003 |
-PYTHON_REQ_USE='xml,threads' |
3004 |
- |
3005 |
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" |
3006 |
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2" |
3007 |
- |
3008 |
-if [[ $PV == *9999 ]]; then |
3009 |
- KEYWORDS="" |
3010 |
- REPO="xen-unstable.hg" |
3011 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
3012 |
- S="${WORKDIR}/${REPO}" |
3013 |
- live_eclass="mercurial" |
3014 |
-else |
3015 |
- KEYWORDS="~amd64 ~x86" |
3016 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
3017 |
- $IPXE_TARBALL_URL |
3018 |
- $XEN_SEABIOS_URL" |
3019 |
- S="${WORKDIR}/xen-${PV}" |
3020 |
-fi |
3021 |
- |
3022 |
-inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
3023 |
- |
3024 |
-DESCRIPTION="Xend daemon and tools" |
3025 |
-HOMEPAGE="http://xen.org/" |
3026 |
-DOCS=( README docs/README.xen-bugtool ) |
3027 |
- |
3028 |
-LICENSE="GPL-2" |
3029 |
-SLOT="0" |
3030 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend" |
3031 |
- |
3032 |
-REQUIRED_USE="hvm? ( qemu )" |
3033 |
- |
3034 |
-CDEPEND="<dev-libs/yajl-2 |
3035 |
- dev-python/lxml[${PYTHON_USEDEP}] |
3036 |
- dev-python/pypam[${PYTHON_USEDEP}] |
3037 |
- sys-libs/zlib |
3038 |
- sys-power/iasl |
3039 |
- ocaml? ( dev-ml/findlib ) |
3040 |
- hvm? ( media-libs/libsdl ) |
3041 |
- ${PYTHON_DEPS} |
3042 |
- api? ( dev-libs/libxml2 |
3043 |
- net-misc/curl ) |
3044 |
- ${PYTHON_DEPS} |
3045 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )" |
3046 |
-DEPEND="${CDEPEND} |
3047 |
- sys-devel/bin86 |
3048 |
- sys-devel/dev86 |
3049 |
- dev-lang/perl |
3050 |
- app-misc/pax-utils |
3051 |
- doc? ( |
3052 |
- app-doc/doxygen |
3053 |
- dev-tex/latex2html[png,gif] |
3054 |
- media-gfx/transfig |
3055 |
- media-gfx/graphviz |
3056 |
- dev-tex/xcolor |
3057 |
- dev-texlive/texlive-latexextra |
3058 |
- virtual/latex-base |
3059 |
- dev-tex/latexmk |
3060 |
- dev-texlive/texlive-latex |
3061 |
- dev-texlive/texlive-pictures |
3062 |
- dev-texlive/texlive-latexrecommended |
3063 |
- ) |
3064 |
- hvm? ( x11-proto/xproto |
3065 |
- )" |
3066 |
-RDEPEND="${CDEPEND} |
3067 |
- sys-apps/iproute2 |
3068 |
- net-misc/bridge-utils |
3069 |
- ocaml? ( >=dev-lang/ocaml-3.12.0 ) |
3070 |
- screen? ( |
3071 |
- app-misc/screen |
3072 |
- app-admin/logrotate |
3073 |
- ) |
3074 |
- virtual/udev" |
3075 |
- |
3076 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
3077 |
-# Approved by QA team in bug #144032 |
3078 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
3079 |
- |
3080 |
-RESTRICT="test" |
3081 |
- |
3082 |
-pkg_setup() { |
3083 |
- python-single-r1_pkg_setup |
3084 |
- export "CONFIG_LOMOUNT=y" |
3085 |
- |
3086 |
- if has_version dev-libs/libgcrypt; then |
3087 |
- export "CONFIG_GCRYPT=y" |
3088 |
- fi |
3089 |
- |
3090 |
- if use qemu; then |
3091 |
- export "CONFIG_IOEMU=y" |
3092 |
- else |
3093 |
- export "CONFIG_IOEMU=n" |
3094 |
- fi |
3095 |
- |
3096 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
3097 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
3098 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
3099 |
- eerror "to build xen-tools on your current profile." |
3100 |
- die "USE=hvm is unsupported on this system." |
3101 |
- fi |
3102 |
- |
3103 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
3104 |
- if use x86 && use amd64; then |
3105 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
3106 |
- elif use x86; then |
3107 |
- export XEN_TARGET_ARCH="x86_32" |
3108 |
- elif use amd64 ; then |
3109 |
- export XEN_TARGET_ARCH="x86_64" |
3110 |
- else |
3111 |
- die "Unsupported architecture!" |
3112 |
- fi |
3113 |
- fi |
3114 |
- |
3115 |
- use api && export "LIBXENAPI_BINDINGS=y" |
3116 |
- use flask && export "FLASK_ENABLE=y" |
3117 |
-} |
3118 |
- |
3119 |
-src_prepare() { |
3120 |
- # Drop .config, fixes to gcc-4.6 |
3121 |
- epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch |
3122 |
- |
3123 |
- # Xend |
3124 |
- if ! use xend; then |
3125 |
- sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ |
3126 |
- -i tools/misc/Makefile || die "Disabling xend failed" |
3127 |
- sed -e 's:^XEND_INITD:#XEND_INITD:' \ |
3128 |
- -i tools/examples/Makefile || die "Disabling xend failed" |
3129 |
- fi |
3130 |
- |
3131 |
- # if the user *really* wants to use their own custom-cflags, let them |
3132 |
- if use custom-cflags; then |
3133 |
- einfo "User wants their own CFLAGS - removing defaults" |
3134 |
- |
3135 |
- # try and remove all the default cflags |
3136 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
3137 |
- -exec sed \ |
3138 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
3139 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
3140 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
3141 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
3142 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
3143 |
- -i {} + || die "failed to re-set custom-cflags" |
3144 |
- fi |
3145 |
- |
3146 |
- if ! use pygrub; then |
3147 |
- sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die |
3148 |
- fi |
3149 |
- |
3150 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
3151 |
- if ! use hvm; then |
3152 |
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die |
3153 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
3154 |
- fi |
3155 |
- |
3156 |
- # Don't bother with qemu, only needed for fully virtualised guests |
3157 |
- if ! use qemu; then |
3158 |
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die |
3159 |
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die |
3160 |
- fi |
3161 |
- |
3162 |
- # Fix texi2html build error with new texi2html |
3163 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch |
3164 |
- |
3165 |
- # Fix network broadcast on bridged networks |
3166 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
3167 |
- |
3168 |
- # Prevent the downloading of ipxe, seabios |
3169 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-anti-download.patch |
3170 |
- cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die |
3171 |
- mv ../seabios-dir-remote tools/firmware/ || die |
3172 |
- pushd tools/firmware/ > /dev/null |
3173 |
- ln -s seabios-dir-remote seabios-dir || die |
3174 |
- popd > /dev/null |
3175 |
- |
3176 |
- # Fix bridge by idella4, bug #362575 |
3177 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
3178 |
- |
3179 |
- # Don't build ipxe with pie on hardened, Bug #360805 |
3180 |
- if gcc-specs-pie; then |
3181 |
- epatch "${FILESDIR}"/ipxe-nopie.patch |
3182 |
- fi |
3183 |
- |
3184 |
- # Prevent double stripping of files at install |
3185 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch |
3186 |
- |
3187 |
- # fix jobserver in Makefile |
3188 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch |
3189 |
- |
3190 |
- #Sec patch, currently valid |
3191 |
- epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch |
3192 |
- |
3193 |
- if use hvm; then |
3194 |
- cp -r "${FILESDIR}"/stubs-32.h xen/tools/include || die "copy of header file failed" |
3195 |
- einfo "stubs-32.h added" |
3196 |
- fi |
3197 |
-} |
3198 |
- |
3199 |
-src_compile() { |
3200 |
- export VARTEXFONTS="${T}/fonts" |
3201 |
- local myopt |
3202 |
- use debug && myopt="${myopt} debug=y" |
3203 |
- |
3204 |
- use custom-cflags || unset CFLAGS |
3205 |
- if test-flag-CC -fno-strict-overflow; then |
3206 |
- append-flags -fno-strict-overflow |
3207 |
- fi |
3208 |
- |
3209 |
- unset LDFLAGS |
3210 |
- unset CFLAGS |
3211 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools ${myopt} |
3212 |
- |
3213 |
- use doc && emake -C docs txt html |
3214 |
- emake -C docs man-pages |
3215 |
-} |
3216 |
- |
3217 |
-src_install() { |
3218 |
- # Override auto-detection in the build system, bug #382573 |
3219 |
- export INITD_DIR=/tmp/init.d |
3220 |
- export CONFIG_LEAF_DIR=../tmp/default |
3221 |
- |
3222 |
- # Let the build system compile installed Python modules. |
3223 |
- local PYTHONDONTWRITEBYTECODE |
3224 |
- export PYTHONDONTWRITEBYTECODE |
3225 |
- |
3226 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-tools |
3227 |
- |
3228 |
- # Fix the remaining Python shebangs. |
3229 |
- python_fix_shebang "${D}" |
3230 |
- |
3231 |
- # Remove RedHat-specific stuff |
3232 |
- rm -rf "${D}"tmp || die |
3233 |
- |
3234 |
- # uncomment lines in xl.conf |
3235 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
3236 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
3237 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
3238 |
- -i tools/examples/xl.conf || die |
3239 |
- |
3240 |
- if use doc; then |
3241 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
3242 |
- |
3243 |
- dohtml -r docs/ |
3244 |
- docinto pdf |
3245 |
- dodoc ${DOCS[@]} |
3246 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
3247 |
- fi |
3248 |
- |
3249 |
- rm -rf "${D}"/usr/share/doc/xen/ |
3250 |
- doman docs/man?/* |
3251 |
- |
3252 |
- if use xend; then |
3253 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" |
3254 |
- fi |
3255 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
3256 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
3257 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
3258 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
3259 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
3260 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
3261 |
- |
3262 |
- if use screen; then |
3263 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
3264 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die |
3265 |
- keepdir /var/log/xen-consoles |
3266 |
- fi |
3267 |
- |
3268 |
- # Set dirs for qemu files,; Bug #458818 |
3269 |
- if use qemu; then |
3270 |
- if use x86; then |
3271 |
- dodir /usr/lib/xen/bin |
3272 |
- elif use amd64; then |
3273 |
- mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die |
3274 |
- fi |
3275 |
- fi |
3276 |
- |
3277 |
- # For -static-libs wrt Bug 384355 |
3278 |
- if ! use static-libs; then |
3279 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
3280 |
- fi |
3281 |
- |
3282 |
- # xend expects these to exist |
3283 |
- keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
3284 |
- |
3285 |
- # for xendomains |
3286 |
- keepdir /etc/xen/auto |
3287 |
- |
3288 |
- # Temp QA workaround |
3289 |
- dodir "$(udev_get_udevdir)" |
3290 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
3291 |
- rm -rf "${D}"/etc/udev |
3292 |
- |
3293 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
3294 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
3295 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
3296 |
-} |
3297 |
- |
3298 |
-pkg_postinst() { |
3299 |
- elog "Official Xen Guide and the unoffical wiki page:" |
3300 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
3301 |
- elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" |
3302 |
- |
3303 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
3304 |
- echo |
3305 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
3306 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
3307 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
3308 |
- fi |
3309 |
- |
3310 |
- # TODO: we need to have the current Python slot here. |
3311 |
- if ! has_version "dev-lang/python[ncurses]"; then |
3312 |
- echo |
3313 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
3314 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
3315 |
- fi |
3316 |
- |
3317 |
- if has_version "sys-apps/iproute2[minimal]"; then |
3318 |
- echo |
3319 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
3320 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
3321 |
- fi |
3322 |
- |
3323 |
- if ! use hvm; then |
3324 |
- echo |
3325 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
3326 |
- elog "support enable the hvm use flag." |
3327 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
3328 |
- echo |
3329 |
- elog "The qemu use flag has been removed and replaced with hvm." |
3330 |
- fi |
3331 |
- |
3332 |
- if use xend; then |
3333 |
- echo |
3334 |
- elog "xend capability has been enabled and installed" |
3335 |
- fi |
3336 |
- |
3337 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
3338 |
- echo |
3339 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
3340 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
3341 |
- fi |
3342 |
-} |
3343 |
|
3344 |
diff --git a/app-emulation/xen-tools/xen-tools-4.3.0.ebuild b/app-emulation/xen-tools/xen-tools-4.3.0.ebuild |
3345 |
deleted file mode 100644 |
3346 |
index a7da7f7..0000000 |
3347 |
--- a/app-emulation/xen-tools/xen-tools-4.3.0.ebuild |
3348 |
+++ /dev/null |
3349 |
@@ -1,381 +0,0 @@ |
3350 |
-# Copyright 1999-2013 Gentoo Foundation |
3351 |
-# Distributed under the terms of the GNU General Public License v2 |
3352 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.17 2013/08/01 08:16:07 idella4 Exp $ |
3353 |
- |
3354 |
-EAPI=5 |
3355 |
- |
3356 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
3357 |
-PYTHON_REQ_USE='xml,threads' |
3358 |
- |
3359 |
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" |
3360 |
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz" |
3361 |
- |
3362 |
-if [[ $PV == *9999 ]]; then |
3363 |
- KEYWORDS="" |
3364 |
- REPO="xen-unstable.hg" |
3365 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
3366 |
- S="${WORKDIR}/${REPO}" |
3367 |
- live_eclass="mercurial" |
3368 |
-else |
3369 |
- KEYWORDS="~amd64 ~x86" |
3370 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
3371 |
- $IPXE_TARBALL_URL |
3372 |
- $XEN_SEABIOS_URL" |
3373 |
- S="${WORKDIR}/xen-${PV}" |
3374 |
-fi |
3375 |
- |
3376 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
3377 |
- |
3378 |
-DESCRIPTION="Xend daemon and tools" |
3379 |
-HOMEPAGE="http://xen.org/" |
3380 |
-DOCS=( README docs/README.xen-bugtool ) |
3381 |
- |
3382 |
-LICENSE="GPL-2" |
3383 |
-SLOT="0" |
3384 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml python pygrub screen static-libs xend" |
3385 |
- |
3386 |
-REQUIRED_USE="hvm? ( qemu )" |
3387 |
- |
3388 |
-CDEPEND="dev-libs/lzo:2 |
3389 |
- dev-libs/yajl |
3390 |
- dev-python/lxml[${PYTHON_USEDEP}] |
3391 |
- dev-python/pypam[${PYTHON_USEDEP}] |
3392 |
- sys-libs/zlib |
3393 |
- sys-power/iasl |
3394 |
- dev-ml/findlib |
3395 |
- hvm? ( media-libs/libsdl ) |
3396 |
- ${PYTHON_DEPS} |
3397 |
- api? ( dev-libs/libxml2 |
3398 |
- net-misc/curl ) |
3399 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )" |
3400 |
-DEPEND="${CDEPEND} |
3401 |
- sys-devel/bin86 |
3402 |
- sys-devel/dev86 |
3403 |
- dev-lang/perl |
3404 |
- app-misc/pax-utils |
3405 |
- dev-python/markdown |
3406 |
- doc? ( |
3407 |
- app-doc/doxygen |
3408 |
- dev-tex/latex2html[png,gif] |
3409 |
- media-gfx/graphviz |
3410 |
- dev-tex/xcolor |
3411 |
- media-gfx/transfig |
3412 |
- dev-texlive/texlive-latexextra |
3413 |
- virtual/latex-base |
3414 |
- dev-tex/latexmk |
3415 |
- dev-texlive/texlive-latex |
3416 |
- dev-texlive/texlive-pictures |
3417 |
- dev-texlive/texlive-latexrecommended |
3418 |
- ) |
3419 |
- hvm? ( x11-proto/xproto |
3420 |
- !net-libs/libiscsi ) |
3421 |
- qemu? ( x11-libs/pixman )" |
3422 |
-RDEPEND="${CDEPEND} |
3423 |
- sys-apps/iproute2 |
3424 |
- net-misc/bridge-utils |
3425 |
- ocaml? ( >=dev-lang/ocaml-4 ) |
3426 |
- screen? ( |
3427 |
- app-misc/screen |
3428 |
- app-admin/logrotate |
3429 |
- ) |
3430 |
- virtual/udev" |
3431 |
- |
3432 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
3433 |
-# Approved by QA team in bug #144032 |
3434 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
3435 |
- |
3436 |
-RESTRICT="test" |
3437 |
- |
3438 |
-pkg_setup() { |
3439 |
- python-single-r1_pkg_setup |
3440 |
- export "CONFIG_LOMOUNT=y" |
3441 |
- |
3442 |
- if has_version dev-libs/libgcrypt; then |
3443 |
- export "CONFIG_GCRYPT=y" |
3444 |
- fi |
3445 |
- |
3446 |
- if use qemu; then |
3447 |
- export "CONFIG_IOEMU=y" |
3448 |
- else |
3449 |
- export "CONFIG_IOEMU=n" |
3450 |
- fi |
3451 |
- |
3452 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
3453 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
3454 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
3455 |
- eerror "to build xen-tools on your current profile." |
3456 |
- die "USE=hvm is unsupported on this system." |
3457 |
- fi |
3458 |
- |
3459 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
3460 |
- if use x86 && use amd64; then |
3461 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
3462 |
- elif use x86; then |
3463 |
- export XEN_TARGET_ARCH="x86_32" |
3464 |
- elif use amd64 ; then |
3465 |
- export XEN_TARGET_ARCH="x86_64" |
3466 |
- else |
3467 |
- die "Unsupported architecture!" |
3468 |
- fi |
3469 |
- fi |
3470 |
-} |
3471 |
- |
3472 |
-src_prepare() { |
3473 |
- # Drop .config, fixes to gcc-4.6 |
3474 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch |
3475 |
- |
3476 |
- # Xend |
3477 |
- if ! use xend; then |
3478 |
- sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ |
3479 |
- -i tools/misc/Makefile || die "Disabling xend failed" |
3480 |
- sed -e 's:^XEND_INITD:#XEND_INITD:' \ |
3481 |
- -i tools/examples/Makefile || die "Disabling xend failed" |
3482 |
- fi |
3483 |
- |
3484 |
- # if the user *really* wants to use their own custom-cflags, let them |
3485 |
- if use custom-cflags; then |
3486 |
- einfo "User wants their own CFLAGS - removing defaults" |
3487 |
- |
3488 |
- # try and remove all the default cflags |
3489 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
3490 |
- -exec sed \ |
3491 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
3492 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
3493 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
3494 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
3495 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
3496 |
- -i {} + || die "failed to re-set custom-cflags" |
3497 |
- fi |
3498 |
- |
3499 |
- if ! use pygrub; then |
3500 |
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die |
3501 |
- fi |
3502 |
- |
3503 |
- if ! use python; then |
3504 |
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die |
3505 |
- fi |
3506 |
- |
3507 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
3508 |
- if ! use hvm; then |
3509 |
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die |
3510 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
3511 |
- fi |
3512 |
- |
3513 |
- # Don't bother with qemu, only needed for fully virtualised guests |
3514 |
- if ! use qemu; then |
3515 |
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die |
3516 |
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die |
3517 |
- fi |
3518 |
- |
3519 |
- # Fix texi2html build error with new texi2html, qemu.doc.html |
3520 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch \ |
3521 |
- "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch |
3522 |
- |
3523 |
- # Fix network broadcast on bridged networks |
3524 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
3525 |
- |
3526 |
- # Prevent the downloading of ipxe, seabios |
3527 |
- epatch "${FILESDIR}"/${P/-tools/}-anti-download.patch |
3528 |
- cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die |
3529 |
- mv ../seabios-dir-remote tools/firmware/ || die |
3530 |
- pushd tools/firmware/ > /dev/null |
3531 |
- ln -s seabios-dir-remote seabios-dir || die |
3532 |
- popd > /dev/null |
3533 |
- |
3534 |
- # Fix bridge by idella4, bug #362575 |
3535 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
3536 |
- |
3537 |
- # Don't build ipxe with pie on hardened, Bug #360805 |
3538 |
- if gcc-specs-pie; then |
3539 |
- epatch "${FILESDIR}"/ipxe-nopie.patch |
3540 |
- fi |
3541 |
- |
3542 |
- # Prevent double stripping of files at install |
3543 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch |
3544 |
- |
3545 |
- # fix jobserver in Makefile |
3546 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch |
3547 |
- |
3548 |
- # add missing header |
3549 |
- epatch "${FILESDIR}"/xen-4-ulong.patch |
3550 |
- |
3551 |
- # Set dom0-min-mem to kb; Bug #472982 |
3552 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch |
3553 |
- |
3554 |
- #Security patches, currently valid |
3555 |
- epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \ |
3556 |
- "${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch |
3557 |
- |
3558 |
- # Bug 472438 |
3559 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
3560 |
- -i Config.mk || die |
3561 |
- |
3562 |
- # Bug 477676 |
3563 |
- epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch |
3564 |
- |
3565 |
- # Prevent file collision with qemu package Bug 478064 |
3566 |
- if use qemu; then |
3567 |
- epatch "${FILESDIR}"/qemu-bridge.patch |
3568 |
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
3569 |
- fi |
3570 |
- |
3571 |
- use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die |
3572 |
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
3573 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die |
3574 |
- |
3575 |
- epatch_user |
3576 |
-} |
3577 |
- |
3578 |
-src_configure() { |
3579 |
- econf --prefix=/usr --disable-werror |
3580 |
-} |
3581 |
- |
3582 |
-src_compile() { |
3583 |
- export VARTEXFONTS="${T}/fonts" |
3584 |
- local myopt |
3585 |
- use debug && myopt="${myopt} debug=y" |
3586 |
- |
3587 |
- use custom-cflags || unset CFLAGS |
3588 |
- if test-flag-CC -fno-strict-overflow; then |
3589 |
- append-flags -fno-strict-overflow |
3590 |
- fi |
3591 |
- |
3592 |
- unset LDFLAGS |
3593 |
- unset CFLAGS |
3594 |
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
3595 |
- |
3596 |
- use doc && emake -C docs txt html |
3597 |
- emake -C docs man-pages |
3598 |
-} |
3599 |
- |
3600 |
-src_install() { |
3601 |
- # Override auto-detection in the build system, bug #382573 |
3602 |
- export INITD_DIR=/tmp/init.d |
3603 |
- export CONFIG_LEAF_DIR=../tmp/default |
3604 |
- |
3605 |
- # Let the build system compile installed Python modules. |
3606 |
- local PYTHONDONTWRITEBYTECODE |
3607 |
- export PYTHONDONTWRITEBYTECODE |
3608 |
- |
3609 |
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ |
3610 |
- XEN_PYTHON_NATIVE_INSTALL=y install-tools |
3611 |
- |
3612 |
- # Fix the remaining Python shebangs. |
3613 |
- python_fix_shebang "${D}" |
3614 |
- |
3615 |
- # Remove RedHat-specific stuff |
3616 |
- rm -rf "${D}"tmp || die |
3617 |
- |
3618 |
- # uncomment lines in xl.conf |
3619 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
3620 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
3621 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
3622 |
- -i tools/examples/xl.conf || die |
3623 |
- |
3624 |
- # Reset bash completion dir; Bug 472438 |
3625 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
3626 |
- |
3627 |
- if use doc; then |
3628 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
3629 |
- |
3630 |
- dohtml -r docs/ |
3631 |
- docinto pdf |
3632 |
- dodoc ${DOCS[@]} |
3633 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
3634 |
- fi |
3635 |
- |
3636 |
- rm -rf "${D}"/usr/share/doc/xen/ |
3637 |
- doman docs/man?/* |
3638 |
- |
3639 |
- if use xend; then |
3640 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" |
3641 |
- fi |
3642 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
3643 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
3644 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
3645 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
3646 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
3647 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
3648 |
- |
3649 |
- if use screen; then |
3650 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
3651 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die |
3652 |
- keepdir /var/log/xen-consoles |
3653 |
- fi |
3654 |
- |
3655 |
- # Move files built with use qemu, Bug #477884 |
3656 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
3657 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
3658 |
- mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die |
3659 |
- fi |
3660 |
- |
3661 |
- # For -static-libs wrt Bug 384355 |
3662 |
- if ! use static-libs; then |
3663 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
3664 |
- fi |
3665 |
- |
3666 |
- # xend expects these to exist |
3667 |
- keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
3668 |
- |
3669 |
- # for xendomains |
3670 |
- keepdir /etc/xen/auto |
3671 |
- |
3672 |
- # Temp QA workaround |
3673 |
- dodir "$(udev_get_udevdir)" |
3674 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
3675 |
- rm -rf "${D}"/etc/udev |
3676 |
- |
3677 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
3678 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
3679 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
3680 |
-} |
3681 |
- |
3682 |
-pkg_postinst() { |
3683 |
- elog "Official Xen Guide and the unoffical wiki page:" |
3684 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
3685 |
- elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" |
3686 |
- |
3687 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
3688 |
- echo |
3689 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
3690 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
3691 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
3692 |
- fi |
3693 |
- |
3694 |
- # TODO: we need to have the current Python slot here. |
3695 |
- if ! has_version "dev-lang/python[ncurses]"; then |
3696 |
- echo |
3697 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
3698 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
3699 |
- fi |
3700 |
- |
3701 |
- if has_version "sys-apps/iproute2[minimal]"; then |
3702 |
- echo |
3703 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
3704 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
3705 |
- fi |
3706 |
- |
3707 |
- if ! use hvm; then |
3708 |
- echo |
3709 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
3710 |
- elog "support enable the hvm use flag." |
3711 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
3712 |
- fi |
3713 |
- |
3714 |
- if use xend; then |
3715 |
- elog"";elog "xend capability has been enabled and installed" |
3716 |
- fi |
3717 |
- |
3718 |
- if use qemu; then |
3719 |
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" |
3720 |
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" |
3721 |
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
3722 |
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
3723 |
- fi |
3724 |
- |
3725 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
3726 |
- echo |
3727 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
3728 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
3729 |
- fi |
3730 |
-} |
3731 |
|
3732 |
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0.ebuild |
3733 |
deleted file mode 100644 |
3734 |
index da33b48..0000000 |
3735 |
--- a/app-emulation/xen-tools/xen-tools-4.4.0.ebuild |
3736 |
+++ /dev/null |
3737 |
@@ -1,444 +0,0 @@ |
3738 |
-# Copyright 1999-2014 Gentoo Foundation |
3739 |
-# Distributed under the terms of the GNU General Public License v2 |
3740 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild,v 1.4 2013/12/22 12:01:08 idella4 Exp $ |
3741 |
- |
3742 |
-EAPI=5 |
3743 |
- |
3744 |
-MY_PV=${PV/_/-} |
3745 |
- |
3746 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
3747 |
-PYTHON_REQ_USE='xml,threads' |
3748 |
- |
3749 |
-if [[ $PV == *9999 ]]; then |
3750 |
- KEYWORDS="" |
3751 |
- REPO="xen-unstable.hg" |
3752 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
3753 |
- S="${WORKDIR}/${REPO}" |
3754 |
- live_eclass="mercurial" |
3755 |
-else |
3756 |
- KEYWORDS="~amd64 ~arm -x86" |
3757 |
- UPSTREAM_VER= |
3758 |
- GENTOO_VER= |
3759 |
- |
3760 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
3761 |
- UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
3762 |
- [[ -n ${GENTOO_VER} ]] && \ |
3763 |
- GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" |
3764 |
- |
3765 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz |
3766 |
- ${UPSTRAM_PATCHSET_URI} |
3767 |
- ${GENTOO_PATCHSET_URI}" |
3768 |
- S="${WORKDIR}/xen-${MY_PV}" |
3769 |
-fi |
3770 |
- |
3771 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
3772 |
- |
3773 |
-DESCRIPTION="Xend daemon and tools" |
3774 |
-HOMEPAGE="http://xen.org/" |
3775 |
-DOCS=( README docs/README.xen-bugtool ) |
3776 |
- |
3777 |
-LICENSE="GPL-2" |
3778 |
-SLOT="0" |
3779 |
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
3780 |
-# >=dev-lang/ocaml-4 stable |
3781 |
-# Masked in profiles/eapi-5-files instead |
3782 |
-IUSE="api custom-cflags debug doc xsm flask hvm qemu ocaml +pam python pygrub screen static-libs xend" |
3783 |
- |
3784 |
-REQUIRED_USE="hvm? ( qemu ) |
3785 |
- ${PYTHON_REQUIRED_USE} |
3786 |
- pygrub? ( python )" |
3787 |
- |
3788 |
-COMMON_DEPEND=" |
3789 |
- dev-libs/lzo:2 |
3790 |
- dev-libs/glib:2 |
3791 |
- dev-libs/yajl |
3792 |
- dev-libs/libaio |
3793 |
- dev-libs/libgcrypt |
3794 |
- sys-libs/zlib |
3795 |
-" |
3796 |
- |
3797 |
-DEPEND="${COMMON_DEPEND} |
3798 |
- dev-python/lxml[${PYTHON_USEDEP}] |
3799 |
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
3800 |
- hvm? ( media-libs/libsdl ) |
3801 |
- ${PYTHON_DEPS} |
3802 |
- api? ( dev-libs/libxml2 |
3803 |
- net-misc/curl ) |
3804 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
3805 |
- arm? ( >=sys-apps/dtc-1.4.0 ) |
3806 |
- !arm? ( sys-devel/bin86 |
3807 |
- sys-firmware/ipxe |
3808 |
- sys-firmware/seabios |
3809 |
- sys-devel/dev86 |
3810 |
- sys-power/iasl ) |
3811 |
- dev-lang/perl |
3812 |
- app-misc/pax-utils |
3813 |
- dev-python/markdown |
3814 |
- doc? ( |
3815 |
- app-doc/doxygen |
3816 |
- dev-tex/latex2html[png,gif] |
3817 |
- media-gfx/graphviz |
3818 |
- dev-tex/xcolor |
3819 |
- media-gfx/transfig |
3820 |
- dev-texlive/texlive-latexextra |
3821 |
- virtual/latex-base |
3822 |
- dev-tex/latexmk |
3823 |
- dev-texlive/texlive-latex |
3824 |
- dev-texlive/texlive-pictures |
3825 |
- dev-texlive/texlive-latexrecommended |
3826 |
- ) |
3827 |
- hvm? ( x11-proto/xproto |
3828 |
- !net-libs/libiscsi ) |
3829 |
- qemu? ( x11-libs/pixman ) |
3830 |
- ocaml? ( dev-ml/findlib |
3831 |
- >=dev-lang/ocaml-4 )" |
3832 |
- |
3833 |
-RDEPEND="${COMMON_DEPEND} |
3834 |
- sys-apps/iproute2 |
3835 |
- net-misc/bridge-utils |
3836 |
- screen? ( |
3837 |
- app-misc/screen |
3838 |
- app-admin/logrotate |
3839 |
- ) |
3840 |
- virtual/udev" |
3841 |
- |
3842 |
-# hvmloader is used to bootstrap a fully virtualized kernel |
3843 |
-# Approved by QA team in bug #144032 |
3844 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
3845 |
- |
3846 |
-RESTRICT="test" |
3847 |
- |
3848 |
-pkg_setup() { |
3849 |
- python-single-r1_pkg_setup |
3850 |
- export "CONFIG_LOMOUNT=y" |
3851 |
- |
3852 |
- if has_version dev-libs/libgcrypt; then |
3853 |
- export "CONFIG_GCRYPT=y" |
3854 |
- fi |
3855 |
- if use xsm; then |
3856 |
- export "XSM_ENABLE=y" |
3857 |
- if use flask; then |
3858 |
- export "FLASK_ENABLE=y" |
3859 |
- fi |
3860 |
- else |
3861 |
- export "XSM_ENABLE=n" |
3862 |
- fi |
3863 |
- |
3864 |
- if use qemu; then |
3865 |
- export "CONFIG_IOEMU=y" |
3866 |
- else |
3867 |
- export "CONFIG_IOEMU=n" |
3868 |
- fi |
3869 |
- |
3870 |
- if use xend; then |
3871 |
- export "CONFIG_XEND=y" |
3872 |
- else |
3873 |
- export "CONFIG_XEND=n" |
3874 |
- fi |
3875 |
- |
3876 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
3877 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
3878 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
3879 |
- eerror "to build xen-tools on your current profile." |
3880 |
- die "USE=hvm is unsupported on this system." |
3881 |
- fi |
3882 |
- |
3883 |
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
3884 |
- if use x86 && use amd64; then |
3885 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
3886 |
- elif use x86; then |
3887 |
- export XEN_TARGET_ARCH="x86_32" |
3888 |
- elif use amd64 ; then |
3889 |
- export XEN_TARGET_ARCH="x86_64" |
3890 |
- elif use arm; then |
3891 |
- export XEN_TARGET_ARCH="arm32" |
3892 |
- else |
3893 |
- die "Unsupported architecture!" |
3894 |
- fi |
3895 |
- fi |
3896 |
- #bug 472438 |
3897 |
- export BASH_COMPLETION_DIR=/usr/share/bash-completion |
3898 |
-} |
3899 |
- |
3900 |
-src_prepare() { |
3901 |
- # Upstream's patchset |
3902 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
3903 |
- EPATCH_SUFFIX="patch" \ |
3904 |
- EPATCH_FORCE="yes" \ |
3905 |
- epatch "${WORKDIR}"/patches-upstream |
3906 |
- fi |
3907 |
- |
3908 |
- # Gentoo's patchset |
3909 |
- if [[ -n ${GENTOO_VER} ]]; then |
3910 |
- EPATCH_SUFFIX="patch" \ |
3911 |
- EPATCH_FORCE="yes" \ |
3912 |
- epatch "${WORKDIR}"/patches-gentoo |
3913 |
- fi |
3914 |
- |
3915 |
- # Fix texi2html build error with new texi2html, qemu.doc.html |
3916 |
- epatch "${FILESDIR}"/${PN}-4-docfix.patch |
3917 |
- |
3918 |
- # Fix network broadcast on bridged networks |
3919 |
- epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" |
3920 |
- |
3921 |
- # Bug 496708 |
3922 |
- epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch |
3923 |
- |
3924 |
- # Fix bridge by idella4, bug #362575 |
3925 |
- epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" |
3926 |
- |
3927 |
- # Prevent double stripping of files at install |
3928 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.4-nostrip.patch |
3929 |
- |
3930 |
- # fix jobserver in Makefile |
3931 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch |
3932 |
- |
3933 |
- # Set dom0-min-mem to kb; Bug #472982 |
3934 |
- epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch |
3935 |
- |
3936 |
- # Bug 477676 |
3937 |
- epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch |
3938 |
- |
3939 |
- # Bug 379537 |
3940 |
- epatch "${FILESDIR}"/fix-gold-ld.patch |
3941 |
- |
3942 |
- # Prevent file collision with qemu package Bug 478064 |
3943 |
- epatch "${FILESDIR}"/xen-4.4-qemu-bridge.patch |
3944 |
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
3945 |
- |
3946 |
- epatch "${FILESDIR}"/${PN}-4.4-api-fix.patch |
3947 |
- |
3948 |
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
3949 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ |
3950 |
- -i tools/firmware/Makefile || die |
3951 |
- |
3952 |
- # Drop .config, fixes to gcc-4.6 |
3953 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
3954 |
- |
3955 |
- # if the user *really* wants to use their own custom-cflags, let them |
3956 |
- if use custom-cflags; then |
3957 |
- einfo "User wants their own CFLAGS - removing defaults" |
3958 |
- |
3959 |
- # try and remove all the default cflags |
3960 |
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ |
3961 |
- -exec sed \ |
3962 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
3963 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
3964 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
3965 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
3966 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
3967 |
- -i {} + || die "failed to re-set custom-cflags" |
3968 |
- fi |
3969 |
- |
3970 |
- if ! use pygrub; then |
3971 |
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die |
3972 |
- fi |
3973 |
- |
3974 |
- if ! use python; then |
3975 |
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die |
3976 |
- fi |
3977 |
- |
3978 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
3979 |
- if ! use hvm; then |
3980 |
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
3981 |
- fi |
3982 |
- |
3983 |
- # Don't bother with qemu, only needed for fully virtualised guests |
3984 |
- if ! use qemu; then |
3985 |
- sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die |
3986 |
- fi |
3987 |
- |
3988 |
- # Bug 472438 |
3989 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
3990 |
- -i Config.mk || die |
3991 |
- |
3992 |
- |
3993 |
- # xencommons, Bug #492332, sed lighter weight than patching |
3994 |
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ |
3995 |
- -i tools/hotplug/Linux/init.d/xencommons || die |
3996 |
- |
3997 |
- # respect multilib, usr/lib/libcacard.so.0.0.0 |
3998 |
- sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ |
3999 |
- -i tools/qemu-xen/configure || die |
4000 |
- |
4001 |
- # fix QA warning, create /var/run/, /var/lock dynamically |
4002 |
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ |
4003 |
- tools/libxl/Makefile || die |
4004 |
- |
4005 |
- sed -i -e "/\/var\/run\//d" \ |
4006 |
- tools/xenstore/Makefile \ |
4007 |
- tools/pygrub/Makefile || die |
4008 |
- |
4009 |
- sed -i -e "/\/var\/lock\/subsys/d" \ |
4010 |
- tools/Makefile || die |
4011 |
- |
4012 |
- epatch_user |
4013 |
-} |
4014 |
- |
4015 |
-src_configure() { |
4016 |
- local myconf="--prefix=/usr \ |
4017 |
- --libdir=/usr/$(get_libdir) \ |
4018 |
- --disable-werror \ |
4019 |
- --with-system-seabios=/usr/share/seabios/bios.bin \ |
4020 |
- --disable-xen \ |
4021 |
- --enable-tools \ |
4022 |
- $(use_enable doc docs) \ |
4023 |
- $(use_enable pam) \ |
4024 |
- $(use_enable api xenapi) \ |
4025 |
- $(use_enable ocaml ocamltools) \ |
4026 |
- " |
4027 |
- econf ${myconf} |
4028 |
-} |
4029 |
- |
4030 |
-src_compile() { |
4031 |
- export VARTEXFONTS="${T}/fonts" |
4032 |
- local myopt |
4033 |
- use debug && myopt="${myopt} debug=y" |
4034 |
- |
4035 |
- use custom-cflags || unset CFLAGS |
4036 |
- if test-flag-CC -fno-strict-overflow; then |
4037 |
- append-flags -fno-strict-overflow |
4038 |
- fi |
4039 |
- |
4040 |
- unset LDFLAGS |
4041 |
- unset CFLAGS |
4042 |
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
4043 |
-} |
4044 |
- |
4045 |
-src_install() { |
4046 |
- # Override auto-detection in the build system, bug #382573 |
4047 |
- export INITD_DIR=/tmp/init.d |
4048 |
- export CONFIG_LEAF_DIR=../tmp/default |
4049 |
- |
4050 |
- # Let the build system compile installed Python modules. |
4051 |
- local PYTHONDONTWRITEBYTECODE |
4052 |
- export PYTHONDONTWRITEBYTECODE |
4053 |
- |
4054 |
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ |
4055 |
- XEN_PYTHON_NATIVE_INSTALL=y install-tools |
4056 |
- |
4057 |
- # Fix the remaining Python shebangs. |
4058 |
- python_fix_shebang "${D}" |
4059 |
- |
4060 |
- # Remove RedHat-specific stuff |
4061 |
- rm -rf "${D}"tmp || die |
4062 |
- |
4063 |
- # uncomment lines in xl.conf |
4064 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
4065 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
4066 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
4067 |
- -i tools/examples/xl.conf || die |
4068 |
- |
4069 |
- # Reset bash completion dir; Bug 472438 |
4070 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
4071 |
- |
4072 |
- if use doc; then |
4073 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
4074 |
- |
4075 |
- dohtml -r docs/ |
4076 |
- docinto pdf |
4077 |
- dodoc ${DOCS[@]} |
4078 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
4079 |
- fi |
4080 |
- |
4081 |
- rm -rf "${D}"/usr/share/doc/xen/ |
4082 |
- |
4083 |
- if use xend; then |
4084 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" |
4085 |
- fi |
4086 |
- newconfd "${FILESDIR}"/xendomains.confd xendomains |
4087 |
- newconfd "${FILESDIR}"/xenstored.confd xenstored |
4088 |
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
4089 |
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
4090 |
- newinitd "${FILESDIR}"/xenstored.initd xenstored |
4091 |
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
4092 |
- newinitd "${FILESDIR}"/xencommons.initd xencommons |
4093 |
- newconfd "${FILESDIR}"/xencommons.confd xencommons |
4094 |
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev |
4095 |
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev |
4096 |
- |
4097 |
- if use screen; then |
4098 |
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
4099 |
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die |
4100 |
- keepdir /var/log/xen-consoles |
4101 |
- fi |
4102 |
- |
4103 |
- # Move files built with use qemu, Bug #477884 |
4104 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
4105 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
4106 |
- mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die |
4107 |
- fi |
4108 |
- |
4109 |
- # For -static-libs wrt Bug 384355 |
4110 |
- if ! use static-libs; then |
4111 |
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
4112 |
- fi |
4113 |
- |
4114 |
- # xend expects these to exist |
4115 |
- keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
4116 |
- |
4117 |
- # for xendomains |
4118 |
- keepdir /etc/xen/auto |
4119 |
- |
4120 |
- # Temp QA workaround |
4121 |
- dodir "$(udev_get_udevdir)" |
4122 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
4123 |
- rm -rf "${D}"/etc/udev |
4124 |
- |
4125 |
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
4126 |
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
4127 |
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
4128 |
-} |
4129 |
- |
4130 |
-pkg_postinst() { |
4131 |
- elog "Official Xen Guide and the offical wiki page:" |
4132 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
4133 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
4134 |
- elog "" |
4135 |
- elog "Recommended to utilise the xencommons script to config sytem At boot" |
4136 |
- elog "Add by use of rc-update on completion of the install" |
4137 |
- |
4138 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
4139 |
- echo |
4140 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
4141 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
4142 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
4143 |
- fi |
4144 |
- |
4145 |
- # TODO: we need to have the current Python slot here. |
4146 |
- if ! has_version "dev-lang/python[ncurses]"; then |
4147 |
- echo |
4148 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
4149 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
4150 |
- fi |
4151 |
- |
4152 |
- if has_version "sys-apps/iproute2[minimal]"; then |
4153 |
- echo |
4154 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
4155 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
4156 |
- fi |
4157 |
- |
4158 |
- if ! use hvm; then |
4159 |
- echo |
4160 |
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
4161 |
- elog "support enable the hvm use flag." |
4162 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
4163 |
- fi |
4164 |
- |
4165 |
- if use xend; then |
4166 |
- elog"";elog "xend capability has been enabled and installed" |
4167 |
- fi |
4168 |
- |
4169 |
- if use qemu; then |
4170 |
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" |
4171 |
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" |
4172 |
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
4173 |
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
4174 |
- fi |
4175 |
- |
4176 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
4177 |
- echo |
4178 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
4179 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
4180 |
- fi |
4181 |
-} |
4182 |
|
4183 |
diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild |
4184 |
index a86f0e4..4653c90 100644 |
4185 |
--- a/app-emulation/xen-tools/xen-tools-9999.ebuild |
4186 |
+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild |
4187 |
@@ -1,65 +1,107 @@ |
4188 |
-# Copyright 1999-2013 Gentoo Foundation |
4189 |
+# Copyright 1999-2017 Gentoo Foundation |
4190 |
# Distributed under the terms of the GNU General Public License v2 |
4191 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.7 2011/10/23 10:49:29 patrick Exp $ |
4192 |
|
4193 |
EAPI=5 |
4194 |
|
4195 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
4196 |
-PYTHON_REQ_USE='xml,threads' |
4197 |
+PYTHON_COMPAT=( python2_7 ) |
4198 |
+PYTHON_REQ_USE='ncurses,xml,threads' |
4199 |
|
4200 |
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" |
4201 |
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz" |
4202 |
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator |
4203 |
+ |
4204 |
+MY_PV=${PV/_/-} |
4205 |
+MAJOR_V="$(get_version_component_range 1-2)" |
4206 |
|
4207 |
if [[ $PV == *9999 ]]; then |
4208 |
+ inherit git-r3 |
4209 |
KEYWORDS="" |
4210 |
- EGIT_REPO_URI_MAIN="git://xenbits.xen.org/xen.git" |
4211 |
- EGIT_REPO_URI_QEMU="git://xenbits.xen.org/qemu-upstream-unstable.git" |
4212 |
- EGIT_REPO_URI_TRAD="git://xenbits.xen.org/qemu-xen-unstable.git" |
4213 |
- EGIT_REPO_URI_SEAB="git://xenbits.xen.org/seabios.git" |
4214 |
- EGIT_REPO_URI_IPXE="git://git.ipxe.org/ipxe.git" |
4215 |
- S="${WORKDIR}/xen" |
4216 |
- live_eclass="git-2" |
4217 |
+ REPO="xen.git" |
4218 |
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" |
4219 |
+ S="${WORKDIR}/${REPO}" |
4220 |
else |
4221 |
- KEYWORDS="~amd64 ~x86" |
4222 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
4223 |
- $IPXE_TARBALL_URL |
4224 |
- $XEN_SEABIOS_URL" |
4225 |
- S="${WORKDIR}/xen-${PV}" |
4226 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
4227 |
+ UPSTREAM_VER=0 |
4228 |
+ SECURITY_VER=27 |
4229 |
+ # xen-tools's gentoo patches tarball |
4230 |
+ GENTOO_VER=9 |
4231 |
+ # xen-tools's gentoo patches version which apply to this specific ebuild |
4232 |
+ GENTOO_GPV=0 |
4233 |
+ # xen-tools ovmf's patches |
4234 |
+ OVMF_VER=2 |
4235 |
+ |
4236 |
+ SEABIOS_VER=1.10.0 |
4237 |
+ # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d |
4238 |
+ OVMF_PV=20151110 |
4239 |
+ |
4240 |
+ [[ -n ${UPSTREAM_VER} ]] && \ |
4241 |
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
4242 |
+ [[ -n ${SECURITY_VER} ]] && \ |
4243 |
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" |
4244 |
+ [[ -n ${GENTOO_VER} ]] && \ |
4245 |
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" |
4246 |
+ [[ -n ${OVMF_VER} ]] && \ |
4247 |
+ OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" |
4248 |
+ |
4249 |
+ SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz |
4250 |
+ http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz |
4251 |
+ https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz |
4252 |
+ ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2 |
4253 |
+ ${OVMF_PATCHSET_URI} ) |
4254 |
+ ${UPSTREAM_PATCHSET_URI} |
4255 |
+ ${SECURITY_PATCHSET_URI} |
4256 |
+ ${GENTOO_PATCHSET_URI}" |
4257 |
+ |
4258 |
+ S="${WORKDIR}/xen-${MY_PV}" |
4259 |
fi |
4260 |
|
4261 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} |
4262 |
- |
4263 |
-DESCRIPTION="Xend daemon and tools" |
4264 |
+DESCRIPTION="Xen tools including QEMU and xl" |
4265 |
HOMEPAGE="http://xen.org/" |
4266 |
-DOCS=( README docs/README.xen-bugtool docs/ChangeLog ) |
4267 |
+DOCS=( README docs/README.xen-bugtool ) |
4268 |
|
4269 |
LICENSE="GPL-2" |
4270 |
-SLOT="0" |
4271 |
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml python pygrub screen static-libs xend" |
4272 |
- |
4273 |
-REQUIRED_USE="hvm? ( qemu )" |
4274 |
- |
4275 |
-CDEPEND="dev-libs/lzo:2 |
4276 |
+SLOT="0/${MAJOR_V}" |
4277 |
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
4278 |
+# >=dev-lang/ocaml-4 stable |
4279 |
+# Masked in profiles/eapi-5-files instead |
4280 |
+IUSE="api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios" |
4281 |
+ |
4282 |
+REQUIRED_USE=" |
4283 |
+ ${PYTHON_REQUIRED_USE} |
4284 |
+ pygrub? ( python ) |
4285 |
+ ovmf? ( hvm ) |
4286 |
+ ^^ ( qemu system-qemu )" |
4287 |
+ |
4288 |
+COMMON_DEPEND=" |
4289 |
+ dev-libs/lzo:2 |
4290 |
+ dev-libs/glib:2 |
4291 |
dev-libs/yajl |
4292 |
- dev-python/lxml[${PYTHON_USEDEP}] |
4293 |
- dev-python/pypam[${PYTHON_USEDEP}] |
4294 |
+ dev-libs/libaio |
4295 |
+ dev-libs/libgcrypt:0 |
4296 |
sys-libs/zlib |
4297 |
- sys-power/iasl |
4298 |
- dev-ml/findlib |
4299 |
- hvm? ( media-libs/libsdl ) |
4300 |
${PYTHON_DEPS} |
4301 |
+" |
4302 |
+ |
4303 |
+DEPEND="${COMMON_DEPEND} |
4304 |
+ dev-python/lxml[${PYTHON_USEDEP}] |
4305 |
+ x86? ( sys-devel/dev86 |
4306 |
+ sys-power/iasl ) |
4307 |
+ pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
4308 |
api? ( dev-libs/libxml2 |
4309 |
net-misc/curl ) |
4310 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )" |
4311 |
- |
4312 |
-DEPEND="${CDEPEND} |
4313 |
- sys-devel/bin86 |
4314 |
- sys-devel/dev86 |
4315 |
+ ovmf? ( |
4316 |
+ !arm? ( !arm64? ( dev-lang/nasm ) ) |
4317 |
+ $(python_gen_impl_dep sqlite) |
4318 |
+ ) |
4319 |
+ !amd64? ( >=sys-apps/dtc-1.4.0 ) |
4320 |
+ amd64? ( sys-devel/bin86 |
4321 |
+ system-seabios? ( sys-firmware/seabios ) |
4322 |
+ sys-firmware/ipxe |
4323 |
+ sys-devel/dev86 |
4324 |
+ sys-power/iasl ) |
4325 |
dev-lang/perl |
4326 |
app-misc/pax-utils |
4327 |
- dev-python/markdown |
4328 |
doc? ( |
4329 |
app-doc/doxygen |
4330 |
+ dev-python/markdown[${PYTHON_USEDEP}] |
4331 |
dev-tex/latex2html[png,gif] |
4332 |
media-gfx/graphviz |
4333 |
dev-tex/xcolor |
4334 |
@@ -73,45 +115,35 @@ DEPEND="${CDEPEND} |
4335 |
) |
4336 |
hvm? ( x11-proto/xproto |
4337 |
!net-libs/libiscsi ) |
4338 |
- qemu? ( x11-libs/pixman )" |
4339 |
+ qemu? ( |
4340 |
+ x11-libs/pixman |
4341 |
+ sdl? ( media-libs/libsdl[X] ) |
4342 |
+ ) |
4343 |
+ system-qemu? ( app-emulation/qemu[xen] ) |
4344 |
+ ocaml? ( dev-ml/findlib |
4345 |
+ >=dev-lang/ocaml-4 )" |
4346 |
|
4347 |
-RDEPEND="${CDEPEND} |
4348 |
- sys-apps/iproute2 |
4349 |
+RDEPEND="${COMMON_DEPEND} |
4350 |
+ sys-apps/iproute2[-minimal] |
4351 |
net-misc/bridge-utils |
4352 |
- ocaml? ( >=dev-lang/ocaml-4 ) |
4353 |
screen? ( |
4354 |
app-misc/screen |
4355 |
app-admin/logrotate |
4356 |
- ) |
4357 |
- virtual/udev" |
4358 |
+ )" |
4359 |
|
4360 |
# hvmloader is used to bootstrap a fully virtualized kernel |
4361 |
# Approved by QA team in bug #144032 |
4362 |
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader" |
4363 |
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader |
4364 |
+ usr/share/qemu-xen/qemu/s390-ccw.img" |
4365 |
|
4366 |
RESTRICT="test" |
4367 |
|
4368 |
pkg_setup() { |
4369 |
- python-single-r1_pkg_setup |
4370 |
+ python_setup |
4371 |
export "CONFIG_LOMOUNT=y" |
4372 |
- export "CONFIG_TESTS=n" |
4373 |
- |
4374 |
- if has_version dev-libs/libgcrypt; then |
4375 |
- export "CONFIG_GCRYPT=y" |
4376 |
- fi |
4377 |
- |
4378 |
- if use qemu; then |
4379 |
- export "CONFIG_IOEMU=y" |
4380 |
- else |
4381 |
- export "CONFIG_IOEMU=n" |
4382 |
- fi |
4383 |
|
4384 |
- if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then |
4385 |
- eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" |
4386 |
- eerror "an amd64 multilib profile is required. Remove the hvm use flag" |
4387 |
- eerror "to build xen-tools on your current profile." |
4388 |
- die "USE=hvm is unsupported on this system." |
4389 |
- fi |
4390 |
+ #bug 522642, disable compile tools/tests |
4391 |
+ export "CONFIG_TESTS=n" |
4392 |
|
4393 |
if [[ -z ${XEN_TARGET_ARCH} ]] ; then |
4394 |
if use x86 && use amd64; then |
4395 |
@@ -120,46 +152,99 @@ pkg_setup() { |
4396 |
export XEN_TARGET_ARCH="x86_32" |
4397 |
elif use amd64 ; then |
4398 |
export XEN_TARGET_ARCH="x86_64" |
4399 |
+ elif use arm; then |
4400 |
+ export XEN_TARGET_ARCH="arm32" |
4401 |
+ elif use arm64; then |
4402 |
+ export XEN_TARGET_ARCH="arm64" |
4403 |
else |
4404 |
die "Unsupported architecture!" |
4405 |
fi |
4406 |
fi |
4407 |
- |
4408 |
- use api && export "LIBXENAPI_BINDINGS=y" |
4409 |
- use flask && export "FLASK_ENABLE=y" "XSM_ENABLE=y" |
4410 |
} |
4411 |
|
4412 |
-src_unpack() { |
4413 |
- EGIT_REPO_URI=${EGIT_REPO_URI_MAIN} \ |
4414 |
- EGIT_SOURCEDIR=${S} git-2_src_unpack |
4415 |
+src_prepare() { |
4416 |
+ # Upstream's patchset |
4417 |
+ if [[ -n ${UPSTREAM_VER} ]]; then |
4418 |
+ einfo "Try to apply Xen Upstream patch set" |
4419 |
+ EPATCH_SUFFIX="patch" \ |
4420 |
+ EPATCH_FORCE="yes" \ |
4421 |
+ EPATCH_OPTS="-p1" \ |
4422 |
+ epatch "${WORKDIR}"/patches-upstream |
4423 |
+ fi |
4424 |
+ |
4425 |
+ # Security patchset |
4426 |
+ if [[ -n ${SECURITY_VER} ]]; then |
4427 |
+ einfo "Try to apply Xen Security patch set" |
4428 |
+ # apply main xen patches |
4429 |
+ # Two parallel systems, both work side by side |
4430 |
+ # Over time they may concdense into one. This will suffice for now |
4431 |
+ EPATCH_SUFFIX="patch" |
4432 |
+ EPATCH_FORCE="yes" |
4433 |
+ |
4434 |
+ source "${WORKDIR}"/patches-security/${PV}.conf || die |
4435 |
+ |
4436 |
+ for i in ${XEN_SECURITY_MAIN}; do |
4437 |
+ epatch "${WORKDIR}"/patches-security/xen/$i |
4438 |
+ done |
4439 |
+ |
4440 |
+ # apply qemu-xen/upstream patches |
4441 |
+ pushd "${S}"/tools/qemu-xen/ > /dev/null |
4442 |
+ for i in ${XEN_SECURITY_QEMUU}; do |
4443 |
+ epatch "${WORKDIR}"/patches-security/qemuu/$i |
4444 |
+ done |
4445 |
+ popd > /dev/null |
4446 |
+ |
4447 |
+ # apply qemu-traditional patches |
4448 |
+ pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null |
4449 |
+ for i in ${XEN_SECURITY_QEMUT}; do |
4450 |
+ epatch "${WORKDIR}"/patches-security/qemut/$i |
4451 |
+ done |
4452 |
+ popd > /dev/null |
4453 |
+ fi |
4454 |
+ |
4455 |
+ # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err |
4456 |
+ mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die |
4457 |
+ pushd tools/firmware/ > /dev/null |
4458 |
+ ln -s seabios-dir-remote seabios-dir || die |
4459 |
+ popd > /dev/null |
4460 |
+ |
4461 |
+ # Gentoo's patchset |
4462 |
+ if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then |
4463 |
+ einfo "Try to apply Gentoo specific patch set" |
4464 |
+ source "${FILESDIR}"/gentoo-patches.conf || die |
4465 |
+ _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} |
4466 |
+ for i in ${!_gpv}; do |
4467 |
+ EPATCH_SUFFIX="patch" \ |
4468 |
+ EPATCH_FORCE="yes" \ |
4469 |
+ epatch "${WORKDIR}"/patches-gentoo/$i |
4470 |
+ done |
4471 |
+ fi |
4472 |
|
4473 |
- EGIT_REPO_URI=${EGIT_REPO_URI_QEMU} \ |
4474 |
- EGIT_SOURCEDIR=${S}/tools/qemu-xen-dir git-2_src_unpack |
4475 |
+ # Ovmf's patchset |
4476 |
+ if use ovmf; then |
4477 |
+ if [[ -n ${OVMF_VER} ]];then |
4478 |
+ einfo "Try to apply Ovmf patch set" |
4479 |
+ pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
4480 |
+ EPATCH_SUFFIX="patch" \ |
4481 |
+ EPATCH_FORCE="yes" \ |
4482 |
+ EPATCH_OPTS="-p1" \ |
4483 |
+ epatch "${WORKDIR}"/patches-ovmf |
4484 |
+ popd > /dev/null |
4485 |
+ fi |
4486 |
+ mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die |
4487 |
+ fi |
4488 |
|
4489 |
- EGIT_REPO_URI=${EGIT_REPO_URI_TRAD} \ |
4490 |
- EGIT_SOURCEDIR=${S}/tools/qemu-xen-traditional-dir git-2_src_unpack |
4491 |
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
4492 |
|
4493 |
- EGIT_REPO_URI=${EGIT_REPO_URI_SEAB} \ |
4494 |
- EGIT_SOURCEDIR=${S}/tools/firmware/seabios-dir \ |
4495 |
- EGIT_COMMIT="1.7.1-stable-xen" \ |
4496 |
- EGIT_BRANCH="1.7.1-stable-xen" git-2_src_unpack |
4497 |
+ # Fix texi2html build error with new texi2html, qemu.doc.html |
4498 |
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die |
4499 |
|
4500 |
- EGIT_REPO_URI=${EGIT_REPO_URI_IPXE} \ |
4501 |
- EGIT_SOURCEDIR=${S}/tools/firmware/etherboot/ipxe git-2_src_unpack |
4502 |
-} |
4503 |
+ use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
4504 |
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ |
4505 |
+ -i tools/firmware/Makefile || die |
4506 |
|
4507 |
-src_prepare() { |
4508 |
- sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS" |
4509 |
- |
4510 |
- # Drop .config |
4511 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
4512 |
- # Xend |
4513 |
- if ! use xend; then |
4514 |
- sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ |
4515 |
- -i tools/misc/Makefile || die "Disabling xend failed" |
4516 |
- sed -e 's:^XEND_INITD:#XEND_INITD:' \ |
4517 |
- -i tools/examples/Makefile || die "Disabling xend failed" |
4518 |
- fi |
4519 |
+ # Drop .config, fixes to gcc-4.6 |
4520 |
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
4521 |
|
4522 |
# if the user *really* wants to use their own custom-cflags, let them |
4523 |
if use custom-cflags; then |
4524 |
@@ -174,54 +259,95 @@ src_prepare() { |
4525 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
4526 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
4527 |
-i {} + || die "failed to re-set custom-cflags" |
4528 |
+ else |
4529 |
+ unset CFLAGS |
4530 |
+ unset LDFLAGS |
4531 |
+ unset ASFLAGS |
4532 |
+ unset CPPFLAGS |
4533 |
fi |
4534 |
|
4535 |
if ! use pygrub; then |
4536 |
- sed -e '/^SUBDIRS-y += pygrub$/d' -i tools/Makefile || die |
4537 |
+ sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die |
4538 |
fi |
4539 |
|
4540 |
if ! use python; then |
4541 |
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die |
4542 |
fi |
4543 |
|
4544 |
- # Disable hvm support on systems that don't support x86_32 binaries. |
4545 |
if ! use hvm; then |
4546 |
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die |
4547 |
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die |
4548 |
+ # Bug 351648 |
4549 |
+ elif ! use x86 && ! has x86 $(get_all_abis); then |
4550 |
+ mkdir -p "${WORKDIR}"/extra-headers/gnu || die |
4551 |
+ touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die |
4552 |
+ export CPATH="${WORKDIR}"/extra-headers |
4553 |
fi |
4554 |
|
4555 |
- # Don't bother with qemu, only needed for fully virtualised guests |
4556 |
- if ! use qemu; then |
4557 |
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die |
4558 |
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die |
4559 |
+ if use qemu; then |
4560 |
+ if use sdl; then |
4561 |
+ sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ |
4562 |
+ tools/Makefile || die |
4563 |
+ else |
4564 |
+ sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ |
4565 |
+ tools/qemu-xen-traditional/xen-setup || die |
4566 |
+ sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ |
4567 |
+ tools/Makefile || die |
4568 |
+ fi |
4569 |
+ else |
4570 |
+ # Don't bother with qemu, only needed for fully virtualised guests |
4571 |
+ sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die |
4572 |
fi |
4573 |
|
4574 |
- # Fix build for gcc-4.6 |
4575 |
- local WERROR=( |
4576 |
- "tools/libxl/Makefile" |
4577 |
- "tools/xenstat/xentop/Makefile" |
4578 |
- ) |
4579 |
- for mf in ${WERROR[@]} ; do |
4580 |
- sed -e "s:-Werror::g" -i $mf || die |
4581 |
- done |
4582 |
- |
4583 |
- # Bug 472438 |
4584 |
- sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |
4585 |
+ # Reset bash completion dir; Bug 472438 |
4586 |
+ sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ |
4587 |
-i Config.mk || die |
4588 |
+ sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die |
4589 |
|
4590 |
- use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die |
4591 |
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die |
4592 |
+ # xencommons, Bug #492332, sed lighter weight than patching |
4593 |
+ sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ |
4594 |
+ -i tools/hotplug/Linux/init.d/xencommons.in || die |
4595 |
+ |
4596 |
+ # respect multilib, usr/lib/libcacard.so.0.0.0 |
4597 |
+ sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ |
4598 |
+ -i tools/qemu-xen/configure || die |
4599 |
+ |
4600 |
+ #bug 518136, don't build 32bit exactuable for nomultilib profile |
4601 |
+ if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then |
4602 |
+ sed -i -e "/x86_emulator/d" tools/tests/Makefile || die |
4603 |
+ fi |
4604 |
|
4605 |
- # why need LC_ALL=C |
4606 |
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die |
4607 |
+ # uncomment lines in xl.conf |
4608 |
+ sed -e 's:^#autoballoon=:autoballoon=:' \ |
4609 |
+ -e 's:^#lockfile=:lockfile=:' \ |
4610 |
+ -e 's:^#vif.default.script=:vif.default.script=:' \ |
4611 |
+ -i tools/examples/xl.conf || die |
4612 |
+ |
4613 |
+ # Bug #575868 converted to a sed statement, typo of one char |
4614 |
+ sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die |
4615 |
|
4616 |
epatch_user |
4617 |
} |
4618 |
|
4619 |
src_configure() { |
4620 |
- econf \ |
4621 |
- --enable-lomount \ |
4622 |
- --disable-werror |
4623 |
+ local myconf="--prefix=${PREFIX}/usr \ |
4624 |
+ --libdir=${PREFIX}/usr/$(get_libdir) \ |
4625 |
+ --libexecdir=${PREFIX}/usr/libexec \ |
4626 |
+ --localstatedir=${EPREFIX}/var \ |
4627 |
+ --disable-werror \ |
4628 |
+ --disable-xen \ |
4629 |
+ --enable-tools \ |
4630 |
+ --enable-docs \ |
4631 |
+ $(use_enable pam) \ |
4632 |
+ $(use_enable api xenapi) \ |
4633 |
+ $(use_enable ovmf) \ |
4634 |
+ $(use_enable ocaml ocamltools) \ |
4635 |
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ |
4636 |
+ " |
4637 |
+ |
4638 |
+ use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" |
4639 |
+ use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" |
4640 |
+ use amd64 && myconf+=" $(use_enable qemu-traditional)" |
4641 |
+ econf ${myconf} |
4642 |
} |
4643 |
|
4644 |
src_compile() { |
4645 |
@@ -229,17 +355,13 @@ src_compile() { |
4646 |
local myopt |
4647 |
use debug && myopt="${myopt} debug=y" |
4648 |
|
4649 |
- use custom-cflags || unset CFLAGS |
4650 |
if test-flag-CC -fno-strict-overflow; then |
4651 |
append-flags -fno-strict-overflow |
4652 |
fi |
4653 |
|
4654 |
- unset LDFLAGS |
4655 |
- unset CFLAGS |
4656 |
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
4657 |
|
4658 |
- # add figs if media-gfx/transfig enabled |
4659 |
- use doc && emake -C docs txt html figs |
4660 |
+ use doc && emake -C docs txt html |
4661 |
emake -C docs man-pages |
4662 |
} |
4663 |
|
4664 |
@@ -252,27 +374,19 @@ src_install() { |
4665 |
local PYTHONDONTWRITEBYTECODE |
4666 |
export PYTHONDONTWRITEBYTECODE |
4667 |
|
4668 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" \ |
4669 |
+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ |
4670 |
XEN_PYTHON_NATIVE_INSTALL=y install-tools |
4671 |
|
4672 |
# Fix the remaining Python shebangs. |
4673 |
python_fix_shebang "${D}" |
4674 |
|
4675 |
# Remove RedHat-specific stuff |
4676 |
- rm -rf "${D}"/tmp || die |
4677 |
- |
4678 |
- # uncomment lines in xl.conf |
4679 |
- sed -e 's:^#autoballoon=1:autoballoon=1:' \ |
4680 |
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ |
4681 |
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ |
4682 |
- -i tools/examples/xl.conf || die |
4683 |
- |
4684 |
- # Reset bash completion dir; Bug 472438 |
4685 |
- mv "${D}"bash-completion "${D}"usr/share/ || die |
4686 |
+ rm -rf "${D}"tmp || die |
4687 |
|
4688 |
if use doc; then |
4689 |
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
4690 |
|
4691 |
+ dohtml -r docs/ |
4692 |
docinto pdf |
4693 |
dodoc ${DOCS[@]} |
4694 |
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
4695 |
@@ -281,15 +395,16 @@ src_install() { |
4696 |
rm -rf "${D}"/usr/share/doc/xen/ |
4697 |
doman docs/man?/* |
4698 |
|
4699 |
- if use xend; then |
4700 |
- newinitd "${FILESDIR}"/xend.initd-r2 xend |
4701 |
- fi |
4702 |
newconfd "${FILESDIR}"/xendomains.confd xendomains |
4703 |
newconfd "${FILESDIR}"/xenstored.confd xenstored |
4704 |
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled |
4705 |
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains |
4706 |
newinitd "${FILESDIR}"/xenstored.initd xenstored |
4707 |
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled |
4708 |
+ newinitd "${FILESDIR}"/xencommons.initd xencommons |
4709 |
+ newconfd "${FILESDIR}"/xencommons.confd xencommons |
4710 |
+ newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev |
4711 |
+ newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev |
4712 |
|
4713 |
if use screen; then |
4714 |
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die |
4715 |
@@ -297,67 +412,32 @@ src_install() { |
4716 |
keepdir /var/log/xen-consoles |
4717 |
fi |
4718 |
|
4719 |
- # Move files built with use qemu, Bug #477884 |
4720 |
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then |
4721 |
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die |
4722 |
- mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die |
4723 |
- fi |
4724 |
- |
4725 |
# For -static-libs wrt Bug 384355 |
4726 |
if ! use static-libs; then |
4727 |
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a |
4728 |
fi |
4729 |
|
4730 |
- # xend expects these to exist |
4731 |
- keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen |
4732 |
- |
4733 |
# for xendomains |
4734 |
keepdir /etc/xen/auto |
4735 |
|
4736 |
- # Temp QA workaround |
4737 |
- dodir "$(udev_get_udevdir)" |
4738 |
- mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" |
4739 |
- rm -rf "${D}"/etc/udev |
4740 |
- |
4741 |
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files |
4742 |
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ |
4743 |
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die |
4744 |
} |
4745 |
|
4746 |
pkg_postinst() { |
4747 |
- elog "Official Xen Guide and the unoffical wiki page:" |
4748 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
4749 |
- elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" |
4750 |
- |
4751 |
- if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then |
4752 |
- echo |
4753 |
- ewarn "xend may not work when python is built with stack smashing protection (ssp)." |
4754 |
- ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" |
4755 |
- ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." |
4756 |
- fi |
4757 |
- |
4758 |
- # TODO: we need to have the current Python slot here. |
4759 |
- if ! has_version "dev-lang/python[ncurses]"; then |
4760 |
- echo |
4761 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
4762 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
4763 |
- fi |
4764 |
- |
4765 |
- if has_version "sys-apps/iproute2[minimal]"; then |
4766 |
- echo |
4767 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
4768 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
4769 |
- fi |
4770 |
+ elog "Official Xen Guide and the offical wiki page:" |
4771 |
+ elog "https://wiki.gentoo.org/wiki/Xen" |
4772 |
+ elog "http://wiki.xen.org/wiki/Main_Page" |
4773 |
+ elog "" |
4774 |
+ elog "Recommended to utilise the xencommons script to config sytem At boot" |
4775 |
+ elog "Add by use of rc-update on completion of the install" |
4776 |
|
4777 |
if ! use hvm; then |
4778 |
echo |
4779 |
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
4780 |
elog "support enable the hvm use flag." |
4781 |
- elog "An x86 or amd64 multilib system is required to build HVM support." |
4782 |
- fi |
4783 |
- |
4784 |
- if use xend; then |
4785 |
- elog"";elog "xend capability has been enabled and installed" |
4786 |
+ elog "An x86 or amd64 system is required to build HVM support." |
4787 |
fi |
4788 |
|
4789 |
if use qemu; then |
4790 |
@@ -366,10 +446,4 @@ pkg_postinst() { |
4791 |
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
4792 |
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
4793 |
fi |
4794 |
- |
4795 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
4796 |
- echo |
4797 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
4798 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
4799 |
- fi |
4800 |
} |
4801 |
|
4802 |
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest |
4803 |
deleted file mode 100644 |
4804 |
index 5033931..0000000 |
4805 |
--- a/app-emulation/xen/Manifest |
4806 |
+++ /dev/null |
4807 |
@@ -1,3 +0,0 @@ |
4808 |
-DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea |
4809 |
-DIST xen-4.3.0.tar.gz 16425975 SHA256 e1e9faabe4886e2227aacdbde74410653b233d66642ca1972a860cbec6439961 SHA512 e6b8f64e15e48704ea5cee5585cd6151fe6a5a62bc4670caf0b762c1aa71c9598db236c637ac34c42c92c6e8a5001acdd3d9d4b9305401a26273279358f481d6 WHIRLPOOL a91f14bc6535127ab17d3867b92fb3e008089453d5ba7996fd1d0b5c6d32a881c07df320f018c928e919f28de7b4ab4757c6bdb020e0cdb7d67960d4cab9dda0 |
4810 |
-DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406 |
4811 |
|
4812 |
diff --git a/app-emulation/xen/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen/files/xen-4-fix_dotconfig-gcc.patch |
4813 |
deleted file mode 100644 |
4814 |
index c0dbd20..0000000 |
4815 |
--- a/app-emulation/xen/files/xen-4-fix_dotconfig-gcc.patch |
4816 |
+++ /dev/null |
4817 |
@@ -1,37 +0,0 @@ |
4818 |
-# Fix gcc-4.6 |
4819 |
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk |
4820 |
---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 |
4821 |
-+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 |
4822 |
-@@ -6,7 +6,7 @@ |
4823 |
- |
4824 |
- # Define some default flags. |
4825 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
4826 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
4827 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
4828 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
4829 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
4830 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
4831 |
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile |
4832 |
---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 |
4833 |
-+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 |
4834 |
-@@ -73,7 +73,7 @@ |
4835 |
- |
4836 |
- -include $(XEN_TARGET_ARCH)/Makefile |
4837 |
- |
4838 |
--CFLAGS += -Werror -Wmissing-prototypes |
4839 |
-+CFLAGS += -Wmissing-prototypes |
4840 |
- CFLAGS += -I. $(CFLAGS_xeninclude) |
4841 |
- |
4842 |
- # Needed for posix_fadvise64() in xc_linux.c |
4843 |
-# Drop .config |
4844 |
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk |
4845 |
---- Config.mk 2012-09-17 18:23:12.000000000 +0800 |
4846 |
-+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 |
4847 |
-@@ -7,7 +7,6 @@ |
4848 |
- # fallback for older make |
4849 |
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) |
4850 |
- |
4851 |
---include $(XEN_ROOT)/.config |
4852 |
- |
4853 |
- # A debug build of Xen and tools? |
4854 |
- debug ?= n |
4855 |
|
4856 |
diff --git a/app-emulation/xen/files/xen-4.2-efi.patch b/app-emulation/xen/files/xen-4.2-efi.patch |
4857 |
deleted file mode 100644 |
4858 |
index 6e38aaa..0000000 |
4859 |
--- a/app-emulation/xen/files/xen-4.2-efi.patch |
4860 |
+++ /dev/null |
4861 |
@@ -1,33 +0,0 @@ |
4862 |
-diff -ur xen-4.2.0.orig/xen/arch/x86/Makefile xen-4.2.0/xen/arch/x86/Makefile |
4863 |
---- xen/arch/x86/Makefile 2012-09-17 18:21:19.000000000 +0800 |
4864 |
-+++ xen/arch/x86/Makefile 2013-02-23 20:37:30.679918815 +0800 |
4865 |
-@@ -112,7 +112,7 @@ |
4866 |
- $(@D)/.$(@F).1.o -o $@ |
4867 |
- rm -f $(@D)/.$(@F).[0-9]* |
4868 |
- |
4869 |
--EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 |
4870 |
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 |
4871 |
- EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug |
4872 |
- EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20 |
4873 |
- EFI_LDFLAGS += --major-image-version=$(XEN_VERSION) |
4874 |
---- xen/Makefile 2013-03-07 14:34:01.819453278 +0000 |
4875 |
-+++ xen/Makefile 2013-03-07 15:56:44.753044655 +0000 |
4876 |
-@@ -31,9 +31,15 @@ |
4877 |
- _install: $(TARGET).gz |
4878 |
- [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot |
4879 |
- $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz |
4880 |
-- ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz |
4881 |
-- ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz |
4882 |
-- ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz |
4883 |
-+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ |
4884 |
-+ ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz; \ |
4885 |
-+ ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz; \ |
4886 |
-+ ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz; \ |
4887 |
-+ else \ |
4888 |
-+ cp $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz; \ |
4889 |
-+ cp $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz; \ |
4890 |
-+ cp $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz; \ |
4891 |
-+ fi; \ |
4892 |
- $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION) |
4893 |
- if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ |
4894 |
- [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \ |
4895 |
|
4896 |
diff --git a/app-emulation/xen/files/xen-4.4-efi.patch b/app-emulation/xen/files/xen-4.4-efi.patch |
4897 |
deleted file mode 100644 |
4898 |
index 9213ade..0000000 |
4899 |
--- a/app-emulation/xen/files/xen-4.4-efi.patch |
4900 |
+++ /dev/null |
4901 |
@@ -1,23 +0,0 @@ |
4902 |
-diff --git a/xen/Makefile b/xen/Makefile |
4903 |
-index 39839a3..d2603f0 100644 |
4904 |
---- a/xen/Makefile |
4905 |
-+++ b/xen/Makefile |
4906 |
-@@ -38,9 +38,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) |
4907 |
- _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) |
4908 |
- [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot |
4909 |
- $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_FULLVERSION)$(Z) |
4910 |
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) |
4911 |
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z) |
4912 |
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)$(Z) |
4913 |
-+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ |
4914 |
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ |
4915 |
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z);\ |
4916 |
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)$(Z); \ |
4917 |
-+ else \ |
4918 |
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ |
4919 |
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z);\ |
4920 |
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)$(Z); \ |
4921 |
-+ fi; \ |
4922 |
- $(INSTALL_DATA) $(TARGET)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION) |
4923 |
- if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ |
4924 |
- [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \ |
4925 |
|
4926 |
diff --git a/app-emulation/xen/files/xen-4.6-efi.patch b/app-emulation/xen/files/xen-4.6-efi.patch |
4927 |
new file mode 100644 |
4928 |
index 0000000..bf888de |
4929 |
--- /dev/null |
4930 |
+++ b/app-emulation/xen/files/xen-4.6-efi.patch |
4931 |
@@ -0,0 +1,36 @@ |
4932 |
+diff --git a/xen/Makefile b/xen/Makefile |
4933 |
+index 4c54e9b..a5cdccd 100644 |
4934 |
+--- a/xen/Makefile |
4935 |
++++ b/xen/Makefile |
4936 |
+@@ -41,9 +41,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) |
4937 |
+ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) |
4938 |
+ [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR) |
4939 |
+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z) |
4940 |
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) |
4941 |
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) |
4942 |
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) |
4943 |
++ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ |
4944 |
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ |
4945 |
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ |
4946 |
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ |
4947 |
++ else \ |
4948 |
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ |
4949 |
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ |
4950 |
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ |
4951 |
++ fi; |
4952 |
+ [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR) |
4953 |
+ $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION) |
4954 |
+ if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ |
4955 |
+diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile |
4956 |
+index 5f24951..4ec0ee2 100644 |
4957 |
+--- a/xen/arch/x86/Makefile |
4958 |
++++ b/xen/arch/x86/Makefile |
4959 |
+@@ -116,7 +116,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o |
4960 |
+ $(@D)/.$(@F).1.o -o $@ |
4961 |
+ rm -f $(@D)/.$(@F).[0-9]* |
4962 |
+ |
4963 |
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 |
4964 |
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 |
4965 |
+ EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug |
4966 |
+ EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20 |
4967 |
+ EFI_LDFLAGS += --major-image-version=$(XEN_VERSION) |
4968 |
|
4969 |
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml |
4970 |
index 78acefc..f69cd9e 100644 |
4971 |
--- a/app-emulation/xen/metadata.xml |
4972 |
+++ b/app-emulation/xen/metadata.xml |
4973 |
@@ -1,15 +1,12 @@ |
4974 |
<?xml version="1.0" encoding="UTF-8"?> |
4975 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
4976 |
<pkgmetadata> |
4977 |
- <herd>xen</herd> |
4978 |
- <maintainer> |
4979 |
- <email>idella4@g.o</email> |
4980 |
- <name>Ian Delaney</name> |
4981 |
+ <maintainer type="project"> |
4982 |
+ <email>xen@g.o</email> |
4983 |
+ <name>Gentoo Xen Project</name> |
4984 |
</maintainer> |
4985 |
<use> |
4986 |
- <flag name='flask'>Enable the Flask XSM module from NSA</flag> |
4987 |
- <flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB memory)</flag> |
4988 |
- <flag name='xsm'>Enable the Xen Security Modules (XSM)</flag> |
4989 |
- <flag name='efi'>Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag> |
4990 |
+ <flag name="flask">Enable the Flask XSM module from NSA</flag> |
4991 |
+ <flag name="efi">Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag> |
4992 |
</use> |
4993 |
</pkgmetadata> |
4994 |
|
4995 |
diff --git a/app-emulation/xen/xen-4.2.2.ebuild b/app-emulation/xen/xen-4.2.2.ebuild |
4996 |
deleted file mode 100644 |
4997 |
index ad8588b..0000000 |
4998 |
--- a/app-emulation/xen/xen-4.2.2.ebuild |
4999 |
+++ /dev/null |
5000 |
@@ -1,128 +0,0 @@ |
5001 |
-# Copyright 1999-2013 Gentoo Foundation |
5002 |
-# Distributed under the terms of the GNU General Public License v2 |
5003 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r2.ebuild,v 1.4 2013/03/08 10:33:14 idella4 Exp $ |
5004 |
- |
5005 |
-EAPI=5 |
5006 |
- |
5007 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
5008 |
- |
5009 |
-if [[ $PV == *9999 ]]; then |
5010 |
- KEYWORDS="" |
5011 |
- REPO="xen-unstable.hg" |
5012 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
5013 |
- S="${WORKDIR}/${REPO}" |
5014 |
- live_eclass="mercurial" |
5015 |
-else |
5016 |
- KEYWORDS="~amd64 ~x86" |
5017 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" |
5018 |
-fi |
5019 |
- |
5020 |
-inherit mount-boot flag-o-matic python-single-r1 toolchain-funcs ${live_eclass} |
5021 |
- |
5022 |
-DESCRIPTION="The Xen virtual machine monitor" |
5023 |
-HOMEPAGE="http://xen.org/" |
5024 |
-LICENSE="GPL-2" |
5025 |
-SLOT="0" |
5026 |
-IUSE="custom-cflags debug efi flask pae xsm" |
5027 |
- |
5028 |
-DEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
5029 |
- !efi? ( >=sys-devel/binutils-2.22[-multitarget] )" |
5030 |
-RDEPEND="" |
5031 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
5032 |
- |
5033 |
-RESTRICT="test" |
5034 |
- |
5035 |
-# Approved by QA team in bug #144032 |
5036 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
5037 |
- |
5038 |
-REQUIRED_USE=" |
5039 |
- flask? ( xsm ) |
5040 |
- " |
5041 |
- |
5042 |
-pkg_setup() { |
5043 |
- python-single-r1_pkg_setup |
5044 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
5045 |
- if use x86 && use amd64; then |
5046 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
5047 |
- elif use x86; then |
5048 |
- export XEN_TARGET_ARCH="x86_32" |
5049 |
- elif use amd64; then |
5050 |
- export XEN_TARGET_ARCH="x86_64" |
5051 |
- else |
5052 |
- die "Unsupported architecture!" |
5053 |
- fi |
5054 |
- fi |
5055 |
- |
5056 |
- if use flask ; then |
5057 |
- export "XSM_ENABLE=y" |
5058 |
- export "FLASK_ENABLE=y" |
5059 |
- elif use xsm ; then |
5060 |
- export "XSM_ENABLE=y" |
5061 |
- fi |
5062 |
-} |
5063 |
- |
5064 |
-src_prepare() { |
5065 |
- # Drop .config and fix gcc-4.6 |
5066 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch |
5067 |
- |
5068 |
- if use efi; then |
5069 |
- epatch "${FILESDIR}"/${PN}-4.2-efi.patch |
5070 |
- export EFI_VENDOR="${EFI_VENDOR:-gentoo}" |
5071 |
- export EFI_MOUNTPOINT="${EFI_MOUNTPOINT:-boot}" |
5072 |
- fi |
5073 |
- |
5074 |
- # if the user *really* wants to use their own custom-cflags, let them |
5075 |
- if use custom-cflags; then |
5076 |
- einfo "User wants their own CFLAGS - removing defaults" |
5077 |
- # try and remove all the default custom-cflags |
5078 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
5079 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
5080 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
5081 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
5082 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
5083 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
5084 |
- -i {} \; || die "failed to re-set custom-cflags" |
5085 |
- fi |
5086 |
- |
5087 |
- # not strictly necessary to fix this |
5088 |
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
5089 |
-} |
5090 |
- |
5091 |
-src_configure() { |
5092 |
- use debug && myopt="${myopt} debug=y" |
5093 |
- use pae && myopt="${myopt} pae=y" |
5094 |
- |
5095 |
- if use custom-cflags; then |
5096 |
- filter-flags -fPIE -fstack-protector |
5097 |
- replace-flags -O3 -O2 |
5098 |
- else |
5099 |
- unset CFLAGS |
5100 |
- fi |
5101 |
-} |
5102 |
- |
5103 |
-src_compile() { |
5104 |
- # Send raw LDFLAGS so that --as-needed works |
5105 |
- emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
5106 |
-} |
5107 |
- |
5108 |
-src_install() { |
5109 |
- local myopt |
5110 |
- use debug && myopt="${myopt} debug=y" |
5111 |
- use pae && myopt="${myopt} pae=y" |
5112 |
- |
5113 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
5114 |
- if use efi; then |
5115 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
5116 |
- fi |
5117 |
- |
5118 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
5119 |
-} |
5120 |
- |
5121 |
-pkg_postinst() { |
5122 |
- elog "Official Xen Guide and the unoffical wiki page:" |
5123 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
5124 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
5125 |
- |
5126 |
- use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" |
5127 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
5128 |
-} |
5129 |
|
5130 |
diff --git a/app-emulation/xen/xen-4.3.0.ebuild b/app-emulation/xen/xen-4.3.0.ebuild |
5131 |
deleted file mode 100644 |
5132 |
index 815d84a..0000000 |
5133 |
--- a/app-emulation/xen/xen-4.3.0.ebuild |
5134 |
+++ /dev/null |
5135 |
@@ -1,130 +0,0 @@ |
5136 |
-# Copyright 1999-2013 Gentoo Foundation |
5137 |
-# Distributed under the terms of the GNU General Public License v2 |
5138 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.0.ebuild,v 1.1 2013/07/21 05:45:45 idella4 Exp $ |
5139 |
- |
5140 |
-EAPI=5 |
5141 |
- |
5142 |
-PYTHON_COMPAT=( python2_7 ) |
5143 |
- |
5144 |
-if [[ $PV == *9999 ]]; then |
5145 |
- KEYWORDS="" |
5146 |
- REPO="xen-unstable.hg" |
5147 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
5148 |
- S="${WORKDIR}/${REPO}" |
5149 |
- live_eclass="mercurial" |
5150 |
-else |
5151 |
- KEYWORDS="~amd64 ~x86" |
5152 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" |
5153 |
-fi |
5154 |
- |
5155 |
-inherit mount-boot flag-o-matic python-single-r1 toolchain-funcs ${live_eclass} |
5156 |
- |
5157 |
-DESCRIPTION="The Xen virtual machine monitor" |
5158 |
-HOMEPAGE="http://xen.org/" |
5159 |
-LICENSE="GPL-2" |
5160 |
-SLOT="0" |
5161 |
-IUSE="custom-cflags debug efi flask pae xsm" |
5162 |
- |
5163 |
-DEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
5164 |
- !efi? ( >=sys-devel/binutils-2.22[-multitarget] )" |
5165 |
-RDEPEND="" |
5166 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
5167 |
- |
5168 |
-RESTRICT="test" |
5169 |
- |
5170 |
-# Approved by QA team in bug #144032 |
5171 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
5172 |
- |
5173 |
-REQUIRED_USE="flask? ( xsm )" |
5174 |
- |
5175 |
-pkg_setup() { |
5176 |
- python-single-r1_pkg_setup |
5177 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
5178 |
- if use x86 && use amd64; then |
5179 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
5180 |
- elif use x86; then |
5181 |
- export XEN_TARGET_ARCH="x86_32" |
5182 |
- elif use amd64; then |
5183 |
- export XEN_TARGET_ARCH="x86_64" |
5184 |
- else |
5185 |
- die "Unsupported architecture!" |
5186 |
- fi |
5187 |
- fi |
5188 |
- |
5189 |
- if use flask ; then |
5190 |
- export "XSM_ENABLE=y" |
5191 |
- export "FLASK_ENABLE=y" |
5192 |
- elif use xsm ; then |
5193 |
- export "XSM_ENABLE=y" |
5194 |
- fi |
5195 |
-} |
5196 |
- |
5197 |
-src_prepare() { |
5198 |
- # Drop .config and fix gcc-4.6 |
5199 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch |
5200 |
- |
5201 |
- if use efi; then |
5202 |
- epatch "${FILESDIR}"/${PN}-4.2-efi.patch |
5203 |
- export EFI_VENDOR="gentoo" |
5204 |
- export EFI_MOUNTPOINT="boot" |
5205 |
- fi |
5206 |
- |
5207 |
- # if the user *really* wants to use their own custom-cflags, let them |
5208 |
- if use custom-cflags; then |
5209 |
- einfo "User wants their own CFLAGS - removing defaults" |
5210 |
- # try and remove all the default custom-cflags |
5211 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
5212 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
5213 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
5214 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
5215 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
5216 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
5217 |
- -i {} \; || die "failed to re-set custom-cflags" |
5218 |
- fi |
5219 |
- |
5220 |
- # not strictly necessary to fix this |
5221 |
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
5222 |
- |
5223 |
- #Security patches |
5224 |
- |
5225 |
- epatch_user |
5226 |
-} |
5227 |
- |
5228 |
-src_configure() { |
5229 |
- use debug && myopt="${myopt} debug=y" |
5230 |
- use pae && myopt="${myopt} pae=y" |
5231 |
- |
5232 |
- if use custom-cflags; then |
5233 |
- filter-flags -fPIE -fstack-protector |
5234 |
- replace-flags -O3 -O2 |
5235 |
- else |
5236 |
- unset CFLAGS |
5237 |
- fi |
5238 |
-} |
5239 |
- |
5240 |
-src_compile() { |
5241 |
- # Send raw LDFLAGS so that --as-needed works |
5242 |
- emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
5243 |
-} |
5244 |
- |
5245 |
-src_install() { |
5246 |
- local myopt |
5247 |
- use debug && myopt="${myopt} debug=y" |
5248 |
- use pae && myopt="${myopt} pae=y" |
5249 |
- |
5250 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
5251 |
- if use efi; then |
5252 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
5253 |
- fi |
5254 |
- |
5255 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
5256 |
-} |
5257 |
- |
5258 |
-pkg_postinst() { |
5259 |
- elog "Official Xen Guide and the unoffical wiki page:" |
5260 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
5261 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
5262 |
- |
5263 |
- use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" |
5264 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
5265 |
-} |
5266 |
|
5267 |
diff --git a/app-emulation/xen/xen-4.4.0.ebuild b/app-emulation/xen/xen-4.4.0.ebuild |
5268 |
deleted file mode 100644 |
5269 |
index f311c3d..0000000 |
5270 |
--- a/app-emulation/xen/xen-4.4.0.ebuild |
5271 |
+++ /dev/null |
5272 |
@@ -1,161 +0,0 @@ |
5273 |
-# Copyright 1999-2013 Gentoo Foundation |
5274 |
-# Distributed under the terms of the GNU General Public License v2 |
5275 |
-# $Header: $ |
5276 |
- |
5277 |
-EAPI=5 |
5278 |
- |
5279 |
-PYTHON_COMPAT=( python2_7 ) |
5280 |
- |
5281 |
-MY_PV=${PV/_/-} |
5282 |
-MY_P=${PN}-${PV/_/-} |
5283 |
- |
5284 |
-if [[ $PV == *9999 ]]; then |
5285 |
- KEYWORDS="" |
5286 |
- EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" |
5287 |
- live_eclass="git-2" |
5288 |
-else |
5289 |
- KEYWORDS="~amd64 ~arm -x86" |
5290 |
- UPSTREAM_VER= |
5291 |
- GENTOO_VER= |
5292 |
- |
5293 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
5294 |
- UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
5295 |
- [[ -n ${GENTOO_VER} ]] && \ |
5296 |
- GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" |
5297 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz |
5298 |
- ${UPSTREAM_PATCHSET_URI} |
5299 |
- ${GENTOO_PATCHSET_URI}" |
5300 |
- |
5301 |
-fi |
5302 |
- |
5303 |
-inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} |
5304 |
- |
5305 |
-DESCRIPTION="The Xen virtual machine monitor" |
5306 |
-HOMEPAGE="http://xen.org/" |
5307 |
-LICENSE="GPL-2" |
5308 |
-SLOT="0" |
5309 |
-IUSE="custom-cflags debug efi flask xsm" |
5310 |
- |
5311 |
-DEPEND="${PYTHON_DEPS} |
5312 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
5313 |
- !efi? ( >=sys-devel/binutils-2.22[-multitarget] )" |
5314 |
-RDEPEND="" |
5315 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
5316 |
- |
5317 |
-RESTRICT="test" |
5318 |
- |
5319 |
-# Approved by QA team in bug #144032 |
5320 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
5321 |
- |
5322 |
-REQUIRED_USE="flask? ( xsm ) |
5323 |
- arm? ( debug )" |
5324 |
- |
5325 |
-S="${WORKDIR}/${MY_P}" |
5326 |
- |
5327 |
-pkg_setup() { |
5328 |
- python-any-r1_pkg_setup |
5329 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
5330 |
- if use x86 && use amd64; then |
5331 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
5332 |
- elif use x86; then |
5333 |
- export XEN_TARGET_ARCH="x86_32" |
5334 |
- elif use amd64; then |
5335 |
- export XEN_TARGET_ARCH="x86_64" |
5336 |
- elif use arm; then |
5337 |
- export XEN_TARGET_ARCH="arm32" |
5338 |
- else |
5339 |
- die "Unsupported architecture!" |
5340 |
- fi |
5341 |
- fi |
5342 |
- |
5343 |
- if use flask ; then |
5344 |
- export "XSM_ENABLE=y" |
5345 |
- export "FLASK_ENABLE=y" |
5346 |
- elif use xsm ; then |
5347 |
- export "XSM_ENABLE=y" |
5348 |
- fi |
5349 |
-} |
5350 |
- |
5351 |
-src_prepare() { |
5352 |
- # Upstream's patchset |
5353 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
5354 |
- EPATCH_SUFFIX="patch" \ |
5355 |
- EPATCH_FORCE="yes" \ |
5356 |
- epatch "${WORKDIR}"/patches-upstream |
5357 |
- fi |
5358 |
- |
5359 |
- # Gentoo's patchset |
5360 |
- if [[ -n ${GENTOO_VER} ]]; then |
5361 |
- EPATCH_SUFFIX="patch" \ |
5362 |
- EPATCH_FORCE="yes" \ |
5363 |
- epatch "${WORKDIR}"/patches-gentoo |
5364 |
- fi |
5365 |
- |
5366 |
- # Drop .config |
5367 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
5368 |
- |
5369 |
- if use efi; then |
5370 |
- epatch "${FILESDIR}"/${PN}-4.4-efi.patch |
5371 |
- export EFI_VENDOR="gentoo" |
5372 |
- export EFI_MOUNTPOINT="boot" |
5373 |
- fi |
5374 |
- |
5375 |
- # if the user *really* wants to use their own custom-cflags, let them |
5376 |
- if use custom-cflags; then |
5377 |
- einfo "User wants their own CFLAGS - removing defaults" |
5378 |
- # try and remove all the default custom-cflags |
5379 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
5380 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
5381 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
5382 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
5383 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
5384 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
5385 |
- -i {} \; || die "failed to re-set custom-cflags" |
5386 |
- fi |
5387 |
- |
5388 |
- # remove -Werror for gcc-4.6's sake |
5389 |
- find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ |
5390 |
- xargs sed -i 's/ *-Werror */ /' |
5391 |
- # not strictly necessary to fix this |
5392 |
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
5393 |
- |
5394 |
- epatch_user |
5395 |
-} |
5396 |
- |
5397 |
-src_configure() { |
5398 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
5399 |
- |
5400 |
- use debug && myopt="${myopt} debug=y" |
5401 |
- |
5402 |
- if use custom-cflags; then |
5403 |
- filter-flags -fPIE -fstack-protector |
5404 |
- replace-flags -O3 -O2 |
5405 |
- else |
5406 |
- unset CFLAGS |
5407 |
- fi |
5408 |
-} |
5409 |
- |
5410 |
-src_compile() { |
5411 |
- # Send raw LDFLAGS so that --as-needed works |
5412 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
5413 |
-} |
5414 |
- |
5415 |
-src_install() { |
5416 |
- local myopt |
5417 |
- use debug && myopt="${myopt} debug=y" |
5418 |
- |
5419 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
5420 |
- if use efi; then |
5421 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
5422 |
- fi |
5423 |
- |
5424 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
5425 |
-} |
5426 |
- |
5427 |
-pkg_postinst() { |
5428 |
- elog "Official Xen Guide and the unoffical wiki page:" |
5429 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
5430 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
5431 |
- |
5432 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
5433 |
-} |
5434 |
|
5435 |
diff --git a/app-emulation/xen/xen-9999.ebuild b/app-emulation/xen/xen-9999.ebuild |
5436 |
index 29d9b37..b1912bf 100644 |
5437 |
--- a/app-emulation/xen/xen-9999.ebuild |
5438 |
+++ b/app-emulation/xen/xen-9999.ebuild |
5439 |
@@ -1,46 +1,71 @@ |
5440 |
-# Copyright 1999-2013 Gentoo Foundation |
5441 |
+# Copyright 1999-2017 Gentoo Foundation |
5442 |
# Distributed under the terms of the GNU General Public License v2 |
5443 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-9999.ebuild,v 1.4 2011/09/11 14:48:15 alexxy Exp $ |
5444 |
|
5445 |
-EAPI="5" |
5446 |
+EAPI=5 |
5447 |
+ |
5448 |
+PYTHON_COMPAT=( python2_7 ) |
5449 |
+ |
5450 |
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs |
5451 |
+ |
5452 |
+MY_PV=${PV/_/-} |
5453 |
+MY_P=${PN}-${PV/_/-} |
5454 |
|
5455 |
if [[ $PV == *9999 ]]; then |
5456 |
+ inherit git-r3 |
5457 |
KEYWORDS="" |
5458 |
- EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" |
5459 |
- live_eclass="git-2" |
5460 |
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
5461 |
+ SRC_URI="" |
5462 |
else |
5463 |
- KEYWORDS="~amd64 ~x86" |
5464 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" |
5465 |
+ KEYWORDS="~amd64 ~arm -x86" |
5466 |
+ UPSTREAM_VER=1 |
5467 |
+ SECURITY_VER=27 |
5468 |
+ GENTOO_VER= |
5469 |
+ |
5470 |
+ [[ -n ${UPSTREAM_VER} ]] && \ |
5471 |
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
5472 |
+ [[ -n ${SECURITY_VER} ]] && \ |
5473 |
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
5474 |
+ [[ -n ${GENTOO_VER} ]] && \ |
5475 |
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
5476 |
+ SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz |
5477 |
+ ${UPSTREAM_PATCHSET_URI} |
5478 |
+ ${SECURITY_PATCHSET_URI} |
5479 |
+ ${GENTOO_PATCHSET_URI}" |
5480 |
fi |
5481 |
|
5482 |
-inherit mount-boot flag-o-matic toolchain-funcs ${live_eclass} |
5483 |
- |
5484 |
DESCRIPTION="The Xen virtual machine monitor" |
5485 |
HOMEPAGE="http://xen.org/" |
5486 |
- |
5487 |
LICENSE="GPL-2" |
5488 |
SLOT="0" |
5489 |
-IUSE="custom-cflags debug flask pae xsm" |
5490 |
+IUSE="custom-cflags debug efi flask" |
5491 |
|
5492 |
-RDEPEND="|| ( sys-boot/grub |
5493 |
- sys-boot/grub-static )" |
5494 |
+DEPEND="${PYTHON_DEPS} |
5495 |
+ efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
5496 |
+ !efi? ( >=sys-devel/binutils-2.22 )" |
5497 |
+RDEPEND="" |
5498 |
PDEPEND="~app-emulation/xen-tools-${PV}" |
5499 |
|
5500 |
-RESTRICT="test" |
5501 |
+# no tests are available for the hypervisor |
5502 |
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
5503 |
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
5504 |
+RESTRICT="test splitdebug strip" |
5505 |
|
5506 |
# Approved by QA team in bug #144032 |
5507 |
QA_WX_LOAD="boot/xen-syms-${PV}" |
5508 |
|
5509 |
-REQUIRED_USE="flask? ( xsm )" |
5510 |
+REQUIRED_USE="arm? ( debug )" |
5511 |
+ |
5512 |
+S="${WORKDIR}/${MY_P}" |
5513 |
|
5514 |
pkg_setup() { |
5515 |
+ python-any-r1_pkg_setup |
5516 |
if [[ -z ${XEN_TARGET_ARCH} ]]; then |
5517 |
- if use x86 && use amd64; then |
5518 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
5519 |
- elif use x86; then |
5520 |
- export XEN_TARGET_ARCH="x86_32" |
5521 |
- elif use amd64; then |
5522 |
+ if use amd64; then |
5523 |
export XEN_TARGET_ARCH="x86_64" |
5524 |
+ elif use arm; then |
5525 |
+ export XEN_TARGET_ARCH="arm32" |
5526 |
+ elif use arm64; then |
5527 |
+ export XEN_TARGET_ARCH="arm64" |
5528 |
else |
5529 |
die "Unsupported architecture!" |
5530 |
fi |
5531 |
@@ -49,15 +74,51 @@ pkg_setup() { |
5532 |
if use flask ; then |
5533 |
export "XSM_ENABLE=y" |
5534 |
export "FLASK_ENABLE=y" |
5535 |
- elif use xsm ; then |
5536 |
- export "XSM_ENABLE=y" |
5537 |
fi |
5538 |
} |
5539 |
|
5540 |
src_prepare() { |
5541 |
+ # Upstream's patchset |
5542 |
+ if [[ -n ${UPSTREAM_VER} ]]; then |
5543 |
+ EPATCH_SUFFIX="patch" \ |
5544 |
+ EPATCH_FORCE="yes" \ |
5545 |
+ EPATCH_OPTS="-p1" \ |
5546 |
+ epatch "${WORKDIR}"/patches-upstream |
5547 |
+ fi |
5548 |
+ |
5549 |
+ # Security patchset |
5550 |
+ if [[ -n ${SECURITY_VER} ]]; then |
5551 |
+ einfo "Try to apply Xen Security patch set" |
5552 |
+ # apply main xen patches |
5553 |
+ # Two parallel systems, both work side by side |
5554 |
+ # Over time they may concdense into one. This will suffice for now |
5555 |
+ EPATCH_SUFFIX="patch" |
5556 |
+ EPATCH_FORCE="yes" |
5557 |
+ |
5558 |
+ source "${WORKDIR}"/patches-security/${PV}.conf |
5559 |
+ |
5560 |
+ for i in ${XEN_SECURITY_MAIN}; do |
5561 |
+ epatch "${WORKDIR}"/patches-security/xen/$i |
5562 |
+ done |
5563 |
+ fi |
5564 |
+ |
5565 |
+ # Gentoo's patchset |
5566 |
+ if [[ -n ${GENTOO_VER} ]]; then |
5567 |
+ EPATCH_SUFFIX="patch" \ |
5568 |
+ EPATCH_FORCE="yes" \ |
5569 |
+ epatch "${WORKDIR}"/patches-gentoo |
5570 |
+ fi |
5571 |
+ |
5572 |
+ epatch "${FILESDIR}"/${PN}-4.6-efi.patch |
5573 |
+ |
5574 |
# Drop .config |
5575 |
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
5576 |
|
5577 |
+ if use efi; then |
5578 |
+ export EFI_VENDOR="gentoo" |
5579 |
+ export EFI_MOUNTPOINT="boot" |
5580 |
+ fi |
5581 |
+ |
5582 |
# if the user *really* wants to use their own custom-cflags, let them |
5583 |
if use custom-cflags; then |
5584 |
einfo "User wants their own CFLAGS - removing defaults" |
5585 |
@@ -68,7 +129,7 @@ src_prepare() { |
5586 |
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
5587 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
5588 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
5589 |
- -i {} \; |
5590 |
+ -i {} \; || die "failed to re-set custom-cflags" |
5591 |
fi |
5592 |
|
5593 |
# remove -Werror for gcc-4.6's sake |
5594 |
@@ -76,40 +137,56 @@ src_prepare() { |
5595 |
xargs sed -i 's/ *-Werror */ /' |
5596 |
# not strictly necessary to fix this |
5597 |
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
5598 |
+ |
5599 |
+ # Bug #575868 converted to a sed statement, typo of one char |
5600 |
+ sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die |
5601 |
+ |
5602 |
+ epatch_user |
5603 |
} |
5604 |
|
5605 |
src_configure() { |
5606 |
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
5607 |
+ |
5608 |
use debug && myopt="${myopt} debug=y" |
5609 |
- use pae && myopt="${myopt} pae=y" |
5610 |
|
5611 |
if use custom-cflags; then |
5612 |
filter-flags -fPIE -fstack-protector |
5613 |
replace-flags -O3 -O2 |
5614 |
else |
5615 |
unset CFLAGS |
5616 |
+ unset LDFLAGS |
5617 |
+ unset ASFLAGS |
5618 |
fi |
5619 |
} |
5620 |
|
5621 |
src_compile() { |
5622 |
# Send raw LDFLAGS so that --as-needed works |
5623 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
5624 |
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
5625 |
} |
5626 |
|
5627 |
src_install() { |
5628 |
local myopt |
5629 |
use debug && myopt="${myopt} debug=y" |
5630 |
- use pae && myopt="${myopt} pae=y" |
5631 |
+ |
5632 |
+ # The 'make install' doesn't 'mkdir -p' the subdirs |
5633 |
+ if use efi; then |
5634 |
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
5635 |
+ fi |
5636 |
|
5637 |
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
5638 |
+ |
5639 |
+ # make install likes to throw in some extra EFI bits if it built |
5640 |
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
5641 |
} |
5642 |
|
5643 |
pkg_postinst() { |
5644 |
elog "Official Xen Guide and the unoffical wiki page:" |
5645 |
- elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
5646 |
+ elog " https://wiki.gentoo.org/wiki/Xen" |
5647 |
elog " http://en.gentoo-wiki.com/wiki/Xen/" |
5648 |
|
5649 |
- if use pae; then |
5650 |
- echo |
5651 |
- ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" |
5652 |
- fi |
5653 |
+ use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
5654 |
+ |
5655 |
+ elog "You can optionally block the installation of /boot/xen-syms by an entry" |
5656 |
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
5657 |
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
5658 |
} |