From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9C8F31384B4 for ; Thu, 5 Nov 2015 07:54:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA882E0877; Thu, 5 Nov 2015 07:54:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43A07E0877 for ; Thu, 5 Nov 2015 07:54:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1268E3408F0 for ; Thu, 5 Nov 2015 07:54:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A4FE209D for ; Thu, 5 Nov 2015 07:54:32 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1446708971.f92f40eabf0810dd43eb30ba95b4f7e7b21436db.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/, app-emulation/xen-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen-tools/Manifest app-emulation/xen-tools/files/gentoo-patches.conf app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild app-emulation/xen-tools/xen-tools-4.5.2.ebuild app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild app-emulation/xen-tools/xen-tools-4.6.0.ebuild X-VCS-Directories: app-emulation/xen-tools/ app-emulation/xen-tools/files/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: f92f40eabf0810dd43eb30ba95b4f7e7b21436db X-VCS-Branch: master Date: Thu, 5 Nov 2015 07:54:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 432a69ab-e964-47fb-bfb5-4018547ae57f X-Archives-Hash: 1a10c53e0afdfee5ffe8bcf8b0d3e2f7 commit: f92f40eabf0810dd43eb30ba95b4f7e7b21436db Author: Yixun Lan gentoo org> AuthorDate: Thu Nov 5 07:27:43 2015 +0000 Commit: Yixun Lan gentoo org> CommitDate: Thu Nov 5 07:36:11 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92f40ea app-emulation/xen-tools: security bump, fix XSA-153 Gentoo bug: #564472 Package-Manager: portage-2.2.23 app-emulation/xen-tools/Manifest | 5 + app-emulation/xen-tools/files/gentoo-patches.conf | 15 +- ...ols-4.6.0.ebuild => xen-tools-4.2.5-r11.ebuild} | 239 ++++++++------------- ...n-tools-4.6.0.ebuild => xen-tools-4.5.2.ebuild} | 2 +- ...ools-4.6.0.ebuild => xen-tools-4.6.0-r1.ebuild} | 4 +- 5 files changed, 108 insertions(+), 157 deletions(-) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 2970466..71bcf10 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,12 +1,17 @@ DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac DIST seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce4cd41681c354771314f1e41dd7 SHA512 c54431d8e81d25b74427696da689e90d3ab68c7c1be1dec05c81658d28b650f53daa34dcee2da826c1cf5d5d39396b12b0b16ea20ed6fd89de8f732163c8cca5 WHIRLPOOL 826c0e034ca46291661faa363189ee6cf56098cabc39f8fc84d2c442cc2da2174c2fa027cc11e11a7c3fed619f2e524f2aee804d9836d256448cdad28631d69a DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90 +DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec WHIRLPOOL 29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368 DIST xen-4.5.1-upstream-patches-0.tar.xz 18236 SHA256 95910023cb99f11b4df6d57d82000bbd67714d4ed0700e152619c5b82c1bc6e5 SHA512 531e5bbe6b9920a58361f11bb1bb6df65ebaf01e3af13f9aca018e8512727d950009257dfc9b3d0b0f847968da499cf9423716de8a04869cec6f92f5274462e2 WHIRLPOOL 3e6dda862d1bbe736b85422117148c3db91a308a58eb1476e27bbb7355ea7793269cdfc489697c9e5eea5f0ac5319df5c88f2707b10c9a96b8142927a4169819 DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99 +DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b +DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8 DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a +DIST xen-gentoo-patches-5.tar.xz 23664 SHA256 41e23ec6fb5a4ef5a1f8746de0e33579de2c725368afed6bd2b7506df5e8c2b5 SHA512 8370cef1aa06585e8fa8f8c6eb7f29375ac6f5a240c859ebb6982d1c1ec159c9c331c861f39838f53093cdceca24ee1b0d98c1c92874dd4113e73eb884842eac WHIRLPOOL 4b65283220b66555a69b65331d3dcb8b8353fef584eb723c2a703712bc6eac57b70f500eeeffc511e75d3ab5d3a1eac8aac83133baf4c90ab498b1843764eb9f DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8 DIST xen-security-patches-6.tar.xz 24780 SHA256 b41422583e5f7b4c85b82d89ab66f3e0fa8de8fdb2ae42aa3da40822e9507ef5 SHA512 c58831eb5e26a78a3072623b83bad125ddd4cd67c0075a708be81a7f50ee936cd2e5832a9b88129e11ec81ebafc9cfbc339fb8296d6f4b44c04630b349c4a621 WHIRLPOOL edecaefef0b6dd1a10c479362362640d9bd7a43623085c1f20b1171c65746220d7fdfd0e20892f60ea7d2f6052389da2a1d3c0179a88d7c4d52b3aa33cbef05e +DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index e21b516..942f157 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -79,6 +79,7 @@ _gx029=" xen-tools-4-anti-ovmf-download.patch" _gx033=" xen-tools-4.4.2-gcc99.patch" _gx034=" xen-tools-4.5.0-gcc99.patch" +_gx035=" xen-tools-4.2-pod-docs-r1.patch" # xen-tools-4.2.5 patches set _gpv_xen_tools_425_0=" ${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx005} @@ -86,6 +87,12 @@ ${_gx006} ${_gx007} ${_gx008} ${_gx009} ${_gx010} ${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015} ${_gx016} ${_gx017} ${_gx018} ${_gx019} " +_gpv_xen_tools_425_1=" +${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx035} +${_gx006} ${_gx007} ${_gx008} ${_gx009} ${_gx010} +${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015} +${_gx016} ${_gx017} ${_gx018} ${_gx019} +" # xen-tools-4.5.1 patches set _gpv_xen_tools_451_0=" @@ -94,7 +101,13 @@ ${_gx022} ${_gx017} ${_gx031} ${_gx027} ${_gx032} ${_gx028} ${_gx029} ${_gx034} " - +# xen-tools-4.5.2 patches set +_gpv_xen_tools_452_0=" +${_gx008} ${_gx024} ${_gx021} +${_gx022} ${_gx017} ${_gx031} +${_gx027} ${_gx032} +${_gx028} ${_gx029} ${_gx034} +" # xen-tools-4.6.0 patches set _gpv_xen_tools_460_0=" ${_gx008} ${_gx021} diff --git a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild similarity index 64% copy from app-emulation/xen-tools/xen-tools-4.6.0.ebuild copy to app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild index f4f221e..96a0ccf 100644 --- a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild @@ -4,8 +4,6 @@ EAPI=5 -MY_PV=${PV/_/-} - PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='xml,threads' @@ -16,37 +14,29 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="~amd64 ~arm ~arm64 -x86" - UPSTREAM_VER= - SECURITY_VER= + KEYWORDS="~amd64 ~x86" + UPSTREAM_VER=10 + SECURITY_VER=7 # xen-tools's gentoo patches tarball - GENTOO_VER=4 + GENTOO_VER=5 # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - # xen-tools ovmf's patches - OVMF_VER=1 - - SEABIOS_VER=1.7.5 - OVMF_PV=20150629 + GENTOO_GPV=1 + SEABIOS_VER=1.6.3.2 [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" [[ -n ${SECURITY_VER} ]] && \ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2 - ${OVMF_PATCHSET_URI} ) ${UPSTREAM_PATCHSET_URI} ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${MY_PV}" + S="${WORKDIR}/xen-${PV}" fi inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} @@ -57,50 +47,38 @@ DOCS=( README docs/README.xen-bugtool ) LICENSE="GPL-2" SLOT="0" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios" - -REQUIRED_USE="hvm? ( || ( qemu system-qemu ) ) - ${PYTHON_REQUIRED_USE} - pygrub? ( python ) - ovmf? ( hvm ) - qemu? ( !system-qemu )" - -COMMON_DEPEND=" - dev-libs/lzo:2 +IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios" + +REQUIRED_USE="hvm? ( qemu ) + ${PYTHON_REQUIRED_USE}" + +DEPEND="dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl - dev-libs/libaio dev-libs/libgcrypt:0 - sys-libs/zlib -" - -DEPEND="${COMMON_DEPEND} dev-python/lxml[${PYTHON_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) + dev-python/pypam[${PYTHON_USEDEP}] + sys-libs/zlib + sys-power/iasl + system-seabios? ( sys-firmware/seabios ) + sys-firmware/ipxe + dev-ml/findlib hvm? ( media-libs/libsdl ) ${PYTHON_DEPS} api? ( dev-libs/libxml2 net-misc/curl ) + ${PYTHON_DEPS} pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-devel/bin86 - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - sys-devel/dev86 - sys-power/iasl ) + sys-devel/bin86 + sys-devel/dev86 dev-lang/perl app-misc/pax-utils - dev-python/markdown[${PYTHON_USEDEP}] doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] + media-gfx/transfig media-gfx/graphviz dev-tex/xcolor - media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk @@ -108,16 +86,11 @@ DEPEND="${COMMON_DEPEND} dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi ) - qemu? ( x11-libs/pixman ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2 + hvm? ( x11-proto/xproto + !net-libs/libiscsi )" +RDEPEND="sys-apps/iproute2 net-misc/bridge-utils + ocaml? ( >=dev-lang/ocaml-4 ) screen? ( app-misc/screen app-admin/logrotate @@ -126,8 +99,7 @@ RDEPEND="${COMMON_DEPEND} # hvmloader is used to bootstrap a fully virtualized kernel # Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader - usr/share/qemu-xen/qemu/s390-ccw.img" +QA_WX_LOAD="usr/lib/xen/boot/hvmloader" RESTRICT="test" @@ -142,6 +114,12 @@ pkg_setup() { export "CONFIG_GCRYPT=y" fi + if use qemu; then + export "CONFIG_IOEMU=y" + else + export "CONFIG_IOEMU=n" + fi + if [[ -z ${XEN_TARGET_ARCH} ]] ; then if use x86 && use amd64; then die "Confusion! Both x86 and amd64 are set in your use flags!" @@ -149,14 +127,13 @@ pkg_setup() { export XEN_TARGET_ARCH="x86_32" elif use amd64 ; then export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" else die "Unsupported architecture!" fi fi + + use api && export "LIBXENAPI_BINDINGS=y" + use flask && export "FLASK_ENABLE=y" } src_prepare() { @@ -199,12 +176,6 @@ src_prepare() { popd > /dev/null 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 - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - # Gentoo's patchset if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then einfo "Try to apply Gentoo specific patcheset" @@ -217,29 +188,11 @@ src_prepare() { done fi - # Ovmf's patchset - if [[ -n ${OVMF_VER} ]] && use ovmf; then - einfo "Try to apply Ovmf patcheset" - pushd "${WORKDIR}"/ovmf-*/ > /dev/null - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-ovmf - popd > /dev/null - mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die + use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + if gcc-specs-pie; then + epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch + fi # if the user *really* wants to use their own custom-cflags, let them if use custom-cflags; then @@ -257,14 +210,12 @@ src_prepare() { fi if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die + sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die fi + # Disable hvm support on systems that don't support x86_32 binaries. if ! use hvm; then + sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die # Bug 351648 elif ! use x86 && ! has x86 $(get_all_abis); then @@ -275,63 +226,41 @@ src_prepare() { # Don't bother with qemu, only needed for fully virtualised guests if ! use qemu; then - sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die + sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die + sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die fi + mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + pushd tools/firmware/ > /dev/null + ln -s seabios-dir-remote seabios-dir || die + popd > /dev/null + # Reset bash completion dir; Bug 472438 sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ -i Config.mk || die sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die + # Bug 445986 + sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die + # fix QA warning, create /var/run/, /var/lock dynamically + sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ + tools/libxl/Makefile || die - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi + sed -i -e "/\/var\/run\//d" \ + tools/xenstore/Makefile \ + tools/pygrub/Makefile || die - # use /var instead of /var/lib, consistat with previous ebuild - sed -i -e "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \ - m4/paths.m4 configure tools/configure || die - # use /run instead of /var/run - sed -i -e "/XEN_RUN_DIR=/s/\$localstatedir//g" \ - m4/paths.m4 configure tools/configure || die + sed -i -e "/\/var\/lock\/subsys/d" \ + tools/Makefile || die - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die + # xencommons, Bug #492332, sed lighter weight than patching + sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ + -i tools/hotplug/Linux/init.d/xencommons || die epatch_user } -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_with system-qemu) \ - $(use_enable pam) \ - $(use_enable api xenapi) \ - $(use_enable ovmf) \ - $(use_enable ocaml ocamltools) \ - " - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use qemu || myconf+=" --with-system-qemu" - use amd64 && myconf+=" --enable-qemu-traditional" - econf ${myconf} -} - src_compile() { export VARTEXFONTS="${T}/fonts" local myopt @@ -359,15 +288,20 @@ src_install() { local PYTHONDONTWRITEBYTECODE export PYTHONDONTWRITEBYTECODE - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ XEN_PYTHON_NATIVE_INSTALL=y install-tools - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" + python_fix_shebang "${ED}" # Remove RedHat-specific stuff rm -rf "${D}"tmp || die + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=1:autoballoon=1:' \ + -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ + -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ + -i tools/examples/xl.conf || die + if use doc; then emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs @@ -388,20 +322,26 @@ src_install() { newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled newinitd "${FILESDIR}"/xencommons.initd xencommons newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die + cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die keepdir /var/log/xen-consoles fi + if [[ "${ARCH}" == 'amd64' ]] && use qemu; then + mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die + mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die + fi + # For -static-libs wrt Bug 384355 if ! use static-libs; then rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a fi + # xend expects these to exist + keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen + # for xendomains keepdir /etc/xen/auto @@ -417,10 +357,10 @@ src_install() { pkg_postinst() { elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" + elog "https://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" elog "http://wiki.xen.org/wiki/Main_Page" elog "" - elog "Recommended to utilise the xencommons script to config sytem At boot" + elog "Recommended to utilise the xencommons script to config sytem at boot." elog "Add by use of rc-update on completion of the install" # TODO: we need to have the current Python slot here. @@ -443,13 +383,6 @@ pkg_postinst() { elog "An x86 or amd64 system is required to build HVM support." fi - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then echo elog "xensv is broken upstream (Gentoo bug #142011)." diff --git a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2.ebuild similarity index 99% copy from app-emulation/xen-tools/xen-tools-4.6.0.ebuild copy to app-emulation/xen-tools/xen-tools-4.5.2.ebuild index f4f221e..d43a1c2 100644 --- a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.5.2.ebuild @@ -18,7 +18,7 @@ if [[ $PV == *9999 ]]; then else KEYWORDS="~amd64 ~arm ~arm64 -x86" UPSTREAM_VER= - SECURITY_VER= + SECURITY_VER=7 # xen-tools's gentoo patches tarball GENTOO_VER=4 # xen-tools's gentoo patches version which apply to this specific ebuild diff --git a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild similarity index 99% rename from app-emulation/xen-tools/xen-tools-4.6.0.ebuild rename to app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild index f4f221e..4b02971 100644 --- a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild @@ -17,8 +17,8 @@ if [[ $PV == *9999 ]]; then live_eclass="mercurial" else KEYWORDS="~amd64 ~arm ~arm64 -x86" - UPSTREAM_VER= - SECURITY_VER= + UPSTREAM_VER=0 + SECURITY_VER=7 # xen-tools's gentoo patches tarball GENTOO_VER=4 # xen-tools's gentoo patches version which apply to this specific ebuild