diff options
| author |   Tomas Mozes <hydrapolic@gmail.com> | 2019-12-19 11:40:13 +0100 |
|---|---|---|
| committer |   Yixun Lan <dlan@gentoo.org> | 2019-12-20 10:08:06 +0000 |
| commit | 3aecafda532448020c28c9edfea92a01916bed83 (patch) | |
| tree | e46c8080941dfdb955e00f4d9b6565d4cee8f2de /app-emulation/xen-tools | |
| parent | dev-ruby/rack: drop obsolete patches (diff) | |
| download | gentoo-3aecafda532448020c28c9edfea92a01916bed83.tar.gz gentoo-3aecafda532448020c28c9edfea92a01916bed83.tar.bz2 gentoo-3aecafda532448020c28c9edfea92a01916bed83.zip | |
app-emulation/xen-tools: bump to 4.13.0
Closes: https://github.com/gentoo/gentoo/pull/14049
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'app-emulation/xen-tools')
| -rw-r--r-- | app-emulation/xen-tools/Manifest | 6 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/gentoo-patches.conf | 2 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.13.0.ebuild (renamed from app-emulation/xen-tools/xen-tools-4.13.0_rc5.ebuild) | 28 |
3 files changed, 26 insertions, 10 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 460a20603742..794d86b8fdaa 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,12 +1,16 @@ +DIST OpenSSL_1_1_1b.tar.gz 8384386 BLAKE2B f720ee2bb1ba9a104334cc39988942b5f18e9df54ec114969983e013d1d5e766e2605237281dfbd7218523b0f64ed465238d2da995791c4a789cb5e20b2d9be3 SHA512 f09f07226c1ea7d903d65572f6c63e1dd8afbbe4789438572ccae3c31445c30cf353dbf2e7637ab9d1042a2dc221cacdbed6167e881c1a1ad40163f751a33b28 +DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567 +DIST edk2-20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz 14567879 BLAKE2B 381d47674afcc7b611edee91531694a70e6799c2b351d81632777fb382a8cce968e44a1f3e17c4852db28e81624e2ec1ebb98ed121c2a6cc3f2982939eb546a5 SHA512 1a4b4d8eacd495e705fea924b16640d6814fba7ec25a3153222eb981d43b0fd9b16b54baf8feecf99cd89b10f7735ff4b075660453d0fc2722fe4608353c8aeb DIST edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz 38714813 BLAKE2B 1c0670c6447aa7d2610e59481324eafe3dbf54cc0480c855380372cf5b95469de4182b569d1c4429df71ceb9be014cb414e070a808609d185b488519955b8677 SHA512 8eb88006500d9d6982e5565bdb71bf47dfe2b9669e107f48b6b237d7efbbfb54b9fd81841421c347e5c0ca45ef9c08f0b95983c8b922c2e1072b0e42b8ede92c DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b95266ec7fcee5c27065ba999b023ded9eb42a3690555e626911493f1dc995927fa67071bdc6432b3995df82134f8c49ea0d72eaf407f455dd1e2675d5b8d844 SHA512 8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050 DIST ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz 3792227 BLAKE2B 720ac29ab3187d7abaec33823dda967caab7eea9631123a7619d2f83d3ad6c7bb47db01665a4c54548fe367866606936d36690a06ecf42323b9bd0ef00e41569 SHA512 2b4ae8e65cd678dbb376f24001294eb54aead8d66456e06fc270dec178d90b282c1eb19731234d8b458054e49c5b8b8c4a89345c63ed0a4dafaf205e642b00b7 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27 +DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0 DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273 DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2 DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436 DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021 DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40 -DIST xen-4.13.0-rc5.tar.gz 39008945 BLAKE2B ced5b762d50f80c1d0e696347f5ecc79f10efa4728629a52faf7e8315b41ff785ad3662dc5a88cb2010760045be639726902c3beda97f1041a411f1429778cfa SHA512 d0d466c83f653a8141ef86c88f2faa9744f5bef3e105466cd6cc6342a92c3cd03775806ee99bd14c85286817c00f68afeaeb48aff5ac8903386774b98ab3569a +DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225 DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30 DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index de244c0ca2cc..5c57c50c7b15 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -64,7 +64,7 @@ ${_gx054} " # xen-tools-4.13.0 patches set -_gpv_xen_tools_4130_rc5_0=" +_gpv_xen_tools_4130_0=" ${_gx038} ${_gx027} ${_gx028} ${_gx029} diff --git a/app-emulation/xen-tools/xen-tools-4.13.0_rc5.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild index d0908764bb57..0b4a116929ca 100644 --- a/app-emulation/xen-tools/xen-tools-4.13.0_rc5.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_6 ) PYTHON_REQ_USE='ncurses,xml,threads' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs @@ -16,8 +16,7 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" S="${WORKDIR}/${REPO}" else - #KEYWORDS="~amd64 ~arm ~arm64 ~x86" - KEYWORDS="" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" UPSTREAM_VER= SECURITY_VER= # xen-tools's gentoo patches tarball @@ -27,9 +26,11 @@ else # xen-tools ovmf's patches OVMF_VER= - SEABIOS_VER=1.12.0 - EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56 - IPXE_COMMIT=1dd56dbd11082fb622c2ed21cfaced4f47d798a6 + SEABIOS_VER="1.12.1" + EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54" + EDK2_OPENSSL_VERSION="1_1_1b" + EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" + IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz @@ -43,9 +44,11 @@ else OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz + https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz + https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz + https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz ${OVMF_PATCHSET_URI} ) ${UPSTREAM_PATCHSET_URI} ${SECURITY_PATCHSET_URI} @@ -95,6 +98,7 @@ DEPEND="${COMMON_DEPEND} pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) api? ( dev-libs/libxml2 net-misc/curl ) + ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) $(python_gen_impl_dep sqlite) @@ -141,8 +145,10 @@ QA_WX_LOAD=" " QA_PREBUILT=" + usr/libexec/xen/bin/elf2dmp usr/libexec/xen/bin/ivshmem-client usr/libexec/xen/bin/ivshmem-server + usr/libexec/xen/bin/qemu-edid usr/libexec/xen/bin/qemu-img usr/libexec/xen/bin/qemu-io usr/libexec/xen/bin/qemu-keymap @@ -222,7 +228,7 @@ src_prepare() { fi # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die popd > /dev/null @@ -246,6 +252,10 @@ src_prepare() { popd > /dev/null fi mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die + rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die + rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die + mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die + mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die fi @@ -449,6 +459,8 @@ src_install() { keepdir /var/lib/xen/xenpaging keepdir /var/lib/xenstored keepdir /var/log/xen + + python_optimize } pkg_postinst() { |