1 |
dlan 14/07/09 06:31:29 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: xen-4.4.0-r5.ebuild xen-4.2.4-r4.ebuild |
5 |
xen-4.3.2-r4.ebuild |
6 |
Removed: xen-4.4.0-r4.ebuild xen-4.4.0-r3.ebuild |
7 |
Log: |
8 |
bump stable/security patches, fix bug 515106, 513824 |
9 |
|
10 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55) |
11 |
|
12 |
Revision Changes Path |
13 |
1.165 app-emulation/xen/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.165&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.165&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?r1=1.164&r2=1.165 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v |
22 |
retrieving revision 1.164 |
23 |
retrieving revision 1.165 |
24 |
diff -u -r1.164 -r1.165 |
25 |
--- ChangeLog 14 Jun 2014 07:14:16 -0000 1.164 |
26 |
+++ ChangeLog 9 Jul 2014 06:31:29 -0000 1.165 |
27 |
@@ -1,6 +1,15 @@ |
28 |
# ChangeLog for app-emulation/xen |
29 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.164 2014/06/14 07:14:16 dlan Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.165 2014/07/09 06:31:29 dlan Exp $ |
32 |
+ |
33 |
+*xen-4.4.0-r5 (09 Jul 2014) |
34 |
+*xen-4.3.2-r4 (09 Jul 2014) |
35 |
+*xen-4.2.4-r4 (09 Jul 2014) |
36 |
+ |
37 |
+ 09 Jul 2014; Yixun Lan <dlan@g.o> +xen-4.2.4-r4.ebuild, |
38 |
+ +xen-4.3.2-r4.ebuild, -xen-4.4.0-r3.ebuild, -xen-4.4.0-r4.ebuild, |
39 |
+ +xen-4.4.0-r5.ebuild: |
40 |
+ bump stable/security patches, fix bug 515106, 513824 |
41 |
|
42 |
*xen-4.4.0-r4 (14 Jun 2014) |
43 |
*xen-4.3.2-r3 (14 Jun 2014) |
44 |
|
45 |
|
46 |
|
47 |
1.1 app-emulation/xen/xen-4.4.0-r5.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.4.0-r5.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.4.0-r5.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: xen-4.4.0-r5.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2014 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.0-r5.ebuild,v 1.1 2014/07/09 06:31:29 dlan Exp $ |
57 |
|
58 |
EAPI=5 |
59 |
|
60 |
PYTHON_COMPAT=( python2_7 ) |
61 |
|
62 |
MY_PV=${PV/_/-} |
63 |
MY_P=${PN}-${PV/_/-} |
64 |
|
65 |
if [[ $PV == *9999 ]]; then |
66 |
KEYWORDS="" |
67 |
EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" |
68 |
live_eclass="git-2" |
69 |
else |
70 |
KEYWORDS="~amd64 ~arm -x86" |
71 |
UPSTREAM_VER=4 |
72 |
GENTOO_VER= |
73 |
|
74 |
[[ -n ${UPSTREAM_VER} ]] && \ |
75 |
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
76 |
[[ -n ${GENTOO_VER} ]] && \ |
77 |
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" |
78 |
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz |
79 |
${UPSTREAM_PATCHSET_URI} |
80 |
${GENTOO_PATCHSET_URI}" |
81 |
|
82 |
fi |
83 |
|
84 |
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} |
85 |
|
86 |
DESCRIPTION="The Xen virtual machine monitor" |
87 |
HOMEPAGE="http://xen.org/" |
88 |
LICENSE="GPL-2" |
89 |
SLOT="0" |
90 |
IUSE="custom-cflags debug efi flask xsm" |
91 |
|
92 |
DEPEND="${PYTHON_DEPS} |
93 |
efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
94 |
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )" |
95 |
RDEPEND="" |
96 |
PDEPEND="~app-emulation/xen-tools-${PV}" |
97 |
|
98 |
RESTRICT="test" |
99 |
|
100 |
# Approved by QA team in bug #144032 |
101 |
QA_WX_LOAD="boot/xen-syms-${PV}" |
102 |
|
103 |
REQUIRED_USE="flask? ( xsm ) |
104 |
arm? ( debug )" |
105 |
|
106 |
S="${WORKDIR}/${MY_P}" |
107 |
|
108 |
pkg_setup() { |
109 |
python-any-r1_pkg_setup |
110 |
if [[ -z ${XEN_TARGET_ARCH} ]]; then |
111 |
if use x86 && use amd64; then |
112 |
die "Confusion! Both x86 and amd64 are set in your use flags!" |
113 |
elif use x86; then |
114 |
export XEN_TARGET_ARCH="x86_32" |
115 |
elif use amd64; then |
116 |
export XEN_TARGET_ARCH="x86_64" |
117 |
elif use arm; then |
118 |
export XEN_TARGET_ARCH="arm32" |
119 |
else |
120 |
die "Unsupported architecture!" |
121 |
fi |
122 |
fi |
123 |
|
124 |
if use flask ; then |
125 |
export "XSM_ENABLE=y" |
126 |
export "FLASK_ENABLE=y" |
127 |
elif use xsm ; then |
128 |
export "XSM_ENABLE=y" |
129 |
fi |
130 |
} |
131 |
|
132 |
src_prepare() { |
133 |
# Upstream's patchset |
134 |
if [[ -n ${UPSTREAM_VER} ]]; then |
135 |
EPATCH_SUFFIX="patch" \ |
136 |
EPATCH_FORCE="yes" \ |
137 |
EPATCH_OPTS="-p1" \ |
138 |
epatch "${WORKDIR}"/patches-upstream |
139 |
fi |
140 |
|
141 |
# Gentoo's patchset |
142 |
if [[ -n ${GENTOO_VER} ]]; then |
143 |
EPATCH_SUFFIX="patch" \ |
144 |
EPATCH_FORCE="yes" \ |
145 |
epatch "${WORKDIR}"/patches-gentoo |
146 |
fi |
147 |
|
148 |
# Drop .config |
149 |
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
150 |
|
151 |
if use efi; then |
152 |
epatch "${FILESDIR}"/${PN}-4.4-efi.patch |
153 |
export EFI_VENDOR="gentoo" |
154 |
export EFI_MOUNTPOINT="boot" |
155 |
fi |
156 |
|
157 |
# if the user *really* wants to use their own custom-cflags, let them |
158 |
if use custom-cflags; then |
159 |
einfo "User wants their own CFLAGS - removing defaults" |
160 |
# try and remove all the default custom-cflags |
161 |
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
162 |
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
163 |
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
164 |
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
165 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
166 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
167 |
-i {} \; || die "failed to re-set custom-cflags" |
168 |
fi |
169 |
|
170 |
# remove -Werror for gcc-4.6's sake |
171 |
find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ |
172 |
xargs sed -i 's/ *-Werror */ /' |
173 |
# not strictly necessary to fix this |
174 |
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
175 |
|
176 |
epatch_user |
177 |
} |
178 |
|
179 |
src_configure() { |
180 |
use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
181 |
|
182 |
use debug && myopt="${myopt} debug=y" |
183 |
|
184 |
if use custom-cflags; then |
185 |
filter-flags -fPIE -fstack-protector |
186 |
replace-flags -O3 -O2 |
187 |
else |
188 |
unset CFLAGS |
189 |
fi |
190 |
} |
191 |
|
192 |
src_compile() { |
193 |
# Send raw LDFLAGS so that --as-needed works |
194 |
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
195 |
} |
196 |
|
197 |
src_install() { |
198 |
local myopt |
199 |
use debug && myopt="${myopt} debug=y" |
200 |
|
201 |
# The 'make install' doesn't 'mkdir -p' the subdirs |
202 |
if use efi; then |
203 |
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
204 |
fi |
205 |
|
206 |
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
207 |
} |
208 |
|
209 |
pkg_postinst() { |
210 |
elog "Official Xen Guide and the unoffical wiki page:" |
211 |
elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
212 |
elog " http://en.gentoo-wiki.com/wiki/Xen/" |
213 |
|
214 |
use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
215 |
} |
216 |
|
217 |
|
218 |
|
219 |
1.1 app-emulation/xen/xen-4.2.4-r4.ebuild |
220 |
|
221 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.4-r4.ebuild?rev=1.1&view=markup |
222 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.4-r4.ebuild?rev=1.1&content-type=text/plain |
223 |
|
224 |
Index: xen-4.2.4-r4.ebuild |
225 |
=================================================================== |
226 |
# Copyright 1999-2014 Gentoo Foundation |
227 |
# Distributed under the terms of the GNU General Public License v2 |
228 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.4-r4.ebuild,v 1.1 2014/07/09 06:31:29 dlan Exp $ |
229 |
|
230 |
EAPI=5 |
231 |
|
232 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
233 |
|
234 |
if [[ $PV == *9999 ]]; then |
235 |
KEYWORDS="" |
236 |
REPO="xen-unstable.hg" |
237 |
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
238 |
S="${WORKDIR}/${REPO}" |
239 |
live_eclass="mercurial" |
240 |
else |
241 |
KEYWORDS="~amd64 ~x86" |
242 |
UPSTREAM_VER=3 |
243 |
GENTOO_VER= |
244 |
|
245 |
[[ -n ${UPSTREAM_VER} ]] && \ |
246 |
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
247 |
[[ -n ${GENTOO_VER} ]] && \ |
248 |
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" |
249 |
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
250 |
${UPSTREAM_PATCHSET_URI} |
251 |
${GENTOO_PATCHSET_URI}" |
252 |
fi |
253 |
|
254 |
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} |
255 |
|
256 |
DESCRIPTION="The Xen virtual machine monitor" |
257 |
HOMEPAGE="http://xen.org/" |
258 |
LICENSE="GPL-2" |
259 |
SLOT="0" |
260 |
IUSE="custom-cflags debug efi flask pae xsm" |
261 |
|
262 |
DEPEND="${PYTHON_DEPS} |
263 |
efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
264 |
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )" |
265 |
RDEPEND="" |
266 |
PDEPEND="~app-emulation/xen-tools-${PV}" |
267 |
|
268 |
RESTRICT="test" |
269 |
|
270 |
# Approved by QA team in bug #144032 |
271 |
QA_WX_LOAD="boot/xen-syms-${PV}" |
272 |
|
273 |
REQUIRED_USE=" |
274 |
flask? ( xsm ) |
275 |
" |
276 |
|
277 |
pkg_setup() { |
278 |
python-any-r1_pkg_setup |
279 |
if [[ -z ${XEN_TARGET_ARCH} ]]; then |
280 |
if use x86 && use amd64; then |
281 |
die "Confusion! Both x86 and amd64 are set in your use flags!" |
282 |
elif use x86; then |
283 |
export XEN_TARGET_ARCH="x86_32" |
284 |
elif use amd64; then |
285 |
export XEN_TARGET_ARCH="x86_64" |
286 |
else |
287 |
die "Unsupported architecture!" |
288 |
fi |
289 |
fi |
290 |
|
291 |
if use flask ; then |
292 |
export "XSM_ENABLE=y" |
293 |
export "FLASK_ENABLE=y" |
294 |
elif use xsm ; then |
295 |
export "XSM_ENABLE=y" |
296 |
fi |
297 |
} |
298 |
|
299 |
src_prepare() { |
300 |
# Upstream's patchset |
301 |
if [[ -n ${UPSTREAM_VER} ]]; then |
302 |
EPATCH_SUFFIX="patch" \ |
303 |
EPATCH_FORCE="yes" \ |
304 |
EPATCH_OPTS="-p1" \ |
305 |
epatch "${WORKDIR}"/patches-upstream |
306 |
fi |
307 |
|
308 |
# Gentoo's patchset |
309 |
if [[ -n ${GENTOO_VER} ]]; then |
310 |
EPATCH_SUFFIX="patch" \ |
311 |
EPATCH_FORCE="yes" \ |
312 |
epatch "${WORKDIR}"/patches-gentoo |
313 |
fi |
314 |
|
315 |
# Drop .config and fix gcc-4.6 |
316 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch |
317 |
|
318 |
if use efi; then |
319 |
epatch "${FILESDIR}"/${PN}-4.2-efi.patch |
320 |
export EFI_VENDOR="gentoo" |
321 |
export EFI_MOUNTPOINT="boot" |
322 |
fi |
323 |
|
324 |
# if the user *really* wants to use their own custom-cflags, let them |
325 |
if use custom-cflags; then |
326 |
einfo "User wants their own CFLAGS - removing defaults" |
327 |
# try and remove all the default custom-cflags |
328 |
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
329 |
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
330 |
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
331 |
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
332 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
333 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
334 |
-i {} \; || die "failed to re-set custom-cflags" |
335 |
fi |
336 |
|
337 |
# not strictly necessary to fix this |
338 |
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
339 |
|
340 |
epatch_user |
341 |
} |
342 |
|
343 |
src_configure() { |
344 |
use debug && myopt="${myopt} debug=y" |
345 |
use pae && myopt="${myopt} pae=y" |
346 |
|
347 |
if use custom-cflags; then |
348 |
filter-flags -fPIE -fstack-protector |
349 |
replace-flags -O3 -O2 |
350 |
else |
351 |
unset CFLAGS |
352 |
fi |
353 |
} |
354 |
|
355 |
src_compile() { |
356 |
# Send raw LDFLAGS so that --as-needed works |
357 |
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
358 |
} |
359 |
|
360 |
src_install() { |
361 |
local myopt |
362 |
use debug && myopt="${myopt} debug=y" |
363 |
use pae && myopt="${myopt} pae=y" |
364 |
|
365 |
# The 'make install' doesn't 'mkdir -p' the subdirs |
366 |
if use efi; then |
367 |
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
368 |
fi |
369 |
|
370 |
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
371 |
} |
372 |
|
373 |
pkg_postinst() { |
374 |
elog "Official Xen Guide and the unoffical wiki page:" |
375 |
elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
376 |
elog " http://en.gentoo-wiki.com/wiki/Xen/" |
377 |
|
378 |
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" |
379 |
use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
380 |
} |
381 |
|
382 |
|
383 |
|
384 |
1.1 app-emulation/xen/xen-4.3.2-r4.ebuild |
385 |
|
386 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.2-r4.ebuild?rev=1.1&view=markup |
387 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.2-r4.ebuild?rev=1.1&content-type=text/plain |
388 |
|
389 |
Index: xen-4.3.2-r4.ebuild |
390 |
=================================================================== |
391 |
# Copyright 1999-2014 Gentoo Foundation |
392 |
# Distributed under the terms of the GNU General Public License v2 |
393 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.2-r4.ebuild,v 1.1 2014/07/09 06:31:29 dlan Exp $ |
394 |
|
395 |
EAPI=5 |
396 |
|
397 |
PYTHON_COMPAT=( python2_7 ) |
398 |
|
399 |
if [[ $PV == *9999 ]]; then |
400 |
KEYWORDS="" |
401 |
REPO="xen-unstable.hg" |
402 |
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
403 |
S="${WORKDIR}/${REPO}" |
404 |
live_eclass="mercurial" |
405 |
else |
406 |
# Set to match entry in stable 4.3.1-r1, Bug 493944 |
407 |
KEYWORDS="~amd64 -x86" |
408 |
UPSTREAM_VER=3 |
409 |
GENTOO_VER= |
410 |
|
411 |
[[ -n ${UPSTREAM_VER} ]] && \ |
412 |
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
413 |
[[ -n ${GENTOO_VER} ]] && \ |
414 |
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" |
415 |
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
416 |
${UPSTREAM_PATCHSET_URI} |
417 |
${GENTOO_PATCHSET_URI}" |
418 |
fi |
419 |
|
420 |
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} |
421 |
|
422 |
DESCRIPTION="The Xen virtual machine monitor" |
423 |
HOMEPAGE="http://xen.org/" |
424 |
LICENSE="GPL-2" |
425 |
SLOT="0" |
426 |
IUSE="custom-cflags debug efi flask xsm" |
427 |
|
428 |
DEPEND="${PYTHON_DEPS} |
429 |
efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
430 |
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )" |
431 |
RDEPEND="" |
432 |
PDEPEND="~app-emulation/xen-tools-${PV}" |
433 |
|
434 |
RESTRICT="test" |
435 |
|
436 |
# Approved by QA team in bug #144032 |
437 |
QA_WX_LOAD="boot/xen-syms-${PV}" |
438 |
|
439 |
REQUIRED_USE="flask? ( xsm )" |
440 |
|
441 |
pkg_setup() { |
442 |
python-any-r1_pkg_setup |
443 |
if [[ -z ${XEN_TARGET_ARCH} ]]; then |
444 |
if use x86 && use amd64; then |
445 |
die "Confusion! Both x86 and amd64 are set in your use flags!" |
446 |
elif use x86; then |
447 |
export XEN_TARGET_ARCH="x86_32" |
448 |
elif use amd64; then |
449 |
export XEN_TARGET_ARCH="x86_64" |
450 |
else |
451 |
die "Unsupported architecture!" |
452 |
fi |
453 |
fi |
454 |
|
455 |
if use flask ; then |
456 |
export "XSM_ENABLE=y" |
457 |
export "FLASK_ENABLE=y" |
458 |
elif use xsm ; then |
459 |
export "XSM_ENABLE=y" |
460 |
fi |
461 |
} |
462 |
|
463 |
src_prepare() { |
464 |
# Upstream's patchset |
465 |
if [[ -n ${UPSTREAM_VER} ]]; then |
466 |
EPATCH_SUFFIX="patch" \ |
467 |
EPATCH_FORCE="yes" \ |
468 |
EPATCH_OPTS="-p1" \ |
469 |
epatch "${WORKDIR}"/patches-upstream |
470 |
fi |
471 |
|
472 |
# Gentoo's patchset |
473 |
if [[ -n ${GENTOO_VER} ]]; then |
474 |
EPATCH_SUFFIX="patch" \ |
475 |
EPATCH_FORCE="yes" \ |
476 |
epatch "${WORKDIR}"/patches-gentoo |
477 |
fi |
478 |
|
479 |
# Drop .config and fix gcc-4.6 |
480 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch |
481 |
|
482 |
if use efi; then |
483 |
epatch "${FILESDIR}"/${PN}-4.2-efi.patch |
484 |
export EFI_VENDOR="gentoo" |
485 |
export EFI_MOUNTPOINT="boot" |
486 |
fi |
487 |
|
488 |
# if the user *really* wants to use their own custom-cflags, let them |
489 |
if use custom-cflags; then |
490 |
einfo "User wants their own CFLAGS - removing defaults" |
491 |
# try and remove all the default custom-cflags |
492 |
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
493 |
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
494 |
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
495 |
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
496 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
497 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
498 |
-i {} \; || die "failed to re-set custom-cflags" |
499 |
fi |
500 |
|
501 |
# not strictly necessary to fix this |
502 |
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
503 |
|
504 |
epatch_user |
505 |
} |
506 |
|
507 |
src_configure() { |
508 |
use debug && myopt="${myopt} debug=y" |
509 |
|
510 |
if use custom-cflags; then |
511 |
filter-flags -fPIE -fstack-protector |
512 |
replace-flags -O3 -O2 |
513 |
else |
514 |
unset CFLAGS |
515 |
fi |
516 |
} |
517 |
|
518 |
src_compile() { |
519 |
# Send raw LDFLAGS so that --as-needed works |
520 |
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
521 |
} |
522 |
|
523 |
src_install() { |
524 |
local myopt |
525 |
use debug && myopt="${myopt} debug=y" |
526 |
|
527 |
# The 'make install' doesn't 'mkdir -p' the subdirs |
528 |
if use efi; then |
529 |
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
530 |
fi |
531 |
|
532 |
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
533 |
} |
534 |
|
535 |
pkg_postinst() { |
536 |
elog "Official Xen Guide and the unoffical wiki page:" |
537 |
elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
538 |
elog " http://en.gentoo-wiki.com/wiki/Xen/" |
539 |
|
540 |
use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
541 |
} |