1 |
commit: 121914a557406df2e88a7fd79af1c554e9222b55 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 10 10:54:15 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 10 11:09:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121914a5 |
7 |
|
8 |
app-emulation/xen: bump to 4.11.0-r2 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/9817 |
11 |
Bug: https://bugs.gentoo.org/655188 |
12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
13 |
|
14 |
app-emulation/xen/Manifest | 1 + |
15 |
app-emulation/xen/xen-4.11.0-r2.ebuild | 172 +++++++++++++++++++++++++++++++++ |
16 |
2 files changed, 173 insertions(+) |
17 |
|
18 |
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest |
19 |
index bbea8c9067a..87f7241e3c4 100644 |
20 |
--- a/app-emulation/xen/Manifest |
21 |
+++ b/app-emulation/xen/Manifest |
22 |
@@ -4,6 +4,7 @@ DIST xen-4.10.1-upstream-patches-1.tar.xz 85048 BLAKE2B d00f01980e1c889b2f689997 |
23 |
DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198 |
24 |
DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea |
25 |
DIST xen-4.11.0-upstream-patches-0.tar.xz 21720 BLAKE2B 92c2ef90ca6af5032e9181d8edbe2b91a4117cc402f5abdff208aa76ee76b56ce75f576c56220d2ebf6d1a21957c10f7c45a2c88d2c77aa8b17fa9a0a99e5b57 SHA512 6ea0ee376251b20b7fa9b6334bca462f115d8a9929e31ae269ae9591b433b46e4e9076a2d2e39ec5f868d5d74739ad7b0ba0d9244e599da5255ccca0babd669e |
26 |
+DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1 |
27 |
DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a |
28 |
DIST xen-4.9.2-upstream-patches-1.tar.xz 13812 BLAKE2B fe8bf636dea9fbd21c9fc432817dc8e21ffb78bf70279b86babb6963a0dbebc17493eb6c016ee1093ef36e66693df25e8aeb35a568260f2e62a97a787b3c70bb SHA512 d75ea99531a10279736f89057857c257955800df6fe42bd742babfd5a9e527a2cb0d4dc5505b41df5b9db82246a8414f14b7084997ee798ffab657a3991b17ae |
29 |
DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93 |
30 |
|
31 |
diff --git a/app-emulation/xen/xen-4.11.0-r2.ebuild b/app-emulation/xen/xen-4.11.0-r2.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..5bc98b5d19f |
34 |
--- /dev/null |
35 |
+++ b/app-emulation/xen/xen-4.11.0-r2.ebuild |
36 |
@@ -0,0 +1,172 @@ |
37 |
+# Copyright 1999-2018 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=7 |
41 |
+ |
42 |
+PYTHON_COMPAT=( python2_7 ) |
43 |
+ |
44 |
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs |
45 |
+ |
46 |
+MY_PV=${PV/_/-} |
47 |
+MY_P=${PN}-${MY_PV} |
48 |
+ |
49 |
+if [[ $PV == *9999 ]]; then |
50 |
+ inherit git-r3 |
51 |
+ KEYWORDS="" |
52 |
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
53 |
+ SRC_URI="" |
54 |
+else |
55 |
+ KEYWORDS="~amd64 ~arm -x86" |
56 |
+ UPSTREAM_VER=1 |
57 |
+ SECURITY_VER= |
58 |
+ GENTOO_VER= |
59 |
+ |
60 |
+ [[ -n ${UPSTREAM_VER} ]] && \ |
61 |
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz |
62 |
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
63 |
+ [[ -n ${SECURITY_VER} ]] && \ |
64 |
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
65 |
+ [[ -n ${GENTOO_VER} ]] && \ |
66 |
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
67 |
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz |
68 |
+ ${UPSTREAM_PATCHSET_URI} |
69 |
+ ${SECURITY_PATCHSET_URI} |
70 |
+ ${GENTOO_PATCHSET_URI}" |
71 |
+fi |
72 |
+ |
73 |
+DESCRIPTION="The Xen virtual machine monitor" |
74 |
+HOMEPAGE="https://www.xenproject.org" |
75 |
+LICENSE="GPL-2" |
76 |
+SLOT="0" |
77 |
+IUSE="custom-cflags debug efi flask" |
78 |
+ |
79 |
+DEPEND="${PYTHON_DEPS} |
80 |
+ efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
81 |
+ !efi? ( >=sys-devel/binutils-2.22 )" |
82 |
+RDEPEND="" |
83 |
+PDEPEND="~app-emulation/xen-tools-${PV}" |
84 |
+ |
85 |
+# no tests are available for the hypervisor |
86 |
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
87 |
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
88 |
+RESTRICT="test splitdebug strip" |
89 |
+ |
90 |
+# Approved by QA team in bug #144032 |
91 |
+QA_WX_LOAD="boot/xen-syms-${PV}" |
92 |
+ |
93 |
+REQUIRED_USE="arm? ( debug )" |
94 |
+ |
95 |
+S="${WORKDIR}/${MY_P}" |
96 |
+ |
97 |
+pkg_setup() { |
98 |
+ python-any-r1_pkg_setup |
99 |
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then |
100 |
+ if use amd64; then |
101 |
+ export XEN_TARGET_ARCH="x86_64" |
102 |
+ elif use arm; then |
103 |
+ export XEN_TARGET_ARCH="arm32" |
104 |
+ elif use arm64; then |
105 |
+ export XEN_TARGET_ARCH="arm64" |
106 |
+ else |
107 |
+ die "Unsupported architecture!" |
108 |
+ fi |
109 |
+ fi |
110 |
+ |
111 |
+ if use flask ; then |
112 |
+ export "XSM_ENABLE=y" |
113 |
+ export "FLASK_ENABLE=y" |
114 |
+ fi |
115 |
+} |
116 |
+ |
117 |
+src_prepare() { |
118 |
+ # Upstream's patchset |
119 |
+ [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream |
120 |
+ |
121 |
+ # Security patchset |
122 |
+ if [[ -n ${SECURITY_VER} ]]; then |
123 |
+ einfo "Try to apply Xen Security patch set" |
124 |
+ # apply main xen patches |
125 |
+ # Two parallel systems, both work side by side |
126 |
+ # Over time they may concdense into one. This will suffice for now |
127 |
+ source "${WORKDIR}"/patches-security/${PV}.conf |
128 |
+ |
129 |
+ local i |
130 |
+ for i in ${XEN_SECURITY_MAIN}; do |
131 |
+ eapply "${WORKDIR}"/patches-security/xen/$i |
132 |
+ done |
133 |
+ fi |
134 |
+ |
135 |
+ # Gentoo's patchset |
136 |
+ [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo |
137 |
+ |
138 |
+ eapply "${FILESDIR}"/${PN}-4.6-efi.patch |
139 |
+ |
140 |
+ # Drop .config |
141 |
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
142 |
+ |
143 |
+ if use efi; then |
144 |
+ export EFI_VENDOR="gentoo" |
145 |
+ export EFI_MOUNTPOINT="boot" |
146 |
+ fi |
147 |
+ |
148 |
+ # if the user *really* wants to use their own custom-cflags, let them |
149 |
+ if use custom-cflags; then |
150 |
+ einfo "User wants their own CFLAGS - removing defaults" |
151 |
+ # try and remove all the default custom-cflags |
152 |
+ find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
153 |
+ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
154 |
+ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
155 |
+ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
156 |
+ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
157 |
+ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
158 |
+ -i {} \; || die "failed to re-set custom-cflags" |
159 |
+ fi |
160 |
+ |
161 |
+ default |
162 |
+} |
163 |
+ |
164 |
+src_configure() { |
165 |
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
166 |
+ |
167 |
+ use debug && myopt="${myopt} debug=y" |
168 |
+ |
169 |
+ if use custom-cflags; then |
170 |
+ filter-flags -fPIE -fstack-protector |
171 |
+ replace-flags -O3 -O2 |
172 |
+ else |
173 |
+ unset CFLAGS |
174 |
+ unset LDFLAGS |
175 |
+ unset ASFLAGS |
176 |
+ fi |
177 |
+} |
178 |
+ |
179 |
+src_compile() { |
180 |
+ # Send raw LDFLAGS so that --as-needed works |
181 |
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
182 |
+} |
183 |
+ |
184 |
+src_install() { |
185 |
+ local myopt |
186 |
+ use debug && myopt="${myopt} debug=y" |
187 |
+ |
188 |
+ # The 'make install' doesn't 'mkdir -p' the subdirs |
189 |
+ if use efi; then |
190 |
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
191 |
+ fi |
192 |
+ |
193 |
+ emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
194 |
+ |
195 |
+ # make install likes to throw in some extra EFI bits if it built |
196 |
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
197 |
+} |
198 |
+ |
199 |
+pkg_postinst() { |
200 |
+ elog "Official Xen Guide:" |
201 |
+ elog " https://wiki.gentoo.org/wiki/Xen" |
202 |
+ |
203 |
+ use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
204 |
+ |
205 |
+ elog "You can optionally block the installation of /boot/xen-syms by an entry" |
206 |
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
207 |
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
208 |
+} |