1 |
commit: b640b623d901afc89ac1e47c7dd5f8b94cebcd12 |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 28 16:48:13 2016 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 28 16:50:46 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b640b623 |
7 |
|
8 |
app-emulation/xen-pvgrub: drop old |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
app-emulation/xen-pvgrub/Manifest | 2 - |
13 |
.../xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch | 245 --------------------- |
14 |
.../xen-pvgrub/files/xen-4.2.1-externals.patch | 83 ------- |
15 |
.../files/xen-4.3-fix_dotconfig-gcc.patch | 220 ------------------ |
16 |
.../files/xen-4.4-fix_dotconfig-gcc.patch | 171 -------------- |
17 |
.../xen-pvgrub/files/xen-pvgrub-4-qa.patch | 35 --- |
18 |
.../xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch | 34 --- |
19 |
.../xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch | 30 --- |
20 |
app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild | 144 ------------ |
21 |
app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild | 144 ------------ |
22 |
10 files changed, 1108 deletions(-) |
23 |
|
24 |
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest |
25 |
index 9d16eff..5939f84 100644 |
26 |
--- a/app-emulation/xen-pvgrub/Manifest |
27 |
+++ b/app-emulation/xen-pvgrub/Manifest |
28 |
@@ -3,8 +3,6 @@ DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe182 |
29 |
DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db |
30 |
DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e |
31 |
DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383 |
32 |
-DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8 |
33 |
-DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5 |
34 |
DIST xen-4.6.3.tar.gz 19707041 SHA256 02badfce9a037bd1bd4a94210c1f6b85467746216c71795805102b514bcf1fc4 SHA512 187a860b40c05139f22b8498a5fae1db173c3110d957147af29a56cb83b7111c9dc4946d65f9dffc847001fc01c5e9bf51886eaa1194bb9cfd0b6dbcd43a2c5c WHIRLPOOL f80fa73727218567b8d6c8d6bab9dfd577c4bb84ac737b084e4396128e8c4aa79776a277f73c283d5b12f17764b183b67fbf8596e240042dd0709f28cbab777e |
35 |
DIST xen-4.7.0.tar.gz 20702550 SHA256 be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 SHA512 2c52c8ef145dfab7d069e79318d5d631e1106a0ddc79d88b3bacf36c7f15cea67dccb704a245e785d2a1e42c6fb6c0ad74832f564aaeec025ad7b864031f0921 WHIRLPOOL 9725ac9fe94e78aab47b0534b5ee1a190106a773bf7d6204fed736abe7069b71937717b6680833736bd02a3a3a43f2eb2162fe7c0d992ddd47d12158b5d9835f |
36 |
DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 |
37 |
|
38 |
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 |
39 |
deleted file mode 100644 |
40 |
index 4e08a30..0000000 |
41 |
--- a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch |
42 |
+++ /dev/null |
43 |
@@ -1,245 +0,0 @@ |
44 |
-# Fix gcc-4.6 |
45 |
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk |
46 |
---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 |
47 |
-+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 |
48 |
-@@ -6,7 +6,7 @@ |
49 |
- |
50 |
- # Define some default flags. |
51 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
52 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
53 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
54 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
55 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
56 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
57 |
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile |
58 |
---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 |
59 |
-+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 |
60 |
-@@ -73,7 +73,7 @@ |
61 |
- |
62 |
- -include $(XEN_TARGET_ARCH)/Makefile |
63 |
- |
64 |
--CFLAGS += -Werror -Wmissing-prototypes |
65 |
-+CFLAGS += -Wmissing-prototypes |
66 |
- CFLAGS += -I. $(CFLAGS_xeninclude) |
67 |
- |
68 |
- # Needed for posix_fadvise64() in xc_linux.c |
69 |
-# Drop .config |
70 |
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk |
71 |
---- Config.mk 2012-09-17 18:23:12.000000000 +0800 |
72 |
-+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 |
73 |
-@@ -7,7 +7,6 @@ Drop .config |
74 |
- # fallback for older make |
75 |
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) |
76 |
- |
77 |
---include $(XEN_ROOT)/.config |
78 |
- |
79 |
- # A debug build of Xen and tools? |
80 |
- debug ?= n |
81 |
-@@ -24,7 +24,7 @@ |
82 |
- |
83 |
- # Tools to run on system hosting the build |
84 |
- HOSTCC = gcc |
85 |
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer |
86 |
-+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer |
87 |
- HOSTCFLAGS += -fno-strict-aliasing |
88 |
- |
89 |
- DISTDIR ?= $(XEN_ROOT)/dist |
90 |
-@@ -156,7 +156,7 @@ |
91 |
- |
92 |
- CFLAGS += -std=gnu99 |
93 |
- |
94 |
--CFLAGS += -Wall -Wstrict-prototypes |
95 |
-+CFLAGS += -Wstrict-prototypes |
96 |
- |
97 |
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' |
98 |
- # and is over-zealous with the printf format lint |
99 |
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile |
100 |
---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800 |
101 |
-+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800 |
102 |
-@@ -9,7 +9,7 @@ |
103 |
- LOCK_UTIL = lock-util |
104 |
- INST_DIR = $(SBINDIR) |
105 |
- |
106 |
--CFLAGS += -Werror -g |
107 |
-+CFLAGS += -g |
108 |
- CFLAGS += -Wno-unused |
109 |
- CFLAGS += -fno-strict-aliasing |
110 |
- CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers |
111 |
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk |
112 |
---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800 |
113 |
-+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800 |
114 |
-@@ -1,4 +1,4 @@ |
115 |
- include $(XEN_ROOT)/tools/Rules.mk |
116 |
- |
117 |
--CFLAGS += -Werror -Wmissing-prototypes |
118 |
-+CFLAGS += -Wmissing-prototypes |
119 |
- # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion |
120 |
-diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile |
121 |
---- tools/debugger/xenitp/Makefile 2012-12-17 23:00:22.000000000 +0800 |
122 |
-+++ tools/debugger/xenitp/Makefile 2013-01-30 12:31:43.516941098 +0800 |
123 |
-@@ -1,7 +1,7 @@ |
124 |
- XEN_ROOT=$(CURDIR)/../../.. |
125 |
- include $(XEN_ROOT)/tools/Rules.mk |
126 |
- |
127 |
--#CFLAGS += -Werror -g -O0 |
128 |
-+#CFLAGS += -g -O0 |
129 |
- |
130 |
- CFLAGS += $(CFLAGS_libxenctrl) |
131 |
- |
132 |
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile |
133 |
---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800 |
134 |
-+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800 |
135 |
-@@ -4,7 +4,7 @@ |
136 |
- HARNESS_SRCS:=main.c |
137 |
- # io_queue.c |
138 |
- |
139 |
--CFLAGS=-Wall -Werror -g -O -laio |
140 |
-+CFLAGS=-Wall -g -O -laio |
141 |
- #-lpthread -lrt |
142 |
- |
143 |
- all: $(PROGS) |
144 |
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk |
145 |
---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800 |
146 |
-+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
147 |
-@@ -1,7 +1,7 @@ |
148 |
- include $(XEN_ROOT)/tools/Rules.mk |
149 |
- |
150 |
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" |
151 |
--CFLAGS += -Werror -D_GNU_SOURCE |
152 |
-+CFLAGS += -D_GNU_SOURCE |
153 |
- LDFLAGS += -L../common/ |
154 |
- |
155 |
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) |
156 |
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile |
157 |
---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800 |
158 |
-+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800 |
159 |
-@@ -11,7 +11,7 @@ |
160 |
- XLUMAJOR = 1.0 |
161 |
- XLUMINOR = 1 |
162 |
- |
163 |
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ |
164 |
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ |
165 |
- -Wno-declaration-after-statement -Wformat-nonliteral |
166 |
- CFLAGS += -I. -fPIC |
167 |
- |
168 |
-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 |
169 |
---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800 |
170 |
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800 |
171 |
-@@ -9,7 +9,7 @@ |
172 |
- |
173 |
- .PHONY : all clean build-all |
174 |
- |
175 |
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin |
176 |
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin |
177 |
- CFLAGS += -I$(SRC_PATH) |
178 |
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) |
179 |
- QEMU_CFLAGS = $(CFLAGS) |
180 |
-diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk |
181 |
---- tools/vtpm/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
182 |
-+++ tools/vtpm/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
183 |
-@@ -6,7 +6,7 @@ |
184 |
- # |
185 |
- |
186 |
- # General compiler flags |
187 |
--CFLAGS = -Werror -g3 |
188 |
-+CFLAGS = -g3 |
189 |
- |
190 |
- # Generic project files |
191 |
- HDRS = $(wildcard *.h) |
192 |
-diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk |
193 |
---- tools/vtpm_manager/Rules.mk 2012-12-17 23:01:35.000000000 +0800 |
194 |
-+++ tools/vtpm_manager/Rules.mk 2013-01-30 12:31:43.511941097 +0800 |
195 |
-@@ -6,7 +6,7 @@ |
196 |
- # |
197 |
- |
198 |
- # General compiler flags |
199 |
--CFLAGS = -Werror -g3 |
200 |
-+CFLAGS = -g3 |
201 |
- |
202 |
- # Generic project files |
203 |
- HDRS = $(wildcard *.h) |
204 |
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile |
205 |
---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800 |
206 |
-+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800 |
207 |
-@@ -18,7 +18,7 @@ |
208 |
- all install xentop: |
209 |
- else |
210 |
- |
211 |
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) |
212 |
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) |
213 |
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) |
214 |
- CFLAGS += -DHOST_$(XEN_OS) |
215 |
- |
216 |
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk |
217 |
---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
218 |
-+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800 |
219 |
-@@ -9,7 +9,7 @@ |
220 |
- HAS_DEVICE_TREE := y |
221 |
- |
222 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
223 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
224 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
225 |
- CFLAGS += -I$(BASEDIR)/include |
226 |
- |
227 |
- # Prevent floating-point variables from creeping into Xen. |
228 |
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk |
229 |
---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
230 |
-+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800 |
231 |
-@@ -24,7 +24,7 @@ |
232 |
- endif |
233 |
- |
234 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
235 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
236 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
237 |
- CFLAGS += -I$(BASEDIR)/include |
238 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic |
239 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default |
240 |
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile |
241 |
---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800 |
242 |
-+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800 |
243 |
-@@ -78,7 +78,7 @@ |
244 |
- all: headers.chk |
245 |
- |
246 |
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile |
247 |
-- 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 |
248 |
-+ 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 |
249 |
- mv $@.new $@ |
250 |
- |
251 |
- endif |
252 |
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile |
253 |
---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800 |
254 |
-+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800 |
255 |
-@@ -1,7 +1,7 @@ |
256 |
- XEN_ROOT=$(CURDIR)/../../../.. |
257 |
- include $(XEN_ROOT)/tools/Rules.mk |
258 |
- |
259 |
--CFLAGS += -Werror |
260 |
-+CFLAGS += |
261 |
- CFLAGS += $(CFLAGS_libxenctrl) |
262 |
- CFLAGS += $(CFLAGS_libxenguest) |
263 |
- CFLAGS += $(CFLAGS_libxenstore) |
264 |
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile |
265 |
---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800 |
266 |
-+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800 |
267 |
-@@ -1,7 +1,7 @@ |
268 |
- XEN_ROOT=$(CURDIR)/../../.. |
269 |
- include $(XEN_ROOT)/tools/Rules.mk |
270 |
- |
271 |
--CFLAGS += -Werror |
272 |
-+CFLAGS += |
273 |
- |
274 |
- CFLAGS += $(CFLAGS_libxenctrl) |
275 |
- CFLAGS += $(CFLAGS_xeninclude) |
276 |
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile |
277 |
---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800 |
278 |
-+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800 |
279 |
-@@ -1,7 +1,7 @@ |
280 |
- XEN_ROOT=$(CURDIR)/../../.. |
281 |
- include $(XEN_ROOT)/tools/Rules.mk |
282 |
- |
283 |
--CFLAGS += -Werror |
284 |
-+CFLAGS += |
285 |
- |
286 |
- CFLAGS += $(CFLAGS_libxenctrl) |
287 |
- CFLAGS += $(CFLAGS_libxenguest) |
288 |
- |
289 |
|
290 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch |
291 |
deleted file mode 100644 |
292 |
index f2525ae..0000000 |
293 |
--- a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch |
294 |
+++ /dev/null |
295 |
@@ -1,83 +0,0 @@ |
296 |
-# Patch Makefile to patch insource newlib, |
297 |
-# Prevent internal downloading of external packages |
298 |
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile |
299 |
---- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800 |
300 |
-+++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800 |
301 |
-@@ -95,12 +95,13 @@ |
302 |
- ############## |
303 |
- |
304 |
- newlib-$(NEWLIB_VERSION).tar.gz: |
305 |
-- $(WGET) $(NEWLIB_URL)/$@ |
306 |
-+# $(WGET) $(NEWLIB_URL)/$@ |
307 |
- |
308 |
- newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz |
309 |
- tar xzf $< |
310 |
- patch -d $@ -p0 < newlib.patch |
311 |
- patch -d $@ -p0 < newlib-chk.patch |
312 |
-+ patch -d $@ -p0 < newlib-implicits.patch |
313 |
- patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch |
314 |
- find $@ -type f | xargs perl -i.bak \ |
315 |
- -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' |
316 |
-@@ -110,7 +110,7 @@ |
317 |
- $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION) |
318 |
- mkdir -p newlib-$(XEN_TARGET_ARCH) |
319 |
- ( cd newlib-$(XEN_TARGET_ARCH) && \ |
320 |
-- 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 && \ |
321 |
-+ 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 && \ |
322 |
- $(MAKE) DESTDIR= && \ |
323 |
- $(MAKE) DESTDIR= install ) |
324 |
- |
325 |
-@@ -121,7 +122,7 @@ |
326 |
- ############ |
327 |
- |
328 |
- zlib-$(ZLIB_VERSION).tar.gz: |
329 |
-- $(WGET) $(ZLIB_URL)/$@ |
330 |
-+# $(WGET) $(ZLIB_URL)/$@ |
331 |
- |
332 |
- zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz |
333 |
- tar xzf $< |
334 |
-@@ -130,7 +130,7 @@ |
335 |
- cross-zlib: $(ZLIB_STAMPFILE) |
336 |
- $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) |
337 |
- ( cd $< && \ |
338 |
-- CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ |
339 |
-+ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ |
340 |
- $(MAKE) DESTDIR= libz.a && \ |
341 |
- $(MAKE) DESTDIR= install ) |
342 |
- |
343 |
-@@ -141,7 +142,7 @@ |
344 |
- ############## |
345 |
- |
346 |
- pciutils-$(LIBPCI_VERSION).tar.bz2: |
347 |
-- $(WGET) $(LIBPCI_URL)/$@ |
348 |
-+# $(WGET) $(LIBPCI_URL)/$@ |
349 |
- |
350 |
- pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2 |
351 |
- tar xjf $< |
352 |
-@@ -169,7 +170,7 @@ |
353 |
- ###### |
354 |
- |
355 |
- lwip-$(LWIP_VERSION).tar.gz: |
356 |
-- $(WGET) $(LWIP_URL)/$@ |
357 |
-+# $(WGET) $(LWIP_URL)/$@ |
358 |
- |
359 |
- lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz |
360 |
- tar xzf $< |
361 |
-@@ -325,7 +326,7 @@ |
362 |
- ###### |
363 |
- |
364 |
- grub-$(GRUB_VERSION).tar.gz: |
365 |
-- $(WGET) $(GRUB_URL)/$@ |
366 |
-+#$(WGET) $(GRUB_URL)/$@ |
367 |
- |
368 |
- grub-upstream: grub-$(GRUB_VERSION).tar.gz |
369 |
- tar xzf $< |
370 |
-@@ -392,7 +393,7 @@ |
371 |
- $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
372 |
- $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" |
373 |
- |
374 |
--install-grub: pv-grub |
375 |
-+install-grub: |
376 |
- $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
377 |
- $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" |
378 |
- |
379 |
|
380 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4.3-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4.3-fix_dotconfig-gcc.patch |
381 |
deleted file mode 100644 |
382 |
index 588be74..0000000 |
383 |
--- a/app-emulation/xen-pvgrub/files/xen-4.3-fix_dotconfig-gcc.patch |
384 |
+++ /dev/null |
385 |
@@ -1,220 +0,0 @@ |
386 |
-# Fix gcc-4.6 |
387 |
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk |
388 |
---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 |
389 |
-+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 |
390 |
-@@ -6,7 +6,7 @@ |
391 |
- |
392 |
- # Define some default flags. |
393 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
394 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
395 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
396 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
397 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
398 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
399 |
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile |
400 |
---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 |
401 |
-+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 |
402 |
-@@ -85,7 +85,7 @@ |
403 |
- |
404 |
- -include $(XEN_TARGET_ARCH)/Makefile |
405 |
- |
406 |
--CFLAGS += -Werror -Wmissing-prototypes |
407 |
-+CFLAGS += -Wmissing-prototypes |
408 |
- CFLAGS += -I. $(CFLAGS_xeninclude) |
409 |
- |
410 |
- # Needed for posix_fadvise64() in xc_linux.c |
411 |
-# Drop .config |
412 |
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk |
413 |
---- Config.mk 2012-09-17 18:23:12.000000000 +0800 |
414 |
-+++ Config.mk 2012-12-05 14:01:10.641260261 +0800 |
415 |
-@@ -7,7 +7,6 @@ Drop .config |
416 |
- # fallback for older make |
417 |
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) |
418 |
- |
419 |
---include $(XEN_ROOT)/.config |
420 |
- |
421 |
- # A debug build of Xen and tools? |
422 |
- debug ?= n |
423 |
-@@ -24,7 +24,7 @@ |
424 |
- |
425 |
- # Tools to run on system hosting the build |
426 |
- HOSTCC = gcc |
427 |
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer |
428 |
-+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer |
429 |
- HOSTCFLAGS += -fno-strict-aliasing |
430 |
- |
431 |
- DISTDIR ?= $(XEN_ROOT)/dist |
432 |
-@@ -156,7 +156,7 @@ |
433 |
- |
434 |
- CFLAGS += -std=gnu99 |
435 |
- |
436 |
--CFLAGS += -Wall -Wstrict-prototypes |
437 |
-+CFLAGS += -Wstrict-prototypes |
438 |
- |
439 |
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' |
440 |
- # and is over-zealous with the printf format lint |
441 |
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile |
442 |
---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800 |
443 |
-+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800 |
444 |
-@@ -9,7 +9,7 @@ |
445 |
- LOCK_UTIL = lock-util |
446 |
- INST_DIR = $(SBINDIR) |
447 |
- |
448 |
--CFLAGS += -Werror -g |
449 |
-+CFLAGS += -g |
450 |
- CFLAGS += -Wno-unused |
451 |
- CFLAGS += -fno-strict-aliasing |
452 |
- CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers |
453 |
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk |
454 |
---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800 |
455 |
-+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800 |
456 |
-@@ -1,4 +1,4 @@ |
457 |
- include $(XEN_ROOT)/tools/Rules.mk |
458 |
- |
459 |
--CFLAGS += -Werror -Wmissing-prototypes |
460 |
-+CFLAGS += -Wmissing-prototypes |
461 |
- # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion |
462 |
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile |
463 |
---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800 |
464 |
-+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800 |
465 |
-@@ -4,7 +4,7 @@ |
466 |
- HARNESS_SRCS:=main.c |
467 |
- # io_queue.c |
468 |
- |
469 |
--CFLAGS=-Wall -Werror -g -O -laio |
470 |
-+CFLAGS=-Wall -g -O -laio |
471 |
- #-lpthread -lrt |
472 |
- |
473 |
- all: $(PROGS) |
474 |
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk |
475 |
---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800 |
476 |
-+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800 |
477 |
-@@ -1,7 +1,7 @@ |
478 |
- include $(XEN_ROOT)/tools/Rules.mk |
479 |
- |
480 |
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" |
481 |
--CFLAGS += -Werror -D_GNU_SOURCE |
482 |
-+CFLAGS += -D_GNU_SOURCE |
483 |
- LDFLAGS += -L../common/ |
484 |
- |
485 |
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) |
486 |
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile |
487 |
---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800 |
488 |
-+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800 |
489 |
-@@ -11,7 +11,7 @@ |
490 |
- XLUMAJOR = 1.0 |
491 |
- XLUMINOR = 1 |
492 |
- |
493 |
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ |
494 |
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ |
495 |
- -Wno-declaration-after-statement -Wformat-nonliteral |
496 |
- CFLAGS += -I. -fPIC |
497 |
- |
498 |
-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 |
499 |
---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800 |
500 |
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800 |
501 |
-@@ -9,7 +9,7 @@ |
502 |
- |
503 |
- .PHONY : all clean build-all |
504 |
- |
505 |
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin |
506 |
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin |
507 |
- CFLAGS += -I$(SRC_PATH) |
508 |
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) |
509 |
- QEMU_CFLAGS = $(CFLAGS) |
510 |
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile |
511 |
---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800 |
512 |
-+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800 |
513 |
-@@ -18,7 +18,7 @@ |
514 |
- all install xentop: |
515 |
- else |
516 |
- |
517 |
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) |
518 |
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) |
519 |
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) |
520 |
- CFLAGS += -DHOST_$(XEN_OS) |
521 |
- |
522 |
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk |
523 |
---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
524 |
-+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800 |
525 |
-@@ -9,7 +9,7 @@ |
526 |
- HAS_DEVICE_TREE := y |
527 |
- |
528 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
529 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
530 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
531 |
- CFLAGS += -I$(BASEDIR)/include |
532 |
- |
533 |
- # Prevent floating-point variables from creeping into Xen. |
534 |
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk |
535 |
---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800 |
536 |
-+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800 |
537 |
-@@ -24,7 +24,7 @@ |
538 |
- endif |
539 |
- |
540 |
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls |
541 |
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe |
542 |
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe |
543 |
- CFLAGS += -I$(BASEDIR)/include |
544 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic |
545 |
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default |
546 |
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile |
547 |
---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800 |
548 |
-+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800 |
549 |
-@@ -78,7 +78,7 @@ |
550 |
- all: headers.chk |
551 |
- |
552 |
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile |
553 |
-- 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 |
554 |
-+ 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 |
555 |
- mv $@.new $@ |
556 |
- |
557 |
- endif |
558 |
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile |
559 |
---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800 |
560 |
-+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800 |
561 |
-@@ -1,7 +1,7 @@ |
562 |
- XEN_ROOT=$(CURDIR)/../../../.. |
563 |
- include $(XEN_ROOT)/tools/Rules.mk |
564 |
- |
565 |
--CFLAGS += -Werror |
566 |
-+CFLAGS += |
567 |
- CFLAGS += $(CFLAGS_libxenctrl) |
568 |
- CFLAGS += $(CFLAGS_libxenguest) |
569 |
- CFLAGS += $(CFLAGS_libxenstore) |
570 |
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile |
571 |
---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800 |
572 |
-+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800 |
573 |
-@@ -1,7 +1,7 @@ |
574 |
- XEN_ROOT=$(CURDIR)/../../.. |
575 |
- include $(XEN_ROOT)/tools/Rules.mk |
576 |
- |
577 |
--CFLAGS += -Werror |
578 |
-+CFLAGS += |
579 |
- |
580 |
- CFLAGS += $(CFLAGS_libxenctrl) |
581 |
- CFLAGS += $(CFLAGS_xeninclude) |
582 |
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile |
583 |
---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800 |
584 |
-+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800 |
585 |
-@@ -1,7 +1,7 @@ |
586 |
- XEN_ROOT=$(CURDIR)/../../.. |
587 |
- include $(XEN_ROOT)/tools/Rules.mk |
588 |
- |
589 |
--CFLAGS += -Werror |
590 |
-+CFLAGS += |
591 |
- |
592 |
- CFLAGS += $(CFLAGS_libxenctrl) |
593 |
- CFLAGS += $(CFLAGS_libxenguest) |
594 |
-diff -ur xen-4.3.0.orig/tools/firmware/Rules.mk xen-4.3.0/tools/firmware/Rules.mk |
595 |
---- tools/firmware/Rules.mk 2013-07-09 18:46:56.000000000 +0800 |
596 |
-+++ ttools/firmware/Rules.mk 2013-07-20 20:28:57.811836505 +0800 |
597 |
-@@ -11,8 +11,6 @@ |
598 |
- CFLAGS += -DNDEBUG |
599 |
- endif |
600 |
- |
601 |
--CFLAGS += -Werror |
602 |
-- |
603 |
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) |
604 |
- |
605 |
- # Extra CFLAGS suitable for an embedded type of environment. |
606 |
|
607 |
diff --git a/app-emulation/xen-pvgrub/files/xen-4.4-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4.4-fix_dotconfig-gcc.patch |
608 |
deleted file mode 100644 |
609 |
index 5bba0fd..0000000 |
610 |
--- a/app-emulation/xen-pvgrub/files/xen-4.4-fix_dotconfig-gcc.patch |
611 |
+++ /dev/null |
612 |
@@ -1,171 +0,0 @@ |
613 |
-diff -ur xen-4.4.0.orig/Config.mk xen-4.4.0/Config.mk |
614 |
---- xen-4.4.0.orig/Config.mk 2014-03-10 18:47:38.000000000 +0800 |
615 |
-+++ xen-4.4.0/Config.mk 2014-03-23 21:54:07.327717400 +0800 |
616 |
-@@ -13,8 +13,6 @@ |
617 |
- # fallback for older make |
618 |
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) |
619 |
- |
620 |
---include $(XEN_ROOT)/.config |
621 |
-- |
622 |
- # A debug build of Xen and tools? |
623 |
- debug ?= n |
624 |
- debug_symbols ?= $(debug) |
625 |
-@@ -36,7 +34,7 @@ |
626 |
- |
627 |
- # Tools to run on system hosting the build |
628 |
- HOSTCC = gcc |
629 |
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer |
630 |
-+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer |
631 |
- HOSTCFLAGS += -fno-strict-aliasing |
632 |
- |
633 |
- DISTDIR ?= $(XEN_ROOT)/dist |
634 |
-@@ -187,7 +185,7 @@ |
635 |
- |
636 |
- CFLAGS += -std=gnu99 |
637 |
- |
638 |
--CFLAGS += -Wall -Wstrict-prototypes |
639 |
-+CFLAGS += -Wstrict-prototypes |
640 |
- |
641 |
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' |
642 |
- # and is over-zealous with the printf format lint |
643 |
-diff -ur xen-4.4.0.orig/extras/mini-os/minios.mk xen-4.4.0/extras/mini-os/minios.mk |
644 |
---- xen-4.4.0.orig/extras/mini-os/minios.mk 2014-03-10 18:43:57.000000000 +0800 |
645 |
-+++ xen-4.4.0/extras/mini-os/minios.mk 2014-03-23 21:48:41.110722054 +0800 |
646 |
-@@ -6,7 +6,7 @@ |
647 |
- |
648 |
- # Define some default flags. |
649 |
- # NB. '-Wcast-qual' is nasty, so I omitted it. |
650 |
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls |
651 |
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls |
652 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) |
653 |
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) |
654 |
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline |
655 |
-diff -ur xen-4.4.0.orig/tools/blktap2/drivers/Makefile xen-4.4.0/tools/blktap2/drivers/Makefile |
656 |
---- xen-4.4.0.orig/tools/blktap2/drivers/Makefile 2014-03-10 18:43:57.000000000 +0800 |
657 |
-+++ xen-4.4.0/tools/blktap2/drivers/Makefile 2014-03-23 21:55:52.215715903 +0800 |
658 |
-@@ -9,7 +9,7 @@ |
659 |
- LOCK_UTIL = lock-util |
660 |
- INST_DIR = $(SBINDIR) |
661 |
- |
662 |
--CFLAGS += -Werror -g |
663 |
-+CFLAGS += -g |
664 |
- CFLAGS += -Wno-unused |
665 |
- CFLAGS += -fno-strict-aliasing |
666 |
- CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers |
667 |
-diff -ur xen-4.4.0.orig/tools/debugger/gdbsx/Rules.mk xen-4.4.0/tools/debugger/gdbsx/Rules.mk |
668 |
---- xen-4.4.0.orig/tools/debugger/gdbsx/Rules.mk 2014-03-10 18:43:57.000000000 +0800 |
669 |
-+++ xen-4.4.0/tools/debugger/gdbsx/Rules.mk 2014-03-23 21:56:21.399715487 +0800 |
670 |
-@@ -1,4 +1,4 @@ |
671 |
- include $(XEN_ROOT)/tools/Rules.mk |
672 |
- |
673 |
--CFLAGS += -Werror -Wmissing-prototypes |
674 |
-+CFLAGS += -Wmissing-prototypes |
675 |
- # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion |
676 |
-diff -ur xen-4.4.0.orig/tools/firmware/Rules.mk xen-4.4.0/tools/firmware/Rules.mk |
677 |
---- xen-4.4.0.orig/tools/firmware/Rules.mk 2014-03-10 18:43:57.000000000 +0800 |
678 |
-+++ xen-4.4.0/tools/firmware/Rules.mk 2014-03-23 22:30:36.056686174 +0800 |
679 |
-@@ -11,7 +11,7 @@ |
680 |
- CFLAGS += -DNDEBUG |
681 |
- endif |
682 |
- |
683 |
--CFLAGS += -Werror |
684 |
-+CFLAGS += |
685 |
- |
686 |
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) |
687 |
- |
688 |
-diff -ur xen-4.4.0.orig/tools/libfsimage/Rules.mk xen-4.4.0/tools/libfsimage/Rules.mk |
689 |
---- xen-4.4.0.orig/tools/libfsimage/Rules.mk 2014-03-10 18:43:57.000000000 +0800 |
690 |
-+++ xen-4.4.0/tools/libfsimage/Rules.mk 2014-03-23 21:57:21.767714626 +0800 |
691 |
-@@ -1,7 +1,7 @@ |
692 |
- include $(XEN_ROOT)/tools/Rules.mk |
693 |
- |
694 |
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" |
695 |
--CFLAGS += -Werror -D_GNU_SOURCE |
696 |
-+CFLAGS += -D_GNU_SOURCE |
697 |
- LDFLAGS += -L../common/ |
698 |
- |
699 |
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) |
700 |
-diff -ur xen-4.4.0.orig/tools/libxc/Makefile xen-4.4.0/tools/libxc/Makefile |
701 |
---- xen-4.4.0.orig/tools/libxc/Makefile 2014-03-10 18:43:57.000000000 +0800 |
702 |
-+++ xen-4.4.0/tools/libxc/Makefile 2014-03-23 21:49:37.919721243 +0800 |
703 |
-@@ -87,7 +87,7 @@ |
704 |
- |
705 |
- -include $(XEN_TARGET_ARCH)/Makefile |
706 |
- |
707 |
--CFLAGS += -Werror -Wmissing-prototypes |
708 |
-+CFLAGS += -Wmissing-prototypes |
709 |
- CFLAGS += -I. $(CFLAGS_xeninclude) |
710 |
- |
711 |
- # Needed for posix_fadvise64() in xc_linux.c |
712 |
-diff -ur xen-4.4.0.orig/tools/libxl/Makefile xen-4.4.0/tools/libxl/Makefile |
713 |
---- xen-4.4.0.orig/tools/libxl/Makefile 2014-03-10 18:43:57.000000000 +0800 |
714 |
-+++ xen-4.4.0/tools/libxl/Makefile 2014-03-23 21:58:09.983713938 +0800 |
715 |
-@@ -11,7 +11,7 @@ |
716 |
- XLUMAJOR = 4.3 |
717 |
- XLUMINOR = 0 |
718 |
- |
719 |
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ |
720 |
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ |
721 |
- -Wno-declaration-after-statement -Wformat-nonliteral |
722 |
- CFLAGS += -I. -fPIC |
723 |
- |
724 |
-diff -ur xen-4.4.0.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.4.0/tools/qemu-xen/pc-bios/optionrom/Makefile |
725 |
---- xen-4.4.0.orig/tools/qemu-xen/pc-bios/optionrom/Makefile 2014-02-06 00:59:14.000000000 +0800 |
726 |
-+++ xen-4.4.0/tools/qemu-xen/pc-bios/optionrom/Makefile 2014-03-23 21:59:13.175713036 +0800 |
727 |
-@@ -9,7 +9,7 @@ |
728 |
- |
729 |
- .PHONY : all clean build-all |
730 |
- |
731 |
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin |
732 |
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin |
733 |
- CFLAGS += -I$(SRC_PATH) |
734 |
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) |
735 |
- QEMU_CFLAGS = $(CFLAGS) |
736 |
-diff -ur xen-4.4.0.orig/tools/tests/mce-test/tools/Makefile xen-4.4.0/tools/tests/mce-test/tools/Makefile |
737 |
---- xen-4.4.0.orig/tools/tests/mce-test/tools/Makefile 2014-03-10 18:43:57.000000000 +0800 |
738 |
-+++ xen-4.4.0/tools/tests/mce-test/tools/Makefile 2014-03-23 22:28:45.160687756 +0800 |
739 |
-@@ -1,7 +1,7 @@ |
740 |
- XEN_ROOT=$(CURDIR)/../../../.. |
741 |
- include $(XEN_ROOT)/tools/Rules.mk |
742 |
- |
743 |
--CFLAGS += -Werror |
744 |
-+CFLAGS += |
745 |
- CFLAGS += $(CFLAGS_libxenctrl) |
746 |
- CFLAGS += $(CFLAGS_libxenguest) |
747 |
- CFLAGS += $(CFLAGS_libxenstore) |
748 |
-diff -ur xen-4.4.0.orig/tools/tests/mem-sharing/Makefile xen-4.4.0/tools/tests/mem-sharing/Makefile |
749 |
---- xen-4.4.0.orig/tools/tests/mem-sharing/Makefile 2014-03-10 18:43:57.000000000 +0800 |
750 |
-+++ xen-4.4.0/tools/tests/mem-sharing/Makefile 2014-03-23 22:29:15.472687324 +0800 |
751 |
-@@ -1,7 +1,7 @@ |
752 |
- XEN_ROOT=$(CURDIR)/../../.. |
753 |
- include $(XEN_ROOT)/tools/Rules.mk |
754 |
- |
755 |
--CFLAGS += -Werror |
756 |
-+CFLAGS += |
757 |
- |
758 |
- CFLAGS += $(CFLAGS_libxenctrl) |
759 |
- CFLAGS += $(CFLAGS_xeninclude) |
760 |
-diff -ur xen-4.4.0.orig/tools/tests/xen-access/Makefile xen-4.4.0/tools/tests/xen-access/Makefile |
761 |
---- xen-4.4.0.orig/tools/tests/xen-access/Makefile 2014-03-10 18:43:57.000000000 +0800 |
762 |
-+++ xen-4.4.0/tools/tests/xen-access/Makefile 2014-03-23 22:30:02.064686659 +0800 |
763 |
-@@ -1,8 +1,6 @@ |
764 |
- XEN_ROOT=$(CURDIR)/../../.. |
765 |
- include $(XEN_ROOT)/tools/Rules.mk |
766 |
- |
767 |
--CFLAGS += -Werror |
768 |
-- |
769 |
- CFLAGS += $(CFLAGS_libxenctrl) |
770 |
- CFLAGS += $(CFLAGS_libxenguest) |
771 |
- CFLAGS += $(CFLAGS_xeninclude) |
772 |
-diff -ur xen-4.4.0.orig/tools/xenstat/xentop/Makefile xen-4.4.0/tools/xenstat/xentop/Makefile |
773 |
---- xen-4.4.0.orig/tools/xenstat/xentop/Makefile 2014-03-10 18:43:57.000000000 +0800 |
774 |
-+++ xen-4.4.0/tools/xenstat/xentop/Makefile 2014-03-23 22:23:59.944691825 +0800 |
775 |
-@@ -18,7 +18,7 @@ |
776 |
- all install xentop: |
777 |
- else |
778 |
- |
779 |
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) |
780 |
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat) |
781 |
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) |
782 |
- CFLAGS += -DHOST_$(XEN_OS) |
783 |
- |
784 |
|
785 |
diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch |
786 |
deleted file mode 100644 |
787 |
index 33d56db..0000000 |
788 |
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch |
789 |
+++ /dev/null |
790 |
@@ -1,35 +0,0 @@ |
791 |
-This includes a few headers to fix some missing function declarations. |
792 |
- |
793 |
-Signed-off-by: Samuel Thibault <samuel.thibault@××××××××.org> |
794 |
- |
795 |
-diff --git a/stubdom/grub/config.h b/stubdom/grub/config.h |
796 |
-index 1649d51..15a6583 100644 |
797 |
---- a/stubdom/grub/config.h |
798 |
-+++ b/stubdom/grub/config.h |
799 |
-@@ -2,6 +2,7 @@ |
800 |
- #undef putchar |
801 |
- #include <ctype.h> |
802 |
- #include <string.h> |
803 |
-+#include <kernel.h> |
804 |
- #define debug _debug |
805 |
- #define grub_halt(a) do_exit() |
806 |
- #define printf grub_printf |
807 |
-diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h |
808 |
-index 2a6fa54..e65db6d 100644 |
809 |
---- a/xen/include/xen/libelf.h |
810 |
-+++ b/xen/include/xen/libelf.h |
811 |
-@@ -39,11 +39,13 @@ typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */ |
812 |
- #ifdef __XEN__ |
813 |
- #include <public/elfnote.h> |
814 |
- #include <public/features.h> |
815 |
-+#include <xen/string.h> |
816 |
- #else |
817 |
- #include <xen/elfnote.h> |
818 |
- #include <xen/features.h> |
819 |
- |
820 |
- #include <stdarg.h> |
821 |
-+#include <string.h> |
822 |
- |
823 |
- struct elf_binary; |
824 |
- typedef void elf_log_callback(struct elf_binary*, void *caller_data, |
825 |
- |
826 |
|
827 |
diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch |
828 |
deleted file mode 100644 |
829 |
index ea69366..0000000 |
830 |
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch |
831 |
+++ /dev/null |
832 |
@@ -1,34 +0,0 @@ |
833 |
-This includes a few headers to fix some missing function declarations. |
834 |
- |
835 |
-Signed-off-by: Samuel Thibault <samuel.thibault@××××××××.org> |
836 |
- |
837 |
-diff --git a/stubdom/grub/config.h b/stubdom/grub/config.h |
838 |
-index 1649d51..15a6583 100644 |
839 |
---- a/stubdom/grub/config.h |
840 |
-+++ b/stubdom/grub/config.h |
841 |
-@@ -2,6 +2,7 @@ |
842 |
- #undef putchar |
843 |
- #include <ctype.h> |
844 |
- #include <string.h> |
845 |
-+#include <kernel.h> |
846 |
- #define debug _debug |
847 |
- #define grub_halt(a) do_exit() |
848 |
- #define printf grub_printf |
849 |
-diff -ur xen-4.2.3.orig/xen/include/xen/libelf.h xen-4.2.3/xen/include/xen/libelf.h |
850 |
---- xen-4.2.3.orig/xen/include/xen/libelf.h 2013-09-09 20:27:41.000000000 +0800 |
851 |
-+++ xen-4.2.3/xen/include/xen/libelf.h 2014-02-15 13:42:24.491435783 +0800 |
852 |
-@@ -37,12 +37,14 @@ |
853 |
- #ifdef __XEN__ |
854 |
- #include <public/elfnote.h> |
855 |
- #include <public/features.h> |
856 |
-+#include <xen/string.h> |
857 |
- #include <xen/stdbool.h> |
858 |
- #else |
859 |
- #include <xen/elfnote.h> |
860 |
- #include <xen/features.h> |
861 |
- |
862 |
- #include <stdarg.h> |
863 |
-+#include <string.h> |
864 |
- #include <stdbool.h> |
865 |
- |
866 |
- struct elf_binary; |
867 |
|
868 |
diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch |
869 |
deleted file mode 100644 |
870 |
index f5cb3d2..0000000 |
871 |
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch |
872 |
+++ /dev/null |
873 |
@@ -1,30 +0,0 @@ |
874 |
-diff -ur xen-4.3.1.orig/stubdom/grub/config.h xen-4.3.1/stubdom/grub/config.h |
875 |
---- stubdom/grub/config.h 2013-10-30 16:18:28.000000000 +0800 |
876 |
-+++ stubdom/grub/config.h 2013-12-09 17:12:14.209783970 +0800 |
877 |
-@@ -2,6 +2,7 @@ |
878 |
- #undef putchar |
879 |
- #include <ctype.h> |
880 |
- #include <string.h> |
881 |
-+#include <kernel.h> |
882 |
- #define debug _debug |
883 |
- #define grub_halt(a) do_exit() |
884 |
- #define printf grub_printf |
885 |
-diff -ur xen-4.3.1.orig/xen/include/xen/libelf.h xen-4.3.1/xen/include/xen/libelf.h |
886 |
---- xen/include/xen/libelf.h 2013-10-30 16:18:28.000000000 +0800 |
887 |
-+++ xen/include/xen/libelf.h 2013-12-09 17:14:09.249788085 +0800 |
888 |
-@@ -37,6 +37,7 @@ |
889 |
- #ifdef __XEN__ |
890 |
- #include <public/elfnote.h> |
891 |
- #include <public/features.h> |
892 |
-+#include <xen/string.h> |
893 |
- #include <xen/stdbool.h> |
894 |
- #else |
895 |
- #include <xen/elfnote.h> |
896 |
-@@ -44,6 +45,7 @@ |
897 |
- |
898 |
- #include <stdarg.h> |
899 |
- #include <stdbool.h> |
900 |
-+#include <string.h> |
901 |
- |
902 |
- struct elf_binary; |
903 |
- typedef void elf_log_callback(struct elf_binary*, void *caller_data, |
904 |
|
905 |
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild |
906 |
deleted file mode 100644 |
907 |
index eb54859..0000000 |
908 |
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild |
909 |
+++ /dev/null |
910 |
@@ -1,144 +0,0 @@ |
911 |
-# Copyright 1999-2016 Gentoo Foundation |
912 |
-# Distributed under the terms of the GNU General Public License v2 |
913 |
-# $Id$ |
914 |
- |
915 |
-EAPI=5 |
916 |
- |
917 |
-PYTHON_COMPAT=( python2_7 ) |
918 |
-PYTHON_REQ_USE='xml,threads' |
919 |
- |
920 |
-inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs |
921 |
- |
922 |
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
923 |
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
924 |
-GRUB_URL=mirror://gnu-alpha/grub |
925 |
-SRC_URI=" |
926 |
- http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
927 |
- $GRUB_URL/grub-0.97.tar.gz |
928 |
- $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz |
929 |
- $LIBPCI_URL/pciutils-2.2.9.tar.bz2 |
930 |
- $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz |
931 |
- $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz |
932 |
- $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz" |
933 |
- |
934 |
-S="${WORKDIR}/xen-${PV}" |
935 |
- |
936 |
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" |
937 |
-HOMEPAGE="http://xen.org/" |
938 |
-LICENSE="GPL-2" |
939 |
-SLOT="0" |
940 |
-KEYWORDS="amd64 x86" |
941 |
-IUSE="custom-cflags" |
942 |
- |
943 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
944 |
- |
945 |
-DEPEND="sys-devel/gettext |
946 |
- sys-devel/bin86 |
947 |
- sys-apps/texinfo |
948 |
- x11-libs/pixman" |
949 |
- |
950 |
-RDEPEND=">=app-emulation/xen-tools-${PV}" |
951 |
- |
952 |
-pkg_setup() { |
953 |
- python-single-r1_pkg_setup |
954 |
-} |
955 |
- |
956 |
-retar-externals() { |
957 |
- # Purely to unclutter src_prepare |
958 |
- local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" |
959 |
- |
960 |
- # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative |
961 |
- sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ |
962 |
- -i "${WORKDIR}"/zlib-1.2.3/configure |
963 |
- sed -e 's:^AR=ar rc:AR=ar:' \ |
964 |
- -e s':$(AR) $@:$(AR) rc $@:' \ |
965 |
- -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} |
966 |
- einfo "zlib Makefile edited" |
967 |
- |
968 |
- cd "${WORKDIR}" |
969 |
- tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz |
970 |
- tar czp grub-0.97 -f grub-0.97.tar.gz |
971 |
- tar czp lwip -f lwip-1.3.0.tar.gz |
972 |
- tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz |
973 |
- tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz |
974 |
- mv $set "${S}"/stubdom/ |
975 |
- einfo "tarballs moved to source" |
976 |
-} |
977 |
- |
978 |
-src_prepare() { |
979 |
- # if the user *really* wants to use their own custom-cflags, let them |
980 |
- if use custom-cflags; then |
981 |
- einfo "User wants their own CFLAGS - removing defaults" |
982 |
- # try and remove all the default custom-cflags |
983 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
984 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
985 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
986 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
987 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
988 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
989 |
- -i {} \; |
990 |
- fi |
991 |
- |
992 |
- # Patch the unmergeable newlib, fix most of the leftover gcc QA issues |
993 |
- cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
994 |
- |
995 |
- # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
996 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch |
997 |
- |
998 |
- # fix jobserver in Makefile |
999 |
- epatch "${FILESDIR}"/${PN}-4.2-jserver.patch |
1000 |
- |
1001 |
- #Substitute for internal downloading. pciutils copied only due to the only .bz2 |
1002 |
- cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" |
1003 |
- retar-externals || die "re-tar procedure failed" |
1004 |
-} |
1005 |
- |
1006 |
-src_configure() { |
1007 |
- local myconf="--prefix=${PREFIX}/usr \ |
1008 |
- --libdir=${PREFIX}/usr/$(get_libdir) \ |
1009 |
- --libexecdir=${PREFIX}/usr/libexec \ |
1010 |
- --disable-werror \ |
1011 |
- --disable-xen" |
1012 |
- |
1013 |
- econf ${myconf} |
1014 |
-} |
1015 |
- |
1016 |
-src_compile() { |
1017 |
- use custom-cflags || unset CFLAGS |
1018 |
- if test-flag-CC -fno-strict-overflow; then |
1019 |
- append-flags -fno-strict-overflow |
1020 |
- fi |
1021 |
- |
1022 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include |
1023 |
- |
1024 |
- if use x86; then |
1025 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
1026 |
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
1027 |
- elif use amd64; then |
1028 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
1029 |
- XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub |
1030 |
- if has_multilib_profile; then |
1031 |
- multilib_toolchain_setup x86 |
1032 |
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ |
1033 |
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
1034 |
- fi |
1035 |
- fi |
1036 |
-} |
1037 |
- |
1038 |
-src_install() { |
1039 |
- if use x86; then |
1040 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
1041 |
- fi |
1042 |
- if use amd64; then |
1043 |
- emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub |
1044 |
- if has_multilib_profile; then |
1045 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
1046 |
- fi |
1047 |
- fi |
1048 |
-} |
1049 |
- |
1050 |
-pkg_postinst() { |
1051 |
- elog "Official Xen Guide and the offical wiki page:" |
1052 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
1053 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
1054 |
-} |
1055 |
|
1056 |
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild |
1057 |
deleted file mode 100644 |
1058 |
index bf577ad..0000000 |
1059 |
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild |
1060 |
+++ /dev/null |
1061 |
@@ -1,144 +0,0 @@ |
1062 |
-# Copyright 1999-2016 Gentoo Foundation |
1063 |
-# Distributed under the terms of the GNU General Public License v2 |
1064 |
-# $Id$ |
1065 |
- |
1066 |
-EAPI=5 |
1067 |
- |
1068 |
-PYTHON_COMPAT=( python2_7 ) |
1069 |
-PYTHON_REQ_USE='xml,threads' |
1070 |
- |
1071 |
-inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs |
1072 |
- |
1073 |
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
1074 |
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
1075 |
-GRUB_URL=mirror://gnu-alpha/grub |
1076 |
-SRC_URI=" |
1077 |
- http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
1078 |
- $GRUB_URL/grub-0.97.tar.gz |
1079 |
- $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz |
1080 |
- $LIBPCI_URL/pciutils-2.2.9.tar.bz2 |
1081 |
- $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz |
1082 |
- $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz |
1083 |
- $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz" |
1084 |
- |
1085 |
-S="${WORKDIR}/xen-${PV}" |
1086 |
- |
1087 |
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" |
1088 |
-HOMEPAGE="http://xen.org/" |
1089 |
-LICENSE="GPL-2" |
1090 |
-SLOT="0" |
1091 |
-KEYWORDS="~amd64 ~x86" |
1092 |
-IUSE="custom-cflags" |
1093 |
- |
1094 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
1095 |
- |
1096 |
-DEPEND="sys-devel/gettext |
1097 |
- sys-devel/bin86 |
1098 |
- sys-apps/texinfo |
1099 |
- x11-libs/pixman" |
1100 |
- |
1101 |
-RDEPEND=">=app-emulation/xen-tools-${PV}" |
1102 |
- |
1103 |
-pkg_setup() { |
1104 |
- python-single-r1_pkg_setup |
1105 |
-} |
1106 |
- |
1107 |
-retar-externals() { |
1108 |
- # Purely to unclutter src_prepare |
1109 |
- local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" |
1110 |
- |
1111 |
- # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative |
1112 |
- sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ |
1113 |
- -i "${WORKDIR}"/zlib-1.2.3/configure |
1114 |
- sed -e 's:^AR=ar rc:AR=ar:' \ |
1115 |
- -e s':$(AR) $@:$(AR) rc $@:' \ |
1116 |
- -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} |
1117 |
- einfo "zlib Makefile edited" |
1118 |
- |
1119 |
- cd "${WORKDIR}" |
1120 |
- tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz |
1121 |
- tar czp grub-0.97 -f grub-0.97.tar.gz |
1122 |
- tar czp lwip -f lwip-1.3.0.tar.gz |
1123 |
- tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz |
1124 |
- tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz |
1125 |
- mv $set "${S}"/stubdom/ |
1126 |
- einfo "tarballs moved to source" |
1127 |
-} |
1128 |
- |
1129 |
-src_prepare() { |
1130 |
- # if the user *really* wants to use their own custom-cflags, let them |
1131 |
- if use custom-cflags; then |
1132 |
- einfo "User wants their own CFLAGS - removing defaults" |
1133 |
- # try and remove all the default custom-cflags |
1134 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
1135 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
1136 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
1137 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
1138 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
1139 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
1140 |
- -i {} \; |
1141 |
- fi |
1142 |
- |
1143 |
- # Patch the unmergeable newlib, fix most of the leftover gcc QA issues |
1144 |
- cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
1145 |
- |
1146 |
- # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
1147 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch |
1148 |
- |
1149 |
- # fix jobserver in Makefile |
1150 |
- epatch "${FILESDIR}"/${PN}-4.2-jserver.patch |
1151 |
- |
1152 |
- #Substitute for internal downloading. pciutils copied only due to the only .bz2 |
1153 |
- cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" |
1154 |
- retar-externals || die "re-tar procedure failed" |
1155 |
-} |
1156 |
- |
1157 |
-src_configure() { |
1158 |
- local myconf="--prefix=${PREFIX}/usr \ |
1159 |
- --libdir=${PREFIX}/usr/$(get_libdir) \ |
1160 |
- --libexecdir=${PREFIX}/usr/libexec \ |
1161 |
- --disable-werror \ |
1162 |
- --disable-xen" |
1163 |
- |
1164 |
- econf ${myconf} |
1165 |
-} |
1166 |
- |
1167 |
-src_compile() { |
1168 |
- use custom-cflags || unset CFLAGS |
1169 |
- if test-flag-CC -fno-strict-overflow; then |
1170 |
- append-flags -fno-strict-overflow |
1171 |
- fi |
1172 |
- |
1173 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include |
1174 |
- |
1175 |
- if use x86; then |
1176 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
1177 |
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
1178 |
- elif use amd64; then |
1179 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
1180 |
- XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub |
1181 |
- if has_multilib_profile; then |
1182 |
- multilib_toolchain_setup x86 |
1183 |
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ |
1184 |
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
1185 |
- fi |
1186 |
- fi |
1187 |
-} |
1188 |
- |
1189 |
-src_install() { |
1190 |
- if use x86; then |
1191 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
1192 |
- fi |
1193 |
- if use amd64; then |
1194 |
- emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub |
1195 |
- if has_multilib_profile; then |
1196 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
1197 |
- fi |
1198 |
- fi |
1199 |
-} |
1200 |
- |
1201 |
-pkg_postinst() { |
1202 |
- elog "Official Xen Guide and the offical wiki page:" |
1203 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
1204 |
- elog "http://wiki.xen.org/wiki/Main_Page" |
1205 |
-} |