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: Wed, 21 Nov 2018 22:55:23
Message-Id: 1542870199.d2a6330d981c096338bf55bcdeae136ebf188a7c.dlan@gentoo
1 commit: d2a6330d981c096338bf55bcdeae136ebf188a7c
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Wed Nov 21 05:33:08 2018 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 22 07:03:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a6330d
7
8 app-emulation/xen: drop old
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
12 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
13
14 app-emulation/xen/Manifest | 3 -
15 app-emulation/xen/xen-4.10.1-r2.ebuild | 172 ---------------------------------
16 app-emulation/xen/xen-4.11.0-r3.ebuild | 171 --------------------------------
17 3 files changed, 346 deletions(-)
18
19 diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
20 index fe84f955f64..7ed3b2419af 100644
21 --- a/app-emulation/xen/Manifest
22 +++ b/app-emulation/xen/Manifest
23 @@ -1,8 +1,5 @@
24 -DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198
25 -DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea
26 DIST xen-4.10.2-upstream-patches-1.tar.xz 31768 BLAKE2B 9205e5fa011426ae3eeaa19694d14ca233805be1e60326d53ec319de1fa28e3b30e7949d7d694ccc8f0e5ea77df580bb6cf22652ae1fd023fdc49b2d37dbce0a SHA512 38c2286d8c1e39d42c266c76d97b5321ca5fb931ebe33ff01c5210fdda4d64ccb39eb6463e756c5178ab7d1c8433a56668abf1dabf4b5b5e85823817d927cd33
27 DIST xen-4.10.2-upstream-patches-2.tar.xz 37800 BLAKE2B ecf4c1a97a1d76eef925e79fd25a654695a954f81bf8a5884cd4b1007714c888d6d7e19839556c457cf49a2f20ee88d5689a0287ffd7b16487dac676b3386daf SHA512 e9212efd65827286b729b08eded4bd6deda4a9f0b72af26bf0d106a111dddd1b56e51154d3e2a2ee4b38fcf4e8a81f30ffe2a6b711b9261e50e5954447d30e60
28 DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
29 -DIST xen-4.11.0-upstream-patches-2.tar.xz 83788 BLAKE2B 3f612492827a1408a3ba058c64b8b9562f7415d19f15241257b7b6754aed472e37538bfed2a017c6664b276f43a1e9c5f87b60454b2eaa0613c84edeb035a28d SHA512 cddc270f2fddbf75f33b45496f5db4586b5463d65fa3604e9df48c116231f088551213c2a021f2b0ad329f7290b36bfdd577cda506c359311c65e897cdf50bd1
30 DIST xen-4.11.0-upstream-patches-3.tar.xz 91692 BLAKE2B 500f6099b89d741264b72dc25919e16de0f1d5e1e3adebbe7788de25f1b82692c56b271f241e39733911e2d7d3e27e3ad29d91b94e1f4d8f0257d08b173b62f1 SHA512 bdb8dc5ff868434043d40417b013370e5fd7dc07570ac0bdaa6c253b50521d7fd79af8f7d85578a961b4631cc1ba3c4942d5c60ccc165205da0135506adfb4d2
31 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
32
33 diff --git a/app-emulation/xen/xen-4.10.1-r2.ebuild b/app-emulation/xen/xen-4.10.1-r2.ebuild
34 deleted file mode 100644
35 index e8efb648999..00000000000
36 --- a/app-emulation/xen/xen-4.10.1-r2.ebuild
37 +++ /dev/null
38 @@ -1,172 +0,0 @@
39 -# Copyright 1999-2018 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -
44 -PYTHON_COMPAT=( python2_7 )
45 -
46 -inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
47 -
48 -MY_PV=${PV/_/-}
49 -MY_P=${PN}-${MY_PV}
50 -
51 -if [[ $PV == *9999 ]]; then
52 - inherit git-r3
53 - KEYWORDS="amd64"
54 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
55 - SRC_URI=""
56 -else
57 - KEYWORDS="amd64 ~arm -x86"
58 - UPSTREAM_VER=2
59 - SECURITY_VER=
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 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${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="https://downloads.xenproject.org/release/xen/${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="https://www.xenproject.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 - [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
122 -
123 - # Security patchset
124 - if [[ -n ${SECURITY_VER} ]]; then
125 - einfo "Try to apply Xen Security patch set"
126 - # apply main xen patches
127 - # Two parallel systems, both work side by side
128 - # Over time they may concdense into one. This will suffice for now
129 - source "${WORKDIR}"/patches-security/${PV}.conf
130 -
131 - local i
132 - for i in ${XEN_SECURITY_MAIN}; do
133 - eapply "${WORKDIR}"/patches-security/xen/$i
134 - done
135 - fi
136 -
137 - # Gentoo's patchset
138 - [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
139 -
140 - eapply "${FILESDIR}"/${PN}-4.6-efi.patch
141 -
142 - # Drop .config
143 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
144 -
145 - if use efi; then
146 - export EFI_VENDOR="gentoo"
147 - export EFI_MOUNTPOINT="boot"
148 - fi
149 -
150 - # if the user *really* wants to use their own custom-cflags, let them
151 - if use custom-cflags; then
152 - einfo "User wants their own CFLAGS - removing defaults"
153 - # try and remove all the default custom-cflags
154 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
155 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
156 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
157 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
158 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
159 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
160 - -i {} \; || die "failed to re-set custom-cflags"
161 - fi
162 -
163 - default
164 -}
165 -
166 -src_configure() {
167 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
168 -
169 - use debug && myopt="${myopt} debug=y"
170 -
171 - if use custom-cflags; then
172 - filter-flags -fPIE -fstack-protector
173 - replace-flags -O3 -O2
174 - else
175 - unset CFLAGS
176 - unset LDFLAGS
177 - unset ASFLAGS
178 - fi
179 -}
180 -
181 -src_compile() {
182 - # Send raw LDFLAGS so that --as-needed works
183 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
184 -}
185 -
186 -src_install() {
187 - local myopt
188 - use debug && myopt="${myopt} debug=y"
189 -
190 - # The 'make install' doesn't 'mkdir -p' the subdirs
191 - if use efi; then
192 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
193 - fi
194 -
195 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
196 -
197 - # make install likes to throw in some extra EFI bits if it built
198 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
199 -}
200 -
201 -pkg_postinst() {
202 - elog "Official Xen Guide:"
203 - elog " https://wiki.gentoo.org/wiki/Xen"
204 -
205 - use efi && einfo "The efi executable is installed in boot/efi/gentoo"
206 -
207 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
208 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
209 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
210 -}
211
212 diff --git a/app-emulation/xen/xen-4.11.0-r3.ebuild b/app-emulation/xen/xen-4.11.0-r3.ebuild
213 deleted file mode 100644
214 index a0cb05ddbdb..00000000000
215 --- a/app-emulation/xen/xen-4.11.0-r3.ebuild
216 +++ /dev/null
217 @@ -1,171 +0,0 @@
218 -# Copyright 1999-2018 Gentoo Authors
219 -# Distributed under the terms of the GNU General Public License v2
220 -
221 -EAPI=7
222 -
223 -PYTHON_COMPAT=( python2_7 )
224 -
225 -inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
226 -
227 -MY_PV=${PV/_/-}
228 -MY_P=${PN}-${MY_PV}
229 -
230 -if [[ $PV == *9999 ]]; then
231 - inherit git-r3
232 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
233 - SRC_URI=""
234 -else
235 - KEYWORDS="~amd64 ~arm -x86"
236 - UPSTREAM_VER=2
237 - SECURITY_VER=
238 - GENTOO_VER=
239 -
240 - [[ -n ${UPSTREAM_VER} ]] && \
241 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
242 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
243 - [[ -n ${SECURITY_VER} ]] && \
244 - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
245 - [[ -n ${GENTOO_VER} ]] && \
246 - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
247 - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
248 - ${UPSTREAM_PATCHSET_URI}
249 - ${SECURITY_PATCHSET_URI}
250 - ${GENTOO_PATCHSET_URI}"
251 -fi
252 -
253 -DESCRIPTION="The Xen virtual machine monitor"
254 -HOMEPAGE="https://www.xenproject.org"
255 -LICENSE="GPL-2"
256 -SLOT="0"
257 -IUSE="custom-cflags debug efi flask"
258 -
259 -DEPEND="${PYTHON_DEPS}
260 - efi? ( >=sys-devel/binutils-2.22[multitarget] )
261 - !efi? ( >=sys-devel/binutils-2.22 )"
262 -RDEPEND=""
263 -PDEPEND="~app-emulation/xen-tools-${PV}"
264 -
265 -# no tests are available for the hypervisor
266 -# prevent the silliness of /usr/lib/debug/usr/lib/debug files
267 -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
268 -RESTRICT="test splitdebug strip"
269 -
270 -# Approved by QA team in bug #144032
271 -QA_WX_LOAD="boot/xen-syms-${PV}"
272 -
273 -REQUIRED_USE="arm? ( debug )"
274 -
275 -S="${WORKDIR}/${MY_P}"
276 -
277 -pkg_setup() {
278 - python-any-r1_pkg_setup
279 - if [[ -z ${XEN_TARGET_ARCH} ]]; then
280 - if use amd64; then
281 - export XEN_TARGET_ARCH="x86_64"
282 - elif use arm; then
283 - export XEN_TARGET_ARCH="arm32"
284 - elif use arm64; then
285 - export XEN_TARGET_ARCH="arm64"
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 - fi
295 -}
296 -
297 -src_prepare() {
298 - # Upstream's patchset
299 - [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
300 -
301 - # Security patchset
302 - if [[ -n ${SECURITY_VER} ]]; then
303 - einfo "Try to apply Xen Security patch set"
304 - # apply main xen patches
305 - # Two parallel systems, both work side by side
306 - # Over time they may concdense into one. This will suffice for now
307 - source "${WORKDIR}"/patches-security/${PV}.conf
308 -
309 - local i
310 - for i in ${XEN_SECURITY_MAIN}; do
311 - eapply "${WORKDIR}"/patches-security/xen/$i
312 - done
313 - fi
314 -
315 - # Gentoo's patchset
316 - [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
317 -
318 - eapply "${FILESDIR}"/${PN}-4.6-efi.patch
319 -
320 - # Drop .config
321 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
322 -
323 - if use efi; then
324 - export EFI_VENDOR="gentoo"
325 - export EFI_MOUNTPOINT="boot"
326 - fi
327 -
328 - # if the user *really* wants to use their own custom-cflags, let them
329 - if use custom-cflags; then
330 - einfo "User wants their own CFLAGS - removing defaults"
331 - # try and remove all the default custom-cflags
332 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
333 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
334 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
335 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
336 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
337 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
338 - -i {} \; || die "failed to re-set custom-cflags"
339 - fi
340 -
341 - default
342 -}
343 -
344 -src_configure() {
345 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
346 -
347 - use debug && myopt="${myopt} debug=y"
348 -
349 - if use custom-cflags; then
350 - filter-flags -fPIE -fstack-protector
351 - replace-flags -O3 -O2
352 - else
353 - unset CFLAGS
354 - unset LDFLAGS
355 - unset ASFLAGS
356 - fi
357 -}
358 -
359 -src_compile() {
360 - # Send raw LDFLAGS so that --as-needed works
361 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
362 -}
363 -
364 -src_install() {
365 - local myopt
366 - use debug && myopt="${myopt} debug=y"
367 -
368 - # The 'make install' doesn't 'mkdir -p' the subdirs
369 - if use efi; then
370 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
371 - fi
372 -
373 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
374 -
375 - # make install likes to throw in some extra EFI bits if it built
376 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
377 -}
378 -
379 -pkg_postinst() {
380 - elog "Official Xen Guide:"
381 - elog " https://wiki.gentoo.org/wiki/Xen"
382 -
383 - use efi && einfo "The efi executable is installed in boot/efi/gentoo"
384 -
385 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
386 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
387 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
388 -}