Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/
Date: Sat, 30 Sep 2017 05:40:15
Message-Id: 1506749666.e222908c103c394961e514bfbd2be8103881ffc5.dlan@gentoo
1 commit: e222908c103c394961e514bfbd2be8103881ffc5
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 30 04:46:45 2017 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 30 05:34:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e222908c
7
8 app-emulation/xen: drop old 4.8.1
9
10 Package-Manager: Portage-2.3.10, Repoman-2.3.3
11
12 app-emulation/xen/Manifest | 4 -
13 app-emulation/xen/xen-4.8.1-r1.ebuild | 192 ----------------------------------
14 app-emulation/xen/xen-4.8.1-r2.ebuild | 192 ----------------------------------
15 app-emulation/xen/xen-4.8.1-r3.ebuild | 192 ----------------------------------
16 4 files changed, 580 deletions(-)
17
18 diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
19 index ef3bfb5280e..4932165eca0 100644
20 --- a/app-emulation/xen/Manifest
21 +++ b/app-emulation/xen/Manifest
22 @@ -1,10 +1,6 @@
23 DIST xen-4.7.2-upstream-patches-0.tar.xz 45944 SHA256 e7783bc9adc939167eaef91e96fda506d2d52815f709b31952229891357e6b67 SHA512 6d4e23fb5a63fd191f893e31194b6397a394956846f356ae0119c656a92e7e22296e728286a98109b64a5736241b2317969f54915e7b487b4d7a64aae534614c WHIRLPOOL e185ce40085559d00a302eae8814b4c013817a5e4c0a2a9c56a6b4983b38e7103e44d0407fa78ea79fdbe8eefde346b994812851d8b4bad0bf08cb5721507c37
24 DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da34603fc07b91cfebf358d5 SHA512 8f447e7feffec81fea5b5a4098968b8b8cebc6989e7b6a845413317644d5d328d6f12181d09266366200878ab6a29ab34c7235c1af7b55463a3fdaea40ee1500 WHIRLPOOL 27f3fd88846724e03bf9bb53133046cb79139950c9162dd9c9a85798e169259f73dc2fe4212e750ce9a8fd1d0abd99f1f76108faceb7bf1934ce0495377ee756
25 DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62
26 -DIST xen-4.8.1-upstream-patches-0.tar.xz 57132 SHA256 6a6d466e74b28e50cc8ffcf56f6e3853dff73a5d936374404a2aab9dadb54566 SHA512 bcf43f7f9c15016576f225146a34e26122a6e35d953ca8df05d6d3b6b2465bd8e237e824d3d84dfd892f440b40d6e6b3bb7c16c3c79b8e04534b2bed60877f53 WHIRLPOOL 4470d244bed58f9b71a031da19cfe38a79badf426300637211c3e8dfdab02f2b87ed21d9a5340af267685aafd627451f8750b85d9afc73ed2a550c52b43c31ab
27 -DIST xen-4.8.1-upstream-patches-1.tar.xz 59600 SHA256 c2072f96e9c3acfac89b758fca31ed6dfa247c320a32359ed52dbe1c01865291 SHA512 962394f2ac891a64233436e49b3b8a94ecd0150d1a009912ab6264c39934585476e1720ead20b9bbf067fee4d67d76b960990c5d2001f26a883a05cf8650a359 WHIRLPOOL fc5409d426ed833039af6b690aa731a7853966930c03db1f59b34d7bcdba06c844860f08e8cbf770180b3a4a0e6e60e844a2f09d6b3798808c2d242ff648cd56
28 -DIST xen-4.8.1.tar.gz 22516631 SHA256 1d69153b94561429293015f66463ee17c26404d1c014e646ecbcca6078581395 SHA512 9f535b4bb57d285dfb92c974d55513505cf485b2d7218fe8f6ed62768e2cee7f225b08adf6706590b2c0a04feca16e10915297c33b98e1b110f8ea7035f46c15 WHIRLPOOL ea367d4d08eaa464417f6c5e7143a52e085a8d0e515c99cbb49ac3ccd5c189aa79947d233754177698a076c28abf7a32c83ae29019ca70c6300839b09ca67bad
29 DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808
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 -DIST xen-security-patches-27.tar.xz 2604 SHA256 a8d01bc309894cb1bbde7a264003b873b77d1b4a1cb5c917b25a51e1b068f85b SHA512 ed9ef5ca3a39635a5ebbdc88663ea32f48c12e8ac1f193b8a66486bb62da692add38c5a89051753c992294528b4b4e92d121997317032a864f46776cb91d1897 WHIRLPOOL 07e2321959664083000a6cc90f30fa2365e206e8c1cc22e74afb085760e2c6378ba51f4ebcbf2b433c0d7a8ad9d98d0f43adb423b1bffc6a00eade362e1c59f5
33
34 diff --git a/app-emulation/xen/xen-4.8.1-r1.ebuild b/app-emulation/xen/xen-4.8.1-r1.ebuild
35 deleted file mode 100644
36 index 777573731be..00000000000
37 --- a/app-emulation/xen/xen-4.8.1-r1.ebuild
38 +++ /dev/null
39 @@ -1,192 +0,0 @@
40 -# Copyright 1999-2017 Gentoo Foundation
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=5
44 -
45 -PYTHON_COMPAT=( python2_7 )
46 -
47 -inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
48 -
49 -MY_PV=${PV/_/-}
50 -MY_P=${PN}-${PV/_/-}
51 -
52 -if [[ $PV == *9999 ]]; then
53 - inherit git-r3
54 - KEYWORDS=""
55 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
56 - SRC_URI=""
57 -else
58 - KEYWORDS="~amd64 ~arm -x86"
59 - UPSTREAM_VER=
60 - SECURITY_VER=26
61 - GENTOO_VER=
62 -
63 - [[ -n ${UPSTREAM_VER} ]] && \
64 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
65 - [[ -n ${SECURITY_VER} ]] && \
66 - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
67 - [[ -n ${GENTOO_VER} ]] && \
68 - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
69 - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
70 - ${UPSTREAM_PATCHSET_URI}
71 - ${SECURITY_PATCHSET_URI}
72 - ${GENTOO_PATCHSET_URI}"
73 -fi
74 -
75 -DESCRIPTION="The Xen virtual machine monitor"
76 -HOMEPAGE="http://xen.org/"
77 -LICENSE="GPL-2"
78 -SLOT="0"
79 -IUSE="custom-cflags debug efi flask"
80 -
81 -DEPEND="${PYTHON_DEPS}
82 - efi? ( >=sys-devel/binutils-2.22[multitarget] )
83 - !efi? ( >=sys-devel/binutils-2.22 )"
84 -RDEPEND=""
85 -PDEPEND="~app-emulation/xen-tools-${PV}"
86 -
87 -# no tests are available for the hypervisor
88 -# prevent the silliness of /usr/lib/debug/usr/lib/debug files
89 -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
90 -RESTRICT="test splitdebug strip"
91 -
92 -# Approved by QA team in bug #144032
93 -QA_WX_LOAD="boot/xen-syms-${PV}"
94 -
95 -REQUIRED_USE="arm? ( debug )"
96 -
97 -S="${WORKDIR}/${MY_P}"
98 -
99 -pkg_setup() {
100 - python-any-r1_pkg_setup
101 - if [[ -z ${XEN_TARGET_ARCH} ]]; then
102 - if use amd64; then
103 - export XEN_TARGET_ARCH="x86_64"
104 - elif use arm; then
105 - export XEN_TARGET_ARCH="arm32"
106 - elif use arm64; then
107 - export XEN_TARGET_ARCH="arm64"
108 - else
109 - die "Unsupported architecture!"
110 - fi
111 - fi
112 -
113 - if use flask ; then
114 - export "XSM_ENABLE=y"
115 - export "FLASK_ENABLE=y"
116 - fi
117 -}
118 -
119 -src_prepare() {
120 - # Upstream's patchset
121 - if [[ -n ${UPSTREAM_VER} ]]; then
122 - EPATCH_SUFFIX="patch" \
123 - EPATCH_FORCE="yes" \
124 - EPATCH_OPTS="-p1" \
125 - epatch "${WORKDIR}"/patches-upstream
126 - fi
127 -
128 - # Security patchset
129 - if [[ -n ${SECURITY_VER} ]]; then
130 - einfo "Try to apply Xen Security patch set"
131 - # apply main xen patches
132 - # Two parallel systems, both work side by side
133 - # Over time they may concdense into one. This will suffice for now
134 - EPATCH_SUFFIX="patch"
135 - EPATCH_FORCE="yes"
136 -
137 - source "${WORKDIR}"/patches-security/${PV}.conf
138 -
139 - for i in ${XEN_SECURITY_MAIN}; do
140 - epatch "${WORKDIR}"/patches-security/xen/$i
141 - done
142 - fi
143 -
144 - # Gentoo's patchset
145 - if [[ -n ${GENTOO_VER} ]]; then
146 - EPATCH_SUFFIX="patch" \
147 - EPATCH_FORCE="yes" \
148 - epatch "${WORKDIR}"/patches-gentoo
149 - fi
150 -
151 - epatch "${FILESDIR}"/${PN}-4.6-efi.patch
152 -
153 - # Drop .config
154 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
155 -
156 - if use efi; then
157 - export EFI_VENDOR="gentoo"
158 - export EFI_MOUNTPOINT="boot"
159 - fi
160 -
161 - # if the user *really* wants to use their own custom-cflags, let them
162 - if use custom-cflags; then
163 - einfo "User wants their own CFLAGS - removing defaults"
164 - # try and remove all the default custom-cflags
165 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
166 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
167 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
168 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
169 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
170 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
171 - -i {} \; || die "failed to re-set custom-cflags"
172 - fi
173 -
174 - # remove -Werror for gcc-4.6's sake
175 - find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
176 - xargs sed -i 's/ *-Werror */ /'
177 - # not strictly necessary to fix this
178 - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
179 -
180 - # Bug #575868 converted to a sed statement, typo of one char
181 - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
182 -
183 - epatch_user
184 -}
185 -
186 -src_configure() {
187 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
188 -
189 - use debug && myopt="${myopt} debug=y"
190 -
191 - if use custom-cflags; then
192 - filter-flags -fPIE -fstack-protector
193 - replace-flags -O3 -O2
194 - else
195 - unset CFLAGS
196 - unset LDFLAGS
197 - unset ASFLAGS
198 - fi
199 -}
200 -
201 -src_compile() {
202 - # Send raw LDFLAGS so that --as-needed works
203 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
204 -}
205 -
206 -src_install() {
207 - local myopt
208 - use debug && myopt="${myopt} debug=y"
209 -
210 - # The 'make install' doesn't 'mkdir -p' the subdirs
211 - if use efi; then
212 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
213 - fi
214 -
215 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
216 -
217 - # make install likes to throw in some extra EFI bits if it built
218 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
219 -}
220 -
221 -pkg_postinst() {
222 - elog "Official Xen Guide and the unoffical wiki page:"
223 - elog " https://wiki.gentoo.org/wiki/Xen"
224 - elog " http://en.gentoo-wiki.com/wiki/Xen/"
225 -
226 - use efi && einfo "The efi executable is installed in boot/efi/gentoo"
227 -
228 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
229 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
230 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
231 -}
232
233 diff --git a/app-emulation/xen/xen-4.8.1-r2.ebuild b/app-emulation/xen/xen-4.8.1-r2.ebuild
234 deleted file mode 100644
235 index bf73951bc39..00000000000
236 --- a/app-emulation/xen/xen-4.8.1-r2.ebuild
237 +++ /dev/null
238 @@ -1,192 +0,0 @@
239 -# Copyright 1999-2017 Gentoo Foundation
240 -# Distributed under the terms of the GNU General Public License v2
241 -
242 -EAPI=5
243 -
244 -PYTHON_COMPAT=( python2_7 )
245 -
246 -inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
247 -
248 -MY_PV=${PV/_/-}
249 -MY_P=${PN}-${PV/_/-}
250 -
251 -if [[ $PV == *9999 ]]; then
252 - inherit git-r3
253 - KEYWORDS=""
254 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
255 - SRC_URI=""
256 -else
257 - KEYWORDS="~amd64 ~arm -x86"
258 - UPSTREAM_VER=0
259 - SECURITY_VER=27
260 - GENTOO_VER=
261 -
262 - [[ -n ${UPSTREAM_VER} ]] && \
263 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
264 - [[ -n ${SECURITY_VER} ]] && \
265 - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
266 - [[ -n ${GENTOO_VER} ]] && \
267 - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
268 - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
269 - ${UPSTREAM_PATCHSET_URI}
270 - ${SECURITY_PATCHSET_URI}
271 - ${GENTOO_PATCHSET_URI}"
272 -fi
273 -
274 -DESCRIPTION="The Xen virtual machine monitor"
275 -HOMEPAGE="http://xen.org/"
276 -LICENSE="GPL-2"
277 -SLOT="0"
278 -IUSE="custom-cflags debug efi flask"
279 -
280 -DEPEND="${PYTHON_DEPS}
281 - efi? ( >=sys-devel/binutils-2.22[multitarget] )
282 - !efi? ( >=sys-devel/binutils-2.22 )"
283 -RDEPEND=""
284 -PDEPEND="~app-emulation/xen-tools-${PV}"
285 -
286 -# no tests are available for the hypervisor
287 -# prevent the silliness of /usr/lib/debug/usr/lib/debug files
288 -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
289 -RESTRICT="test splitdebug strip"
290 -
291 -# Approved by QA team in bug #144032
292 -QA_WX_LOAD="boot/xen-syms-${PV}"
293 -
294 -REQUIRED_USE="arm? ( debug )"
295 -
296 -S="${WORKDIR}/${MY_P}"
297 -
298 -pkg_setup() {
299 - python-any-r1_pkg_setup
300 - if [[ -z ${XEN_TARGET_ARCH} ]]; then
301 - if use amd64; then
302 - export XEN_TARGET_ARCH="x86_64"
303 - elif use arm; then
304 - export XEN_TARGET_ARCH="arm32"
305 - elif use arm64; then
306 - export XEN_TARGET_ARCH="arm64"
307 - else
308 - die "Unsupported architecture!"
309 - fi
310 - fi
311 -
312 - if use flask ; then
313 - export "XSM_ENABLE=y"
314 - export "FLASK_ENABLE=y"
315 - fi
316 -}
317 -
318 -src_prepare() {
319 - # Upstream's patchset
320 - if [[ -n ${UPSTREAM_VER} ]]; then
321 - EPATCH_SUFFIX="patch" \
322 - EPATCH_FORCE="yes" \
323 - EPATCH_OPTS="-p1" \
324 - epatch "${WORKDIR}"/patches-upstream
325 - fi
326 -
327 - # Security patchset
328 - if [[ -n ${SECURITY_VER} ]]; then
329 - einfo "Try to apply Xen Security patch set"
330 - # apply main xen patches
331 - # Two parallel systems, both work side by side
332 - # Over time they may concdense into one. This will suffice for now
333 - EPATCH_SUFFIX="patch"
334 - EPATCH_FORCE="yes"
335 -
336 - source "${WORKDIR}"/patches-security/${PV}.conf
337 -
338 - for i in ${XEN_SECURITY_MAIN}; do
339 - epatch "${WORKDIR}"/patches-security/xen/$i
340 - done
341 - fi
342 -
343 - # Gentoo's patchset
344 - if [[ -n ${GENTOO_VER} ]]; then
345 - EPATCH_SUFFIX="patch" \
346 - EPATCH_FORCE="yes" \
347 - epatch "${WORKDIR}"/patches-gentoo
348 - fi
349 -
350 - epatch "${FILESDIR}"/${PN}-4.6-efi.patch
351 -
352 - # Drop .config
353 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
354 -
355 - if use efi; then
356 - export EFI_VENDOR="gentoo"
357 - export EFI_MOUNTPOINT="boot"
358 - fi
359 -
360 - # if the user *really* wants to use their own custom-cflags, let them
361 - if use custom-cflags; then
362 - einfo "User wants their own CFLAGS - removing defaults"
363 - # try and remove all the default custom-cflags
364 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
365 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
366 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
367 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
368 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
369 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
370 - -i {} \; || die "failed to re-set custom-cflags"
371 - fi
372 -
373 - # remove -Werror for gcc-4.6's sake
374 - find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
375 - xargs sed -i 's/ *-Werror */ /'
376 - # not strictly necessary to fix this
377 - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
378 -
379 - # Bug #575868 converted to a sed statement, typo of one char
380 - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
381 -
382 - epatch_user
383 -}
384 -
385 -src_configure() {
386 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
387 -
388 - use debug && myopt="${myopt} debug=y"
389 -
390 - if use custom-cflags; then
391 - filter-flags -fPIE -fstack-protector
392 - replace-flags -O3 -O2
393 - else
394 - unset CFLAGS
395 - unset LDFLAGS
396 - unset ASFLAGS
397 - fi
398 -}
399 -
400 -src_compile() {
401 - # Send raw LDFLAGS so that --as-needed works
402 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
403 -}
404 -
405 -src_install() {
406 - local myopt
407 - use debug && myopt="${myopt} debug=y"
408 -
409 - # The 'make install' doesn't 'mkdir -p' the subdirs
410 - if use efi; then
411 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
412 - fi
413 -
414 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
415 -
416 - # make install likes to throw in some extra EFI bits if it built
417 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
418 -}
419 -
420 -pkg_postinst() {
421 - elog "Official Xen Guide and the unoffical wiki page:"
422 - elog " https://wiki.gentoo.org/wiki/Xen"
423 - elog " http://en.gentoo-wiki.com/wiki/Xen/"
424 -
425 - use efi && einfo "The efi executable is installed in boot/efi/gentoo"
426 -
427 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
428 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
429 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
430 -}
431
432 diff --git a/app-emulation/xen/xen-4.8.1-r3.ebuild b/app-emulation/xen/xen-4.8.1-r3.ebuild
433 deleted file mode 100644
434 index b1912bfc0d5..00000000000
435 --- a/app-emulation/xen/xen-4.8.1-r3.ebuild
436 +++ /dev/null
437 @@ -1,192 +0,0 @@
438 -# Copyright 1999-2017 Gentoo Foundation
439 -# Distributed under the terms of the GNU General Public License v2
440 -
441 -EAPI=5
442 -
443 -PYTHON_COMPAT=( python2_7 )
444 -
445 -inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
446 -
447 -MY_PV=${PV/_/-}
448 -MY_P=${PN}-${PV/_/-}
449 -
450 -if [[ $PV == *9999 ]]; then
451 - inherit git-r3
452 - KEYWORDS=""
453 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
454 - SRC_URI=""
455 -else
456 - KEYWORDS="~amd64 ~arm -x86"
457 - UPSTREAM_VER=1
458 - SECURITY_VER=27
459 - GENTOO_VER=
460 -
461 - [[ -n ${UPSTREAM_VER} ]] && \
462 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
463 - [[ -n ${SECURITY_VER} ]] && \
464 - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
465 - [[ -n ${GENTOO_VER} ]] && \
466 - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
467 - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
468 - ${UPSTREAM_PATCHSET_URI}
469 - ${SECURITY_PATCHSET_URI}
470 - ${GENTOO_PATCHSET_URI}"
471 -fi
472 -
473 -DESCRIPTION="The Xen virtual machine monitor"
474 -HOMEPAGE="http://xen.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 - for i in ${XEN_SECURITY_MAIN}; do
538 - epatch "${WORKDIR}"/patches-security/xen/$i
539 - done
540 - fi
541 -
542 - # Gentoo's patchset
543 - if [[ -n ${GENTOO_VER} ]]; then
544 - EPATCH_SUFFIX="patch" \
545 - EPATCH_FORCE="yes" \
546 - epatch "${WORKDIR}"/patches-gentoo
547 - fi
548 -
549 - epatch "${FILESDIR}"/${PN}-4.6-efi.patch
550 -
551 - # Drop .config
552 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
553 -
554 - if use efi; then
555 - export EFI_VENDOR="gentoo"
556 - export EFI_MOUNTPOINT="boot"
557 - fi
558 -
559 - # if the user *really* wants to use their own custom-cflags, let them
560 - if use custom-cflags; then
561 - einfo "User wants their own CFLAGS - removing defaults"
562 - # try and remove all the default custom-cflags
563 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
564 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
565 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
566 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
567 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
568 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
569 - -i {} \; || die "failed to re-set custom-cflags"
570 - fi
571 -
572 - # remove -Werror for gcc-4.6's sake
573 - find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
574 - xargs sed -i 's/ *-Werror */ /'
575 - # not strictly necessary to fix this
576 - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
577 -
578 - # Bug #575868 converted to a sed statement, typo of one char
579 - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
580 -
581 - epatch_user
582 -}
583 -
584 -src_configure() {
585 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
586 -
587 - use debug && myopt="${myopt} debug=y"
588 -
589 - if use custom-cflags; then
590 - filter-flags -fPIE -fstack-protector
591 - replace-flags -O3 -O2
592 - else
593 - unset CFLAGS
594 - unset LDFLAGS
595 - unset ASFLAGS
596 - fi
597 -}
598 -
599 -src_compile() {
600 - # Send raw LDFLAGS so that --as-needed works
601 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
602 -}
603 -
604 -src_install() {
605 - local myopt
606 - use debug && myopt="${myopt} debug=y"
607 -
608 - # The 'make install' doesn't 'mkdir -p' the subdirs
609 - if use efi; then
610 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
611 - fi
612 -
613 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
614 -
615 - # make install likes to throw in some extra EFI bits if it built
616 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
617 -}
618 -
619 -pkg_postinst() {
620 - elog "Official Xen Guide and the unoffical wiki page:"
621 - elog " https://wiki.gentoo.org/wiki/Xen"
622 - elog " http://en.gentoo-wiki.com/wiki/Xen/"
623 -
624 - use efi && einfo "The efi executable is installed in boot/efi/gentoo"
625 -
626 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
627 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
628 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
629 -}