1 |
commit: 422aa56ab472862231cfc31d6da4ad1a3840ce95 |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 21 05:30:47 2017 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 22 01:45:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422aa56a |
7 |
|
8 |
app-emulation/xen: drop old vulnerable versions |
9 |
|
10 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
11 |
|
12 |
app-emulation/xen/Manifest | 6 -- |
13 |
app-emulation/xen/xen-4.7.2-r1.ebuild | 192 ---------------------------------- |
14 |
app-emulation/xen/xen-4.7.3.ebuild | 192 ---------------------------------- |
15 |
app-emulation/xen/xen-4.8.2-r1.ebuild | 184 -------------------------------- |
16 |
app-emulation/xen/xen-4.8.2.ebuild | 192 ---------------------------------- |
17 |
5 files changed, 766 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest |
20 |
index 63726379fae..87f9e84c79f 100644 |
21 |
--- a/app-emulation/xen/Manifest |
22 |
+++ b/app-emulation/xen/Manifest |
23 |
@@ -1,8 +1,2 @@ |
24 |
-DIST xen-4.7.2-upstream-patches-0.tar.xz 45944 SHA256 e7783bc9adc939167eaef91e96fda506d2d52815f709b31952229891357e6b67 SHA512 6d4e23fb5a63fd191f893e31194b6397a394956846f356ae0119c656a92e7e22296e728286a98109b64a5736241b2317969f54915e7b487b4d7a64aae534614c WHIRLPOOL e185ce40085559d00a302eae8814b4c013817a5e4c0a2a9c56a6b4983b38e7103e44d0407fa78ea79fdbe8eefde346b994812851d8b4bad0bf08cb5721507c37 |
25 |
-DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da34603fc07b91cfebf358d5 SHA512 8f447e7feffec81fea5b5a4098968b8b8cebc6989e7b6a845413317644d5d328d6f12181d09266366200878ab6a29ab34c7235c1af7b55463a3fdaea40ee1500 WHIRLPOOL 27f3fd88846724e03bf9bb53133046cb79139950c9162dd9c9a85798e169259f73dc2fe4212e750ce9a8fd1d0abd99f1f76108faceb7bf1934ce0495377ee756 |
26 |
-DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62 |
27 |
-DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808 |
28 |
-DIST xen-4.8.2-upstream-patches-1.tar.xz 29608 SHA256 7b1833eede01b7c8ae607614afd35c66ff009518cca972e2653d5828fb632aa6 SHA512 3ea002c37a0e2189f1846548a4aa607c42041cf093ec9a57509692dabe5c0b718151d183f5714443403d5cf8d4ab010a8f3893207bebf81cb85793282c30b457 WHIRLPOOL 0659a56e419918cb091ff0d87bf69a03464d2a0a0b4c6bad87521e83c40b48e210582d5fab2d9686b22b4ba839041be6e8aa39ab306a86ce18461d99c36be439 |
29 |
DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35 |
30 |
DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d |
31 |
-DIST xen-security-patches-26.tar.xz 8276 SHA256 2a21ec429f8952875f7d95f24697600e606326f1a16d5622cee73628cd0401c1 SHA512 f54fc7e720a70258263d29cc482b8269386818ad75792de87b0d0357fdb6af81f2102e5983100db47563435fa28f875a84e8c6d73d44797aadaf0c469d9fb0ec WHIRLPOOL b31667d8415dc1fbcd60160fdbc2fe0ad4de9bd2171fda875f5585b8d7821c4c035b029dbf382abacf4b6be745aeeb708f419fdcabdd86f78ff1c13703802e3f |
32 |
|
33 |
diff --git a/app-emulation/xen/xen-4.7.2-r1.ebuild b/app-emulation/xen/xen-4.7.2-r1.ebuild |
34 |
deleted file mode 100644 |
35 |
index ae2733f7496..00000000000 |
36 |
--- a/app-emulation/xen/xen-4.7.2-r1.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,192 +0,0 @@ |
39 |
-# Copyright 1999-2017 Gentoo Foundation |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=5 |
43 |
- |
44 |
-PYTHON_COMPAT=( python2_7 ) |
45 |
- |
46 |
-inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs |
47 |
- |
48 |
-MY_PV=${PV/_/-} |
49 |
-MY_P=${PN}-${PV/_/-} |
50 |
- |
51 |
-if [[ $PV == *9999 ]]; then |
52 |
- inherit git-r3 |
53 |
- KEYWORDS="amd64 x86" |
54 |
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
55 |
- SRC_URI="" |
56 |
-else |
57 |
- KEYWORDS="amd64 ~arm x86" |
58 |
- UPSTREAM_VER=0 |
59 |
- SECURITY_VER=26 |
60 |
- GENTOO_VER= |
61 |
- |
62 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
63 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
64 |
- [[ -n ${SECURITY_VER} ]] && \ |
65 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
66 |
- [[ -n ${GENTOO_VER} ]] && \ |
67 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
68 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz |
69 |
- ${UPSTREAM_PATCHSET_URI} |
70 |
- ${SECURITY_PATCHSET_URI} |
71 |
- ${GENTOO_PATCHSET_URI}" |
72 |
-fi |
73 |
- |
74 |
-DESCRIPTION="The Xen virtual machine monitor" |
75 |
-HOMEPAGE="http://xen.org/" |
76 |
-LICENSE="GPL-2" |
77 |
-SLOT="0" |
78 |
-IUSE="custom-cflags debug efi flask" |
79 |
- |
80 |
-DEPEND="${PYTHON_DEPS} |
81 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
82 |
- !efi? ( >=sys-devel/binutils-2.22 )" |
83 |
-RDEPEND="" |
84 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
85 |
- |
86 |
-# no tests are available for the hypervisor |
87 |
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
88 |
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
89 |
-RESTRICT="test splitdebug strip" |
90 |
- |
91 |
-# Approved by QA team in bug #144032 |
92 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
93 |
- |
94 |
-REQUIRED_USE="arm? ( debug )" |
95 |
- |
96 |
-S="${WORKDIR}/${MY_P}" |
97 |
- |
98 |
-pkg_setup() { |
99 |
- python-any-r1_pkg_setup |
100 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
101 |
- if use amd64; then |
102 |
- export XEN_TARGET_ARCH="x86_64" |
103 |
- elif use arm; then |
104 |
- export XEN_TARGET_ARCH="arm32" |
105 |
- elif use arm64; then |
106 |
- export XEN_TARGET_ARCH="arm64" |
107 |
- else |
108 |
- die "Unsupported architecture!" |
109 |
- fi |
110 |
- fi |
111 |
- |
112 |
- if use flask ; then |
113 |
- export "XSM_ENABLE=y" |
114 |
- export "FLASK_ENABLE=y" |
115 |
- fi |
116 |
-} |
117 |
- |
118 |
-src_prepare() { |
119 |
- # Upstream's patchset |
120 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
121 |
- EPATCH_SUFFIX="patch" \ |
122 |
- EPATCH_FORCE="yes" \ |
123 |
- EPATCH_OPTS="-p1" \ |
124 |
- epatch "${WORKDIR}"/patches-upstream |
125 |
- fi |
126 |
- |
127 |
- # Security patchset |
128 |
- if [[ -n ${SECURITY_VER} ]]; then |
129 |
- einfo "Try to apply Xen Security patch set" |
130 |
- # apply main xen patches |
131 |
- # Two parallel systems, both work side by side |
132 |
- # Over time they may concdense into one. This will suffice for now |
133 |
- EPATCH_SUFFIX="patch" |
134 |
- EPATCH_FORCE="yes" |
135 |
- |
136 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
137 |
- |
138 |
- for i in ${XEN_SECURITY_MAIN}; do |
139 |
- epatch "${WORKDIR}"/patches-security/xen/$i |
140 |
- done |
141 |
- fi |
142 |
- |
143 |
- # Gentoo's patchset |
144 |
- if [[ -n ${GENTOO_VER} ]]; then |
145 |
- EPATCH_SUFFIX="patch" \ |
146 |
- EPATCH_FORCE="yes" \ |
147 |
- epatch "${WORKDIR}"/patches-gentoo |
148 |
- fi |
149 |
- |
150 |
- epatch "${FILESDIR}"/${PN}-4.6-efi.patch |
151 |
- |
152 |
- # Drop .config |
153 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
154 |
- |
155 |
- if use efi; then |
156 |
- export EFI_VENDOR="gentoo" |
157 |
- export EFI_MOUNTPOINT="boot" |
158 |
- fi |
159 |
- |
160 |
- # if the user *really* wants to use their own custom-cflags, let them |
161 |
- if use custom-cflags; then |
162 |
- einfo "User wants their own CFLAGS - removing defaults" |
163 |
- # try and remove all the default custom-cflags |
164 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
165 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
166 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
167 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
168 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
169 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
170 |
- -i {} \; || die "failed to re-set custom-cflags" |
171 |
- fi |
172 |
- |
173 |
- # remove -Werror for gcc-4.6's sake |
174 |
- find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ |
175 |
- xargs sed -i 's/ *-Werror */ /' |
176 |
- # not strictly necessary to fix this |
177 |
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
178 |
- |
179 |
- # Bug #575868 converted to a sed statement, typo of one char |
180 |
- sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die |
181 |
- |
182 |
- epatch_user |
183 |
-} |
184 |
- |
185 |
-src_configure() { |
186 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
187 |
- |
188 |
- use debug && myopt="${myopt} debug=y" |
189 |
- |
190 |
- if use custom-cflags; then |
191 |
- filter-flags -fPIE -fstack-protector |
192 |
- replace-flags -O3 -O2 |
193 |
- else |
194 |
- unset CFLAGS |
195 |
- unset LDFLAGS |
196 |
- unset ASFLAGS |
197 |
- fi |
198 |
-} |
199 |
- |
200 |
-src_compile() { |
201 |
- # Send raw LDFLAGS so that --as-needed works |
202 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
203 |
-} |
204 |
- |
205 |
-src_install() { |
206 |
- local myopt |
207 |
- use debug && myopt="${myopt} debug=y" |
208 |
- |
209 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
210 |
- if use efi; then |
211 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
212 |
- fi |
213 |
- |
214 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
215 |
- |
216 |
- # make install likes to throw in some extra EFI bits if it built |
217 |
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
218 |
-} |
219 |
- |
220 |
-pkg_postinst() { |
221 |
- elog "Official Xen Guide and the unoffical wiki page:" |
222 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
223 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
224 |
- |
225 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
226 |
- |
227 |
- elog "You can optionally block the installation of /boot/xen-syms by an entry" |
228 |
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
229 |
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
230 |
-} |
231 |
|
232 |
diff --git a/app-emulation/xen/xen-4.7.3.ebuild b/app-emulation/xen/xen-4.7.3.ebuild |
233 |
deleted file mode 100644 |
234 |
index c9c4f37aa17..00000000000 |
235 |
--- a/app-emulation/xen/xen-4.7.3.ebuild |
236 |
+++ /dev/null |
237 |
@@ -1,192 +0,0 @@ |
238 |
-# Copyright 1999-2017 Gentoo Foundation |
239 |
-# Distributed under the terms of the GNU General Public License v2 |
240 |
- |
241 |
-EAPI=5 |
242 |
- |
243 |
-PYTHON_COMPAT=( python2_7 ) |
244 |
- |
245 |
-inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs |
246 |
- |
247 |
-MY_PV=${PV/_/-} |
248 |
-MY_P=${PN}-${PV/_/-} |
249 |
- |
250 |
-if [[ $PV == *9999 ]]; then |
251 |
- inherit git-r3 |
252 |
- KEYWORDS="amd64 x86" |
253 |
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
254 |
- SRC_URI="" |
255 |
-else |
256 |
- KEYWORDS="amd64 ~arm ~x86" |
257 |
- UPSTREAM_VER= |
258 |
- SECURITY_VER= |
259 |
- GENTOO_VER= |
260 |
- |
261 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
262 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
263 |
- [[ -n ${SECURITY_VER} ]] && \ |
264 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
265 |
- [[ -n ${GENTOO_VER} ]] && \ |
266 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
267 |
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz |
268 |
- ${UPSTREAM_PATCHSET_URI} |
269 |
- ${SECURITY_PATCHSET_URI} |
270 |
- ${GENTOO_PATCHSET_URI}" |
271 |
-fi |
272 |
- |
273 |
-DESCRIPTION="The Xen virtual machine monitor" |
274 |
-HOMEPAGE="http://xen.org/" |
275 |
-LICENSE="GPL-2" |
276 |
-SLOT="0" |
277 |
-IUSE="custom-cflags debug efi flask" |
278 |
- |
279 |
-DEPEND="${PYTHON_DEPS} |
280 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
281 |
- !efi? ( >=sys-devel/binutils-2.22 )" |
282 |
-RDEPEND="" |
283 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
284 |
- |
285 |
-# no tests are available for the hypervisor |
286 |
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
287 |
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
288 |
-RESTRICT="test splitdebug strip" |
289 |
- |
290 |
-# Approved by QA team in bug #144032 |
291 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
292 |
- |
293 |
-REQUIRED_USE="arm? ( debug )" |
294 |
- |
295 |
-S="${WORKDIR}/${MY_P}" |
296 |
- |
297 |
-pkg_setup() { |
298 |
- python-any-r1_pkg_setup |
299 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
300 |
- if use amd64; then |
301 |
- export XEN_TARGET_ARCH="x86_64" |
302 |
- elif use arm; then |
303 |
- export XEN_TARGET_ARCH="arm32" |
304 |
- elif use arm64; then |
305 |
- export XEN_TARGET_ARCH="arm64" |
306 |
- else |
307 |
- die "Unsupported architecture!" |
308 |
- fi |
309 |
- fi |
310 |
- |
311 |
- if use flask ; then |
312 |
- export "XSM_ENABLE=y" |
313 |
- export "FLASK_ENABLE=y" |
314 |
- fi |
315 |
-} |
316 |
- |
317 |
-src_prepare() { |
318 |
- # Upstream's patchset |
319 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
320 |
- EPATCH_SUFFIX="patch" \ |
321 |
- EPATCH_FORCE="yes" \ |
322 |
- EPATCH_OPTS="-p1" \ |
323 |
- epatch "${WORKDIR}"/patches-upstream |
324 |
- fi |
325 |
- |
326 |
- # Security patchset |
327 |
- if [[ -n ${SECURITY_VER} ]]; then |
328 |
- einfo "Try to apply Xen Security patch set" |
329 |
- # apply main xen patches |
330 |
- # Two parallel systems, both work side by side |
331 |
- # Over time they may concdense into one. This will suffice for now |
332 |
- EPATCH_SUFFIX="patch" |
333 |
- EPATCH_FORCE="yes" |
334 |
- |
335 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
336 |
- |
337 |
- for i in ${XEN_SECURITY_MAIN}; do |
338 |
- epatch "${WORKDIR}"/patches-security/xen/$i |
339 |
- done |
340 |
- fi |
341 |
- |
342 |
- # Gentoo's patchset |
343 |
- if [[ -n ${GENTOO_VER} ]]; then |
344 |
- EPATCH_SUFFIX="patch" \ |
345 |
- EPATCH_FORCE="yes" \ |
346 |
- epatch "${WORKDIR}"/patches-gentoo |
347 |
- fi |
348 |
- |
349 |
- epatch "${FILESDIR}"/${PN}-4.6-efi.patch |
350 |
- |
351 |
- # Drop .config |
352 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
353 |
- |
354 |
- if use efi; then |
355 |
- export EFI_VENDOR="gentoo" |
356 |
- export EFI_MOUNTPOINT="boot" |
357 |
- fi |
358 |
- |
359 |
- # if the user *really* wants to use their own custom-cflags, let them |
360 |
- if use custom-cflags; then |
361 |
- einfo "User wants their own CFLAGS - removing defaults" |
362 |
- # try and remove all the default custom-cflags |
363 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
364 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
365 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
366 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
367 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
368 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
369 |
- -i {} \; || die "failed to re-set custom-cflags" |
370 |
- fi |
371 |
- |
372 |
- # remove -Werror for gcc-4.6's sake |
373 |
- find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ |
374 |
- xargs sed -i 's/ *-Werror */ /' |
375 |
- # not strictly necessary to fix this |
376 |
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
377 |
- |
378 |
- # Bug #575868 converted to a sed statement, typo of one char |
379 |
- sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die |
380 |
- |
381 |
- epatch_user |
382 |
-} |
383 |
- |
384 |
-src_configure() { |
385 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
386 |
- |
387 |
- use debug && myopt="${myopt} debug=y" |
388 |
- |
389 |
- if use custom-cflags; then |
390 |
- filter-flags -fPIE -fstack-protector |
391 |
- replace-flags -O3 -O2 |
392 |
- else |
393 |
- unset CFLAGS |
394 |
- unset LDFLAGS |
395 |
- unset ASFLAGS |
396 |
- fi |
397 |
-} |
398 |
- |
399 |
-src_compile() { |
400 |
- # Send raw LDFLAGS so that --as-needed works |
401 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
402 |
-} |
403 |
- |
404 |
-src_install() { |
405 |
- local myopt |
406 |
- use debug && myopt="${myopt} debug=y" |
407 |
- |
408 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
409 |
- if use efi; then |
410 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
411 |
- fi |
412 |
- |
413 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
414 |
- |
415 |
- # make install likes to throw in some extra EFI bits if it built |
416 |
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
417 |
-} |
418 |
- |
419 |
-pkg_postinst() { |
420 |
- elog "Official Xen Guide and the unoffical wiki page:" |
421 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
422 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
423 |
- |
424 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
425 |
- |
426 |
- elog "You can optionally block the installation of /boot/xen-syms by an entry" |
427 |
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
428 |
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
429 |
-} |
430 |
|
431 |
diff --git a/app-emulation/xen/xen-4.8.2-r1.ebuild b/app-emulation/xen/xen-4.8.2-r1.ebuild |
432 |
deleted file mode 100644 |
433 |
index fe53cdc6271..00000000000 |
434 |
--- a/app-emulation/xen/xen-4.8.2-r1.ebuild |
435 |
+++ /dev/null |
436 |
@@ -1,184 +0,0 @@ |
437 |
-# Copyright 1999-2017 Gentoo Foundation |
438 |
-# Distributed under the terms of the GNU General Public License v2 |
439 |
- |
440 |
-EAPI=6 |
441 |
- |
442 |
-PYTHON_COMPAT=( python2_7 ) |
443 |
- |
444 |
-inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs |
445 |
- |
446 |
-MY_PV=${PV/_/-} |
447 |
-MY_P=${PN}-${MY_PV} |
448 |
- |
449 |
-if [[ $PV == *9999 ]]; then |
450 |
- inherit git-r3 |
451 |
- KEYWORDS="amd64" |
452 |
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
453 |
- SRC_URI="" |
454 |
-else |
455 |
- KEYWORDS="amd64 ~arm -x86" |
456 |
- UPSTREAM_VER=1 |
457 |
- SECURITY_VER= |
458 |
- GENTOO_VER= |
459 |
- |
460 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
461 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
462 |
- [[ -n ${SECURITY_VER} ]] && \ |
463 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
464 |
- [[ -n ${GENTOO_VER} ]] && \ |
465 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
466 |
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz |
467 |
- ${UPSTREAM_PATCHSET_URI} |
468 |
- ${SECURITY_PATCHSET_URI} |
469 |
- ${GENTOO_PATCHSET_URI}" |
470 |
-fi |
471 |
- |
472 |
-DESCRIPTION="The Xen virtual machine monitor" |
473 |
-HOMEPAGE="http://xen.org/" |
474 |
-HOMEPAGE="https://www.xenproject.org" |
475 |
-LICENSE="GPL-2" |
476 |
-SLOT="0" |
477 |
-IUSE="custom-cflags debug efi flask" |
478 |
- |
479 |
-DEPEND="${PYTHON_DEPS} |
480 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
481 |
- !efi? ( >=sys-devel/binutils-2.22 )" |
482 |
-RDEPEND="" |
483 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
484 |
- |
485 |
-# no tests are available for the hypervisor |
486 |
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
487 |
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
488 |
-RESTRICT="test splitdebug strip" |
489 |
- |
490 |
-# Approved by QA team in bug #144032 |
491 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
492 |
- |
493 |
-REQUIRED_USE="arm? ( debug )" |
494 |
- |
495 |
-S="${WORKDIR}/${MY_P}" |
496 |
- |
497 |
-pkg_setup() { |
498 |
- python-any-r1_pkg_setup |
499 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
500 |
- if use amd64; then |
501 |
- export XEN_TARGET_ARCH="x86_64" |
502 |
- elif use arm; then |
503 |
- export XEN_TARGET_ARCH="arm32" |
504 |
- elif use arm64; then |
505 |
- export XEN_TARGET_ARCH="arm64" |
506 |
- else |
507 |
- die "Unsupported architecture!" |
508 |
- fi |
509 |
- fi |
510 |
- |
511 |
- if use flask ; then |
512 |
- export "XSM_ENABLE=y" |
513 |
- export "FLASK_ENABLE=y" |
514 |
- fi |
515 |
-} |
516 |
- |
517 |
-src_prepare() { |
518 |
- # Upstream's patchset |
519 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
520 |
- EPATCH_SUFFIX="patch" \ |
521 |
- EPATCH_FORCE="yes" \ |
522 |
- EPATCH_OPTS="-p1" \ |
523 |
- epatch "${WORKDIR}"/patches-upstream |
524 |
- fi |
525 |
- |
526 |
- # Security patchset |
527 |
- if [[ -n ${SECURITY_VER} ]]; then |
528 |
- einfo "Try to apply Xen Security patch set" |
529 |
- # apply main xen patches |
530 |
- # Two parallel systems, both work side by side |
531 |
- # Over time they may concdense into one. This will suffice for now |
532 |
- EPATCH_SUFFIX="patch" |
533 |
- EPATCH_FORCE="yes" |
534 |
- |
535 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
536 |
- |
537 |
- local i |
538 |
- for i in ${XEN_SECURITY_MAIN}; do |
539 |
- epatch "${WORKDIR}"/patches-security/xen/$i |
540 |
- done |
541 |
- fi |
542 |
- |
543 |
- # Gentoo's patchset |
544 |
- if [[ -n ${GENTOO_VER} ]]; then |
545 |
- EPATCH_SUFFIX="patch" \ |
546 |
- EPATCH_FORCE="yes" \ |
547 |
- epatch "${WORKDIR}"/patches-gentoo |
548 |
- fi |
549 |
- |
550 |
- epatch "${FILESDIR}"/${PN}-4.6-efi.patch |
551 |
- |
552 |
- # Drop .config |
553 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
554 |
- |
555 |
- if use efi; then |
556 |
- export EFI_VENDOR="gentoo" |
557 |
- export EFI_MOUNTPOINT="boot" |
558 |
- fi |
559 |
- |
560 |
- # if the user *really* wants to use their own custom-cflags, let them |
561 |
- if use custom-cflags; then |
562 |
- einfo "User wants their own CFLAGS - removing defaults" |
563 |
- # try and remove all the default custom-cflags |
564 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
565 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
566 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
567 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
568 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
569 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
570 |
- -i {} \; || die "failed to re-set custom-cflags" |
571 |
- fi |
572 |
- |
573 |
- default |
574 |
-} |
575 |
- |
576 |
-src_configure() { |
577 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
578 |
- |
579 |
- use debug && myopt="${myopt} debug=y" |
580 |
- |
581 |
- if use custom-cflags; then |
582 |
- filter-flags -fPIE -fstack-protector |
583 |
- replace-flags -O3 -O2 |
584 |
- else |
585 |
- unset CFLAGS |
586 |
- unset LDFLAGS |
587 |
- unset ASFLAGS |
588 |
- fi |
589 |
-} |
590 |
- |
591 |
-src_compile() { |
592 |
- # Send raw LDFLAGS so that --as-needed works |
593 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
594 |
-} |
595 |
- |
596 |
-src_install() { |
597 |
- local myopt |
598 |
- use debug && myopt="${myopt} debug=y" |
599 |
- |
600 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
601 |
- if use efi; then |
602 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
603 |
- fi |
604 |
- |
605 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
606 |
- |
607 |
- # make install likes to throw in some extra EFI bits if it built |
608 |
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
609 |
-} |
610 |
- |
611 |
-pkg_postinst() { |
612 |
- elog "Official Xen Guide:" |
613 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
614 |
- |
615 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
616 |
- |
617 |
- elog "You can optionally block the installation of /boot/xen-syms by an entry" |
618 |
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
619 |
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
620 |
-} |
621 |
|
622 |
diff --git a/app-emulation/xen/xen-4.8.2.ebuild b/app-emulation/xen/xen-4.8.2.ebuild |
623 |
deleted file mode 100644 |
624 |
index 924c8cb2fb9..00000000000 |
625 |
--- a/app-emulation/xen/xen-4.8.2.ebuild |
626 |
+++ /dev/null |
627 |
@@ -1,192 +0,0 @@ |
628 |
-# Copyright 1999-2017 Gentoo Foundation |
629 |
-# Distributed under the terms of the GNU General Public License v2 |
630 |
- |
631 |
-EAPI=5 |
632 |
- |
633 |
-PYTHON_COMPAT=( python2_7 ) |
634 |
- |
635 |
-inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs |
636 |
- |
637 |
-MY_PV=${PV/_/-} |
638 |
-MY_P=${PN}-${PV/_/-} |
639 |
- |
640 |
-if [[ $PV == *9999 ]]; then |
641 |
- inherit git-r3 |
642 |
- KEYWORDS="" |
643 |
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
644 |
- SRC_URI="" |
645 |
-else |
646 |
- KEYWORDS="~amd64 ~arm -x86" |
647 |
- UPSTREAM_VER=0 |
648 |
- SECURITY_VER= |
649 |
- GENTOO_VER= |
650 |
- |
651 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
652 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
653 |
- [[ -n ${SECURITY_VER} ]] && \ |
654 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
655 |
- [[ -n ${GENTOO_VER} ]] && \ |
656 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
657 |
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz |
658 |
- ${UPSTREAM_PATCHSET_URI} |
659 |
- ${SECURITY_PATCHSET_URI} |
660 |
- ${GENTOO_PATCHSET_URI}" |
661 |
-fi |
662 |
- |
663 |
-DESCRIPTION="The Xen virtual machine monitor" |
664 |
-HOMEPAGE="http://xen.org/" |
665 |
-LICENSE="GPL-2" |
666 |
-SLOT="0" |
667 |
-IUSE="custom-cflags debug efi flask" |
668 |
- |
669 |
-DEPEND="${PYTHON_DEPS} |
670 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
671 |
- !efi? ( >=sys-devel/binutils-2.22 )" |
672 |
-RDEPEND="" |
673 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
674 |
- |
675 |
-# no tests are available for the hypervisor |
676 |
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
677 |
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
678 |
-RESTRICT="test splitdebug strip" |
679 |
- |
680 |
-# Approved by QA team in bug #144032 |
681 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
682 |
- |
683 |
-REQUIRED_USE="arm? ( debug )" |
684 |
- |
685 |
-S="${WORKDIR}/${MY_P}" |
686 |
- |
687 |
-pkg_setup() { |
688 |
- python-any-r1_pkg_setup |
689 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
690 |
- if use amd64; then |
691 |
- export XEN_TARGET_ARCH="x86_64" |
692 |
- elif use arm; then |
693 |
- export XEN_TARGET_ARCH="arm32" |
694 |
- elif use arm64; then |
695 |
- export XEN_TARGET_ARCH="arm64" |
696 |
- else |
697 |
- die "Unsupported architecture!" |
698 |
- fi |
699 |
- fi |
700 |
- |
701 |
- if use flask ; then |
702 |
- export "XSM_ENABLE=y" |
703 |
- export "FLASK_ENABLE=y" |
704 |
- fi |
705 |
-} |
706 |
- |
707 |
-src_prepare() { |
708 |
- # Upstream's patchset |
709 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
710 |
- EPATCH_SUFFIX="patch" \ |
711 |
- EPATCH_FORCE="yes" \ |
712 |
- EPATCH_OPTS="-p1" \ |
713 |
- epatch "${WORKDIR}"/patches-upstream |
714 |
- fi |
715 |
- |
716 |
- # Security patchset |
717 |
- if [[ -n ${SECURITY_VER} ]]; then |
718 |
- einfo "Try to apply Xen Security patch set" |
719 |
- # apply main xen patches |
720 |
- # Two parallel systems, both work side by side |
721 |
- # Over time they may concdense into one. This will suffice for now |
722 |
- EPATCH_SUFFIX="patch" |
723 |
- EPATCH_FORCE="yes" |
724 |
- |
725 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
726 |
- |
727 |
- for i in ${XEN_SECURITY_MAIN}; do |
728 |
- epatch "${WORKDIR}"/patches-security/xen/$i |
729 |
- done |
730 |
- fi |
731 |
- |
732 |
- # Gentoo's patchset |
733 |
- if [[ -n ${GENTOO_VER} ]]; then |
734 |
- EPATCH_SUFFIX="patch" \ |
735 |
- EPATCH_FORCE="yes" \ |
736 |
- epatch "${WORKDIR}"/patches-gentoo |
737 |
- fi |
738 |
- |
739 |
- epatch "${FILESDIR}"/${PN}-4.6-efi.patch |
740 |
- |
741 |
- # Drop .config |
742 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
743 |
- |
744 |
- if use efi; then |
745 |
- export EFI_VENDOR="gentoo" |
746 |
- export EFI_MOUNTPOINT="boot" |
747 |
- fi |
748 |
- |
749 |
- # if the user *really* wants to use their own custom-cflags, let them |
750 |
- if use custom-cflags; then |
751 |
- einfo "User wants their own CFLAGS - removing defaults" |
752 |
- # try and remove all the default custom-cflags |
753 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
754 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
755 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
756 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
757 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
758 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
759 |
- -i {} \; || die "failed to re-set custom-cflags" |
760 |
- fi |
761 |
- |
762 |
- # remove -Werror for gcc-4.6's sake |
763 |
- find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ |
764 |
- xargs sed -i 's/ *-Werror */ /' |
765 |
- # not strictly necessary to fix this |
766 |
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
767 |
- |
768 |
- # Bug #575868 converted to a sed statement, typo of one char |
769 |
- sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die |
770 |
- |
771 |
- epatch_user |
772 |
-} |
773 |
- |
774 |
-src_configure() { |
775 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
776 |
- |
777 |
- use debug && myopt="${myopt} debug=y" |
778 |
- |
779 |
- if use custom-cflags; then |
780 |
- filter-flags -fPIE -fstack-protector |
781 |
- replace-flags -O3 -O2 |
782 |
- else |
783 |
- unset CFLAGS |
784 |
- unset LDFLAGS |
785 |
- unset ASFLAGS |
786 |
- fi |
787 |
-} |
788 |
- |
789 |
-src_compile() { |
790 |
- # Send raw LDFLAGS so that --as-needed works |
791 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
792 |
-} |
793 |
- |
794 |
-src_install() { |
795 |
- local myopt |
796 |
- use debug && myopt="${myopt} debug=y" |
797 |
- |
798 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
799 |
- if use efi; then |
800 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
801 |
- fi |
802 |
- |
803 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
804 |
- |
805 |
- # make install likes to throw in some extra EFI bits if it built |
806 |
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
807 |
-} |
808 |
- |
809 |
-pkg_postinst() { |
810 |
- elog "Official Xen Guide and the unoffical wiki page:" |
811 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
812 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
813 |
- |
814 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
815 |
- |
816 |
- elog "You can optionally block the installation of /boot/xen-syms by an entry" |
817 |
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
818 |
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
819 |
-} |