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